diff --git a/.arcconfig b/.arcconfig
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,5 +1,5 @@
 {
-  "phabricator.uri" : "https://phabricator.services.mozilla.com/",
+  "phabricator.uri" : "https://phabricator-dev.allizom.org/",
   "repository.callsign": "MOZILLACENTRAL",
   "history.immutable": false
 }
diff --git a/.eslintignore b/.eslintignore
--- a/.eslintignore
+++ b/.eslintignore
@@ -261,10 +261,11 @@
 dom/u2f/**
 dom/url/**
 dom/vr/**
 dom/webauthn/**
 dom/webbrowserpersist/**
+dom/webgpu/**
 dom/webidl/**
 dom/websocket/**
 dom/workers/**
 dom/worklet/**
 dom/xbl/**
diff --git a/accessible/ipc/win/HandlerProvider.cpp b/accessible/ipc/win/HandlerProvider.cpp
--- a/accessible/ipc/win/HandlerProvider.cpp
+++ b/accessible/ipc/win/HandlerProvider.cpp
@@ -162,37 +162,10 @@
 
   *aOutPayloadSize = mSerializer->GetSize();
   return S_OK;
 }
 
-template <typename CondFnT, typename ExeFnT>
-class MOZ_RAII ExecuteWhen final
-{
-public:
-  ExecuteWhen(CondFnT& aCondFn, ExeFnT& aExeFn)
-    : mCondFn(aCondFn)
-    , mExeFn(aExeFn)
-  {
-  }
-
-  ~ExecuteWhen()
-  {
-    if (mCondFn()) {
-      mExeFn();
-    }
-  }
-
-  ExecuteWhen(const ExecuteWhen&) = delete;
-  ExecuteWhen(ExecuteWhen&&) = delete;
-  ExecuteWhen& operator=(const ExecuteWhen&) = delete;
-  ExecuteWhen& operator=(ExecuteWhen&&) = delete;
-
-private:
-  CondFnT&  mCondFn;
-  ExeFnT&   mExeFn;
-};
-
 void
 HandlerProvider::BuildStaticIA2Data(
   NotNull<mscom::IInterceptor*> aInterceptor,
   StaticIA2Data* aOutData)
 {
@@ -276,11 +249,12 @@
 
   auto cleanup = [this, aOutIA2Data]() -> void {
     CleanupDynamicIA2Data(*aOutIA2Data);
   };
 
-  ExecuteWhen<decltype(hasFailed), decltype(cleanup)> onFail(hasFailed, cleanup);
+  mscom::ExecuteWhen<decltype(hasFailed), decltype(cleanup)>
+    onFail(hasFailed, cleanup);
 
   const VARIANT kChildIdSelf = {VT_I4};
   VARIANT varVal;
 
   hr = target->accLocation(&aOutIA2Data->mLeft, &aOutIA2Data->mTop,
diff --git a/accessible/windows/msaa/Compatibility.cpp b/accessible/windows/msaa/Compatibility.cpp
--- a/accessible/windows/msaa/Compatibility.cpp
+++ b/accessible/windows/msaa/Compatibility.cpp
@@ -93,11 +93,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Compatibility
 ////////////////////////////////////////////////////////////////////////////////
 
 static WindowsDllInterceptor sUser32Interceptor;
-static decltype(&InSendMessageEx) sInSendMessageExStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<decltype(&InSendMessageEx)>
+  sInSendMessageExStub;
 static bool sInSendMessageExHackEnabled = false;
 static PVOID sVectoredExceptionHandler = nullptr;
 
 #if defined(_MSC_VER)
 #include <intrin.h>
@@ -265,15 +266,13 @@
   // InSendMessageEx compatibility hack. NVDA does not require this.
   // We also skip UIA, as we see crashes there.
   if ((sConsumers & (~(UIAUTOMATION | NVDA))) &&
       BrowserTabsRemoteAutostart()) {
     sUser32Interceptor.Init("user32.dll");
-    if (!sInSendMessageExStub) {
-      sUser32Interceptor.AddHook("InSendMessageEx",
-                                 reinterpret_cast<intptr_t>(&InSendMessageExHook),
-                                 (void**)&sInSendMessageExStub);
-    }
+    sInSendMessageExStub.Set(sUser32Interceptor, "InSendMessageEx",
+                             &InSendMessageExHook);
+
     // The vectored exception handler allows us to catch exceptions ahead of any
     // SEH handlers.
     if (!sVectoredExceptionHandler) {
       // We need to let ASan's ShadowExceptionHandler remain in the firstHandler
       // position, otherwise we'll get infinite recursion when our handler
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1412,12 +1412,12 @@
 pref("identity.fxaccounts.migrateToDevEdition", true);
 #else
 pref("identity.fxaccounts.migrateToDevEdition", false);
 #endif
 
-// If activated, send tab will use the new FxA messages backend.
-pref("identity.fxaccounts.messages.enabled", false);
+// If activated, send tab will use the new FxA commands backend.
+pref("identity.fxaccounts.commands.enabled", false);
 
 // On GTK, we now default to showing the menubar only when alt is pressed:
 #ifdef MOZ_WIDGET_GTK
 pref("ui.key.menuAccessKeyFocuses", true);
 #endif
diff --git a/browser/app/winlauncher/DllBlocklistWin.cpp b/browser/app/winlauncher/DllBlocklistWin.cpp
--- a/browser/app/winlauncher/DllBlocklistWin.cpp
+++ b/browser/app/winlauncher/DllBlocklistWin.cpp
@@ -244,11 +244,12 @@
 
   return true;
 }
 
 typedef decltype(&NtMapViewOfSection) NtMapViewOfSection_func;
-static NtMapViewOfSection_func stub_NtMapViewOfSection;
+static mozilla::CrossProcessDllInterceptor::FuncHookType<NtMapViewOfSection_func>
+  stub_NtMapViewOfSection;
 
 static NTSTATUS NTAPI
 patched_NtMapViewOfSection(HANDLE aSection, HANDLE aProcess, PVOID* aBaseAddress,
                            ULONG_PTR aZeroBits, SIZE_T aCommitSize,
                            PLARGE_INTEGER aSectionOffset, PSIZE_T aViewSize,
@@ -354,13 +355,12 @@
 bool
 InitializeDllBlocklistOOP(HANDLE aChildProcess)
 {
   mozilla::CrossProcessDllInterceptor intcpt(aChildProcess);
   intcpt.Init(L"ntdll.dll");
-  bool ok = intcpt.AddDetour("NtMapViewOfSection",
-                             reinterpret_cast<intptr_t>(&patched_NtMapViewOfSection),
-                             (void**) &stub_NtMapViewOfSection);
+  bool ok = stub_NtMapViewOfSection.SetDetour(intcpt, "NtMapViewOfSection",
+                                              &patched_NtMapViewOfSection);
   if (!ok) {
     return false;
   }
 
   // Set the child process's copy of stub_NtMapViewOfSection
diff --git a/browser/base/content/aboutNetError-new.xhtml b/browser/base/content/aboutNetError-new.xhtml
--- a/browser/base/content/aboutNetError-new.xhtml
+++ b/browser/base/content/aboutNetError-new.xhtml
@@ -19,11 +19,11 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Security-Policy" content="default-src chrome:" />
     <title>&loadError.label;</title>
-    <link rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
+    <link rel="stylesheet" href="chrome://browser/skin/aboutNetError-new.css" type="text/css" media="all" />
     <!-- If the location of the favicon is changed here, the FAVICON_ERRORPAGE_URL symbol in
          toolkit/components/places/src/nsFaviconService.h should be updated. -->
     <link rel="icon" type="image/png" id="favicon" href="chrome://global/skin/icons/warning-16.png"/>
   </head>
 
diff --git a/browser/base/content/aboutNetError.js b/browser/base/content/aboutNetError.js
--- a/browser/base/content/aboutNetError.js
+++ b/browser/base/content/aboutNetError.js
@@ -176,14 +176,16 @@
       sd.textContent = getDescription();
     }
   }
   if (showCaptivePortalUI) {
     initPageCaptivePortal();
+    updateContainerPosition();
     return;
   }
   if (gIsCertError) {
     initPageCertError();
+    updateContainerPosition();
     return;
   }
   addAutofocus("errorTryAgain");
 
   document.body.classList.add("neterror");
@@ -291,10 +293,16 @@
     var container = document.getElementById("errorLongDesc");
     for (var span of container.querySelectorAll("span.hostname")) {
       span.textContent = document.location.hostname;
     }
   }
+  updateContainerPosition();
+}
+
+function updateContainerPosition() {
+  let textContainer = document.getElementById("text-container");
+  textContainer.style.marginTop = `calc(50vh - ${textContainer.clientHeight / 2}px)`;
 }
 
 function initPageCaptivePortal() {
   document.body.className = "captiveportal";
   document.getElementById("openPortalLoginPageButton")
diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -325,28 +325,43 @@
       devices = await fxAccounts.getDeviceList();
     } catch (e) {
       console.error("Could not get the FxA device list", e);
       devices = []; // We can still run in degraded mode.
     }
-    const toSendMessages = [];
+    const fxaCommandsDevices = [];
+    const oldSendTabClients = [];
     for (const client of clients) {
       const device = devices.find(d => d.id == client.fxaDeviceId);
-      if (device && fxAccounts.messages.canReceiveSendTabMessages(device)) {
-        toSendMessages.push(device);
+      if (!device) {
+        console.error(`Could not find associated FxA device for ${client.name}`);
+        continue;
+      } else if ((await fxAccounts.commands.sendTab.isDeviceCompatible(device))) {
+        fxaCommandsDevices.push(device);
       } else {
-        try {
-          await Weave.Service.clientsEngine.sendURIToClientForDisplay(url, client.id, title);
-        } catch (e) {
-          console.error("Could not send tab to device", e);
+        oldSendTabClients.push(client);
+      }
+    }
+    if (fxaCommandsDevices.length) {
+      console.log(`Sending a tab to ${fxaCommandsDevices.map(d => d.name).join(", ")} using FxA commands.`);
+      const report = await fxAccounts.commands.sendTab.send(fxaCommandsDevices, {url, title});
+      for (let {device, error} of report.failed) {
+        console.error(`Failed to send a tab with FxA commands for ${device.name}.
+                       Falling back on the Sync back-end`, error);
+        const client = clients.find(c => c.fxaDeviceId == device.id);
+        if (!client) {
+          console.error(`Could not find associated Sync device for ${device.name}`);
+          continue;
         }
+        oldSendTabClients.push(client);
       }
     }
-    if (toSendMessages.length) {
+    for (let client of oldSendTabClients) {
       try {
-        await fxAccounts.messages.sendTab(toSendMessages, {url, title});
+        console.log(`Sending a tab to ${client.name} using Sync.`);
+        await Weave.Service.clientsEngine.sendURIToClientForDisplay(url, client.id, title);
       } catch (e) {
-        console.error("Could not send tab to device", e);
+        console.error("Could not send tab to device.", e);
       }
     }
   },
 
   populateSendTabToDevicesMenu(devicesPopup, url, title, createDeviceNodeFn) {
@@ -589,11 +604,17 @@
       return;
     }
     const state = UIState.get();
     if (state.status == UIState.STATUS_SIGNED_IN) {
       this.updateSyncStatus({ syncing: true });
-      Services.tm.dispatchToMainThread(() => Weave.Service.sync());
+      Services.tm.dispatchToMainThread(() => {
+        // We are pretty confident that push helps us pick up all FxA commands,
+        // but some users might have issues with push, so let's unblock them
+        // by fetching the missed FxA commands on manual sync.
+        fxAccounts.commands.fetchMissedRemoteCommands();
+        Weave.Service.sync();
+      });
     }
   },
 
   openPrefs(entryPoint = "syncbutton", origin = undefined) {
     window.openPreferences("paneSync", { origin, urlParams: { entrypoint: entryPoint } });
diff --git a/browser/base/content/hiddenWindow.xul b/browser/base/content/hiddenWindow.xul
--- a/browser/base/content/hiddenWindow.xul
+++ b/browser/base/content/hiddenWindow.xul
@@ -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/.
 
-#ifdef XP_MACOSX
 <?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
 
 <!DOCTYPE window [
 #include browser-doctype.inc
 ]>
@@ -29,7 +28,5 @@
               id="macDockMenuNewPrivateWindow" />
   </menupopup>
 </popupset>
 
 </window>
-
-#endif
diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -993,16 +993,26 @@
 
     mm.sendAsyncMessage("ContextMenu:SaveVideoFrameAsImage", {}, {
       target: this.target,
     });
 
+    // Cache this because we fetch the data async
+    let {documentURIObject} = gContextMenuContentData;
+
     let onMessage = (message) => {
       mm.removeMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
+      // FIXME can we switch this to a blob URL?
       let dataURL = message.data.dataURL;
-      saveImageURL(dataURL, name, "SaveImageTitle", true, false,
-                   document.documentURIObject, null, null, null,
-                   isPrivate);
+      saveImageURL(dataURL, name, "SaveImageTitle",
+                   true, // bypass cache
+                   false, // don't skip prompt for where to save
+                   documentURIObject, // referrer
+                   null, // document
+                   null, // content type
+                   null, // content disposition
+                   isPrivate,
+                   this.principal);
     };
     mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage);
   },
 
   leaveDOMFullScreen() {
@@ -1236,17 +1246,19 @@
     if (this.onCanvas) {
       // Bypass cache, since it's a data: URL.
       this._canvasToBlobURL(this.target).then(function(blobURL) {
         saveImageURL(blobURL, "canvas.png", "SaveImageTitle",
                      true, false, referrerURI, null, null, null,
-                     isPrivate);
+                     isPrivate,
+                     document.nodePrincipal /* system, because blob: */);
       }, Cu.reportError);
     } else if (this.onImage) {
       urlSecurityCheck(this.mediaURL, this.principal);
       saveImageURL(this.mediaURL, null, "SaveImageTitle", false,
                    false, referrerURI, null, gContextMenuContentData.contentType,
-                   gContextMenuContentData.contentDisposition, isPrivate);
+                   gContextMenuContentData.contentDisposition, isPrivate,
+                   this.principal);
     } else if (this.onVideo || this.onAudio) {
       var dialogTitle = this.onVideo ? "SaveVideoTitle" : "SaveAudioTitle";
       this.saveHelper(this.mediaURL, null, dialogTitle, false, doc, referrerURI,
                       this.frameOuterWindowID, "", isContentWindowPrivate);
     }
diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js
--- a/browser/base/content/pageinfo/pageInfo.js
+++ b/browser/base/content/pageinfo/pageInfo.js
@@ -687,11 +687,12 @@
     selectSaveFolder(function(aDirectory) {
       if (aDirectory) {
         var saveAnImage = function(aURIString, aChosenData, aBaseURI) {
           uniqueFile(aChosenData.file);
           internalSave(aURIString, null, null, null, null, false, "SaveImageTitle",
-                       aChosenData, aBaseURI, null, false, null, gDocInfo.isContentWindowPrivate);
+                       aChosenData, aBaseURI, null, false, null,
+                       gDocInfo.isContentWindowPrivate, gDocInfo.principal);
         };
 
         for (var i = 0; i < rowArray.length; i++) {
           let v = rowArray[i];
           let dir = aDirectory.clone();
diff --git a/browser/base/content/tab-content.js b/browser/base/content/tab-content.js
--- a/browser/base/content/tab-content.js
+++ b/browser/base/content/tab-content.js
@@ -227,10 +227,11 @@
 var ContentSearchMediator = {
 
   whitelist: new Set([
     "about:home",
     "about:newtab",
+    "about:welcome",
   ]),
 
   init(chromeGlobal) {
     chromeGlobal.addEventListener("ContentSearchClient", this, true, true);
     addMessageListener("ContentSearch", this);
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -303,11 +303,12 @@
   if (where == "save") {
     // TODO(1073187): propagate referrerPolicy.
 
     // ContentClick.jsm passes isContentWindowPrivate for saveURL instead of passing a CPOW initiatingDoc
     if ("isContentWindowPrivate" in params) {
-      saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, null, params.isContentWindowPrivate);
+      saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI,
+              null, params.isContentWindowPrivate, aPrincipal);
     } else {
       if (!aInitiatingDoc) {
         Cu.reportError("openUILink/openLinkIn was called with " +
           "where == 'save' but without initiatingDoc.  See bug 814264.");
         return;
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -98,12 +98,14 @@
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
         content/browser/utilityOverlay.js             (content/utilityOverlay.js)
         content/browser/webext-panels.js              (content/webext-panels.js)
 *       content/browser/webext-panels.xul             (content/webext-panels.xul)
         content/browser/nsContextMenu.js              (content/nsContextMenu.js)
+#ifdef XP_MACOSX
 # XXX: We should exclude this one as well (bug 71895)
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
+#endif
 #ifndef XP_MACOSX
 *       content/browser/webrtcIndicator.xul           (content/webrtcIndicator.xul)
         content/browser/webrtcIndicator.js            (content/webrtcIndicator.js)
 #endif
 # the following files are browser-specific overrides
diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/browser/components/downloads/DownloadsCommon.jsm
@@ -61,11 +61,10 @@
 
 const kDownloadsStringsRequiringFormatting = {
   sizeWithUnits: true,
   statusSeparator: true,
   statusSeparatorBeforeNumber: true,
-  fileExecutableSecurityWarning: true
 };
 
 const kDownloadsStringsRequiringPluralForm = {
   otherDownloads3: true
 };
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -484,11 +484,11 @@
         data = JSON.parse(data);
         if (data.isLocalDevice) {
           this._onDeviceDisconnected();
         }
         break;
-      case "fxaccounts:messages:display-tabs":
+      case "fxaccounts:commands:open-uri":
       case "weave:engine:clients:display-uris":
         this._onDisplaySyncURIs(subject);
         break;
       case "session-save":
         this._setPrefToSaveSession(true);
@@ -635,11 +635,11 @@
     os.addObserver(this, "weave:service:ready");
     os.addObserver(this, "fxaccounts:onverified");
     os.addObserver(this, "fxaccounts:device_connected");
     os.addObserver(this, "fxaccounts:verify_login");
     os.addObserver(this, "fxaccounts:device_disconnected");
-    os.addObserver(this, "fxaccounts:messages:display-tabs");
+    os.addObserver(this, "fxaccounts:commands:open-uri");
     os.addObserver(this, "weave:engine:clients:display-uris");
     os.addObserver(this, "session-save");
     os.addObserver(this, "places-init-complete");
     os.addObserver(this, "distribution-customization-complete");
     os.addObserver(this, "handle-xul-text-link");
@@ -678,11 +678,11 @@
     os.removeObserver(this, "weave:service:ready");
     os.removeObserver(this, "fxaccounts:onverified");
     os.removeObserver(this, "fxaccounts:device_connected");
     os.removeObserver(this, "fxaccounts:verify_login");
     os.removeObserver(this, "fxaccounts:device_disconnected");
-    os.removeObserver(this, "fxaccounts:messages:display-tabs");
+    os.removeObserver(this, "fxaccounts:commands:open-uri");
     os.removeObserver(this, "weave:engine:clients:display-uris");
     os.removeObserver(this, "session-save");
     if (this._bookmarksBackupIdleTime) {
       this._idleService.removeIdleObserver(this, this._bookmarksBackupIdleTime);
       delete this._bookmarksBackupIdleTime;
diff --git a/browser/components/shell/nsMacShellService.cpp b/browser/components/shell/nsMacShellService.cpp
--- a/browser/components/shell/nsMacShellService.cpp
+++ b/browser/components/shell/nsMacShellService.cpp
@@ -151,11 +151,11 @@
   nsCOMPtr<nsIDocShell> docShell = do_QueryInterface(container);
   if (docShell) {
     loadContext = do_QueryInterface(docShell);
   }
 
-  return wbp->SaveURI(imageURI, 0,
+  return wbp->SaveURI(imageURI, aElement->NodePrincipal(), 0,
                       docURI, aElement->OwnerDoc()->GetReferrerPolicy(),
                       nullptr, nullptr,
                       mBackgroundFile, loadContext);
 }
 
diff --git a/browser/extensions/pdfjs/README.mozilla b/browser/extensions/pdfjs/README.mozilla
--- a/browser/extensions/pdfjs/README.mozilla
+++ b/browser/extensions/pdfjs/README.mozilla
@@ -1,5 +1,5 @@
 This is the PDF.js project output, https://github.com/mozilla/pdf.js
 
-Current extension version is: 2.0.641
+Current extension version is: 2.0.661
 
-Taken from upstream commit: 6fa2c779
+Taken from upstream commit: 42922c9a
diff --git a/browser/extensions/pdfjs/content/build/pdf.js b/browser/extensions/pdfjs/content/build/pdf.js
--- a/browser/extensions/pdfjs/content/build/pdf.js
+++ b/browser/extensions/pdfjs/content/build/pdf.js
@@ -121,12 +121,12 @@
 /***/ (function(module, exports, __w_pdfjs_require__) {
 
 "use strict";
 
 
-var pdfjsVersion = '2.0.641';
-var pdfjsBuild = '6fa2c779';
+var pdfjsVersion = '2.0.661';
+var pdfjsBuild = '42922c9a';
 var pdfjsSharedUtil = __w_pdfjs_require__(1);
 var pdfjsDisplayAPI = __w_pdfjs_require__(6);
 var pdfjsDisplayTextLayer = __w_pdfjs_require__(18);
 var pdfjsDisplayAnnotationLayer = __w_pdfjs_require__(19);
 var pdfjsDisplayDOMUtils = __w_pdfjs_require__(7);
@@ -4221,11 +4221,11 @@
     source.length = pdfDataRangeTransport.length;
     source.initialData = pdfDataRangeTransport.initialData;
   }
   return worker.messageHandler.sendWithPromise('GetDocRequest', {
     docId,
-    apiVersion: '2.0.641',
+    apiVersion: '2.0.661',
     source: {
       data: source.data,
       url: source.url,
       password: source.password,
       disableAutoFetch: source.disableAutoFetch,
@@ -5466,20 +5466,20 @@
     this._scheduleNextBound = this._scheduleNext.bind(this);
     this._nextBound = this._next.bind(this);
     this._canvas = params.canvasContext.canvas;
   }
   InternalRenderTask.prototype = {
-    initializeGraphics: function InternalRenderTask_initializeGraphics(transparency) {
+    initializeGraphics(transparency) {
+      if (this.cancelled) {
+        return;
+      }
       if (this._canvas) {
         if (canvasInRendering.has(this._canvas)) {
           throw new Error('Cannot use the same canvas during multiple render() operations. ' + 'Use different canvas or ensure previous operations were ' + 'cancelled or completed.');
         }
         canvasInRendering.set(this._canvas, this);
       }
-      if (this.cancelled) {
-        return;
-      }
       if (this._pdfBug && _global_scope2.default.StepperManager && _global_scope2.default.StepperManager.enabled) {
         this.stepper = _global_scope2.default.StepperManager.create(this.pageNumber - 1);
         this.stepper.init(this.operatorList);
         this.stepper.nextBreakPoint = this.stepper.getNextBreakPoint();
       }
@@ -5561,12 +5561,12 @@
   };
   return InternalRenderTask;
 }();
 var version, build;
 {
-  exports.version = version = '2.0.641';
-  exports.build = build = '6fa2c779';
+  exports.version = version = '2.0.661';
+  exports.build = build = '42922c9a';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
 exports.PDFDataRangeTransport = PDFDataRangeTransport;
 exports.PDFWorker = PDFWorker;
diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js
--- a/browser/extensions/pdfjs/content/build/pdf.worker.js
+++ b/browser/extensions/pdfjs/content/build/pdf.worker.js
@@ -121,12 +121,12 @@
 /***/ (function(module, exports, __w_pdfjs_require__) {
 
 "use strict";
 
 
-var pdfjsVersion = '2.0.641';
-var pdfjsBuild = '6fa2c779';
+var pdfjsVersion = '2.0.661';
+var pdfjsBuild = '42922c9a';
 var pdfjsCoreWorker = __w_pdfjs_require__(1);
 exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
 
 /***/ }),
 /* 1 */
@@ -325,11 +325,11 @@
     var pdfManager;
     var terminated = false;
     var cancelXHRs = null;
     var WorkerTasks = [];
     let apiVersion = docParams.apiVersion;
-    let workerVersion = '2.0.641';
+    let workerVersion = '2.0.661';
     if (apiVersion !== workerVersion) {
       throw new Error(`The API version "${apiVersion}" does not match ` + `the Worker version "${workerVersion}".`);
     }
     var docId = docParams.docId;
     var docBaseUrl = docParams.docBaseUrl;
diff --git a/browser/extensions/pdfjs/content/web/viewer.js b/browser/extensions/pdfjs/content/web/viewer.js
--- a/browser/extensions/pdfjs/content/web/viewer.js
+++ b/browser/extensions/pdfjs/content/web/viewer.js
@@ -568,11 +568,14 @@
       this.pdfHistory = new _pdf_history.PDFHistory({
         linkService: pdfLinkService,
         eventBus
       });
       pdfLinkService.setHistory(this.pdfHistory);
-      this.findController = new _pdf_find_controller.PDFFindController({ pdfViewer: this.pdfViewer });
+      this.findController = new _pdf_find_controller.PDFFindController({
+        pdfViewer: this.pdfViewer,
+        eventBus
+      });
       this.findController.onUpdateResultsCount = matchCount => {
         if (this.supportsIntegratedFind) {
           return;
         }
         this.findBar.updateResultsCount(matchCount);
@@ -930,12 +933,11 @@
       });
     });
     let pageModePromise = pdfDocument.getPageMode().catch(function () {});
     this.toolbar.setPagesCount(pdfDocument.numPages, false);
     this.secondaryToolbar.setPagesCount(pdfDocument.numPages);
-    let id = this.documentFingerprint = pdfDocument.fingerprint;
-    let store = this.store = new _view_history.ViewHistory(id);
+    const store = this.store = new _view_history.ViewHistory(pdfDocument.fingerprint);
     let baseDocumentUrl;
     baseDocumentUrl = this.baseUrl;
     this.pdfLinkService.setDocument(pdfDocument, baseDocumentUrl);
     this.pdfDocumentProperties.setDocument(pdfDocument, this.url);
     let pdfViewer = this.pdfViewer;
@@ -947,11 +949,11 @@
     pdfThumbnailViewer.setDocument(pdfDocument);
     firstPagePromise.then(pdfPage => {
       this.loadingBar.setWidth(this.appConfig.viewerContainer);
       if (!_app_options.AppOptions.get('disableHistory') && !this.isViewerEmbedded) {
         let resetHistory = !_app_options.AppOptions.get('showPreviousViewOnLoad');
-        this.pdfHistory.initialize(id, resetHistory);
+        this.pdfHistory.initialize(pdfDocument.fingerprint, resetHistory);
         if (this.pdfHistory.initialBookmark) {
           this.initialBookmark = this.pdfHistory.initialBookmark;
           this.initialRotation = this.pdfHistory.initialRotation;
         }
       }
@@ -978,16 +980,12 @@
         let spreadMode = _app_options.AppOptions.get('spreadModeOnLoad');
         if (values.page && _app_options.AppOptions.get('showPreviousViewOnLoad')) {
           hash = 'page=' + values.page + '&zoom=' + (zoom || values.zoom) + ',' + values.scrollLeft + ',' + values.scrollTop;
           rotation = parseInt(values.rotation, 10);
           sidebarView = sidebarView || values.sidebarView | 0;
-          if (values.scrollMode !== null) {
-            scrollMode = values.scrollMode;
-          }
-          if (values.spreadMode !== null) {
-            spreadMode = values.spreadMode;
-          }
+          scrollMode = scrollMode || values.scrollMode | 0;
+          spreadMode = spreadMode || values.spreadMode | 0;
         }
         if (pageMode && !_app_options.AppOptions.get('disablePageMode')) {
           sidebarView = sidebarView || apiPageModeToSidebarView(pageMode);
         }
         return {
@@ -1126,23 +1124,25 @@
         generator: generatorId,
         formType
       });
     });
   },
-  setInitialView(storedHash, values = {}) {
-    let { rotation, sidebarView, scrollMode, spreadMode } = values;
+  setInitialView(storedHash, { rotation, sidebarView, scrollMode, spreadMode } = {}) {
     let setRotation = angle => {
       if ((0, _ui_utils.isValidRotation)(angle)) {
         this.pdfViewer.pagesRotation = angle;
       }
     };
-    if (Number.isInteger(scrollMode)) {
-      this.pdfViewer.setScrollMode(scrollMode);
-    }
-    if (Number.isInteger(spreadMode)) {
-      this.pdfViewer.setSpreadMode(spreadMode);
-    }
+    let setViewerModes = (scroll, spread) => {
+      if (Number.isInteger(scroll)) {
+        this.pdfViewer.scrollMode = scroll;
+      }
+      if (Number.isInteger(spread)) {
+        this.pdfViewer.spreadMode = spread;
+      }
+    };
+    setViewerModes(scrollMode, spreadMode);
     this.isInitialViewSet = true;
     this.pdfSidebar.setInitialView(sidebarView);
     if (this.initialBookmark) {
       setRotation(this.initialRotation);
       delete this.initialRotation;
@@ -1582,14 +1582,14 @@
 }
 function webViewerRotateCcw() {
   PDFViewerApplication.rotatePages(-90);
 }
 function webViewerSwitchScrollMode(evt) {
-  PDFViewerApplication.pdfViewer.setScrollMode(evt.mode);
+  PDFViewerApplication.pdfViewer.scrollMode = evt.mode;
 }
 function webViewerSwitchSpreadMode(evt) {
-  PDFViewerApplication.pdfViewer.setSpreadMode(evt.mode);
+  PDFViewerApplication.pdfViewer.spreadMode = evt.mode;
 }
 function webViewerDocumentProperties() {
   PDFViewerApplication.pdfDocumentProperties.open();
 }
 function webViewerFind(evt) {
@@ -3220,10 +3220,18 @@
   },
   sidebarViewOnLoad: {
     value: 0,
     kind: OptionKind.VIEWER
   },
+  scrollModeOnLoad: {
+    value: 0,
+    kind: OptionKind.VIEWER
+  },
+  spreadModeOnLoad: {
+    value: 0,
+    kind: OptionKind.VIEWER
+  },
   textLayerMode: {
     value: 1,
     kind: OptionKind.VIEWER
   },
   useOnlyCssZoom: {
@@ -4177,10 +4185,12 @@
 });
 exports.PDFFindController = exports.FindState = undefined;
 
 var _pdfjsLib = __webpack_require__(3);
 
+var _dom_events = __webpack_require__(10);
+
 var _ui_utils = __webpack_require__(2);
 
 const FindState = {
   FOUND: 0,
   NOT_FOUND: 1,
@@ -4202,12 +4212,13 @@
   '\u00BC': '1/4',
   '\u00BD': '1/2',
   '\u00BE': '3/4'
 };
 class PDFFindController {
-  constructor({ pdfViewer }) {
+  constructor({ pdfViewer, eventBus = (0, _dom_events.getGlobalEventBus)() }) {
     this.pdfViewer = pdfViewer;
+    this.eventBus = eventBus;
     this.onUpdateResultsCount = null;
     this.onUpdateState = null;
     this.reset();
     let replace = Object.keys(CHARACTERS_TO_NORMALIZE).join('');
     this.normalizationRegex = new RegExp('[' + replace + ']', 'g');
@@ -4233,11 +4244,15 @@
     this.resumePageIdx = null;
     this.state = null;
     this.dirtyMatch = false;
     this.findTimeout = null;
     this._firstPagePromise = new Promise(resolve => {
-      this.resolveFirstPage = resolve;
+      const eventBus = this.eventBus;
+      eventBus.on('pagesinit', function onPagesInit() {
+        eventBus.off('pagesinit', onPagesInit);
+        resolve();
+      });
     });
   }
   executeCommand(cmd, state) {
     if (this.state === null || cmd !== 'findagain') {
       this.dirtyMatch = true;
@@ -6340,22 +6355,22 @@
   _scrollIntoView({ pageDiv, pageSpot = null }) {
     if (!pageSpot && !this.isInPresentationMode) {
       const left = pageDiv.offsetLeft + pageDiv.clientLeft;
       const right = left + pageDiv.clientWidth;
       const { scrollLeft, clientWidth } = this.container;
-      if (this.scrollMode === _base_viewer.ScrollMode.HORIZONTAL || left < scrollLeft || right > scrollLeft + clientWidth) {
+      if (this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL || left < scrollLeft || right > scrollLeft + clientWidth) {
         pageSpot = {
           left: 0,
           top: 0
         };
       }
     }
     (0, _ui_utils.scrollIntoView)(pageDiv, pageSpot);
   }
   _getVisiblePages() {
     if (!this.isInPresentationMode) {
-      return (0, _ui_utils.getVisibleElements)(this.container, this._pages, true, this.scrollMode === _base_viewer.ScrollMode.HORIZONTAL);
+      return (0, _ui_utils.getVisibleElements)(this.container, this._pages, true, this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL);
     }
     let currentPage = this._pages[this._currentPageNumber - 1];
     let visible = [{
       id: currentPage.id,
       view: currentPage
@@ -6398,78 +6413,11 @@
       source: this,
       location: this._location
     });
   }
   get _isScrollModeHorizontal() {
-    return this.isInPresentationMode ? false : this.scrollMode === _base_viewer.ScrollMode.HORIZONTAL;
-  }
-  setScrollMode(mode) {
-    if (mode === this.scrollMode) {
-      return;
-    }
-    super.setScrollMode(mode);
-    this.eventBus.dispatch('scrollmodechanged', { mode });
-    this._updateScrollModeClasses();
-    if (!this.pdfDocument) {
-      return;
-    }
-    const pageNumber = this._currentPageNumber;
-    if (isNaN(this._currentScaleValue)) {
-      this._setScale(this._currentScaleValue, true);
-    }
-    this.scrollPageIntoView({ pageNumber });
-    this.update();
-  }
-  _updateScrollModeClasses() {
-    const { scrollMode, viewer } = this;
-    if (scrollMode === _base_viewer.ScrollMode.HORIZONTAL) {
-      viewer.classList.add('scrollHorizontal');
-    } else {
-      viewer.classList.remove('scrollHorizontal');
-    }
-    if (scrollMode === _base_viewer.ScrollMode.WRAPPED) {
-      viewer.classList.add('scrollWrapped');
-    } else {
-      viewer.classList.remove('scrollWrapped');
-    }
-  }
-  setSpreadMode(mode) {
-    if (mode === this.spreadMode) {
-      return;
-    }
-    super.setSpreadMode(mode);
-    this.eventBus.dispatch('spreadmodechanged', { mode });
-    this._regroupSpreads();
-  }
-  _regroupSpreads() {
-    if (!this.pdfDocument) {
-      return;
-    }
-    const viewer = this.viewer,
-          pages = this._pages;
-    viewer.textContent = '';
-    if (this.spreadMode === _base_viewer.SpreadMode.NONE) {
-      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
-        viewer.appendChild(pages[i].div);
-      }
-    } else {
-      const parity = this.spreadMode - 1;
-      let spread = null;
-      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
-        if (spread === null) {
-          spread = document.createElement('div');
-          spread.className = 'spread';
-          viewer.appendChild(spread);
-        } else if (i % 2 === parity) {
-          spread = spread.cloneNode(false);
-          viewer.appendChild(spread);
-        }
-        spread.appendChild(pages[i].div);
-      }
-    }
-    this.scrollPageIntoView({ pageNumber: this._currentPageNumber });
-    this.update();
+    return this.isInPresentationMode ? false : this._scrollMode === _base_viewer.ScrollMode.HORIZONTAL;
   }
 }
 exports.PDFViewer = PDFViewer;
 
 /***/ }),
@@ -6568,12 +6516,10 @@
     this.renderer = options.renderer || _ui_utils.RendererType.CANVAS;
     this.enableWebGL = options.enableWebGL || false;
     this.useOnlyCssZoom = options.useOnlyCssZoom || false;
     this.maxCanvasPixels = options.maxCanvasPixels;
     this.l10n = options.l10n || _ui_utils.NullL10n;
-    this.scrollMode = options.scrollMode || ScrollMode.VERTICAL;
-    this.spreadMode = options.spreadMode || SpreadMode.NONE;
     this.defaultRenderingQueue = !options.renderingQueue;
     if (this.defaultRenderingQueue) {
       this.renderingQueue = new _pdf_rendering_queue.PDFRenderingQueue();
       this.renderingQueue.setViewer(this);
     } else {
@@ -6583,13 +6529,10 @@
     this.presentationModeState = _ui_utils.PresentationModeState.UNKNOWN;
     this._resetView();
     if (this.removePageBorders) {
       this.viewer.classList.add('removePageBorders');
     }
-    if (this.scrollMode !== ScrollMode.VERTICAL) {
-      this._updateScrollModeClasses();
-    }
   }
   get pagesCount() {
     return this._pages.length;
   }
   getPageView(index) {
@@ -6763,12 +6706,12 @@
           l10n: this.l10n
         });
         bindOnAfterAndBeforeDraw(pageView);
         this._pages.push(pageView);
       }
-      if (this.spreadMode !== SpreadMode.NONE) {
-        this._regroupSpreads();
+      if (this._spreadMode !== SpreadMode.NONE) {
+        this._updateSpreadMode();
       }
       onePageRenderedCapability.promise.then(() => {
         if (pdfDocument.loadingParams['disableAutoFetch']) {
           pagesCapability.resolve();
           return;
@@ -6794,13 +6737,10 @@
       });
       this.eventBus.dispatch('pagesinit', { source: this });
       if (this.defaultRenderingQueue) {
         this.update();
       }
-      if (this.findController) {
-        this.findController.resolveFirstPage();
-      }
     }).catch(reason => {
       console.error('Unable to initialize viewer', reason);
     });
   }
   setPageLabels(labels) {
@@ -6830,11 +6770,14 @@
     this._buffer = new PDFPageViewBuffer(DEFAULT_CACHE_SIZE);
     this._location = null;
     this._pagesRotation = 0;
     this._pagesRequests = [];
     this._pageViewsReady = false;
+    this._scrollMode = ScrollMode.VERTICAL;
+    this._spreadMode = SpreadMode.NONE;
     this.viewer.textContent = '';
+    this._updateScrollMode();
   }
   _scrollUpdate() {
     if (this.pagesCount === 0) {
       return;
     }
@@ -7190,24 +7133,100 @@
         height: size.width,
         rotation: (size.rotation + 90) % 360
       };
     });
   }
-  setScrollMode(mode) {
+  get scrollMode() {
+    return this._scrollMode;
+  }
+  set scrollMode(mode) {
+    if (this._scrollMode === mode) {
+      return;
+    }
     if (!Number.isInteger(mode) || !Object.values(ScrollMode).includes(mode)) {
       throw new Error(`Invalid scroll mode: ${mode}`);
     }
-    this.scrollMode = mode;
+    this._scrollMode = mode;
+    this.eventBus.dispatch('scrollmodechanged', {
+      source: this,
+      mode
+    });
+    this._updateScrollMode(this._currentPageNumber);
+  }
+  _updateScrollMode(pageNumber = null) {
+    const scrollMode = this._scrollMode,
+          viewer = this.viewer;
+    if (scrollMode === ScrollMode.HORIZONTAL) {
+      viewer.classList.add('scrollHorizontal');
+    } else {
+      viewer.classList.remove('scrollHorizontal');
+    }
+    if (scrollMode === ScrollMode.WRAPPED) {
+      viewer.classList.add('scrollWrapped');
+    } else {
+      viewer.classList.remove('scrollWrapped');
+    }
+    if (!this.pdfDocument || !pageNumber) {
+      return;
+    }
+    if (this._currentScaleValue && isNaN(this._currentScaleValue)) {
+      this._setScale(this._currentScaleValue, true);
+    }
+    this.scrollPageIntoView({ pageNumber });
+    this.update();
   }
-  _updateScrollModeClasses() {}
-  setSpreadMode(mode) {
+  setScrollMode(mode) {}
+  get spreadMode() {
+    return this._spreadMode;
+  }
+  set spreadMode(mode) {
+    if (this._spreadMode === mode) {
+      return;
+    }
     if (!Number.isInteger(mode) || !Object.values(SpreadMode).includes(mode)) {
       throw new Error(`Invalid spread mode: ${mode}`);
     }
-    this.spreadMode = mode;
+    this._spreadMode = mode;
+    this.eventBus.dispatch('spreadmodechanged', {
+      source: this,
+      mode
+    });
+    this._updateSpreadMode(this._currentPageNumber);
   }
-  _regroupSpreads() {}
+  _updateSpreadMode(pageNumber = null) {
+    if (!this.pdfDocument) {
+      return;
+    }
+    const viewer = this.viewer,
+          pages = this._pages;
+    viewer.textContent = '';
+    if (this._spreadMode === SpreadMode.NONE) {
+      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
+        viewer.appendChild(pages[i].div);
+      }
+    } else {
+      const parity = this._spreadMode - 1;
+      let spread = null;
+      for (let i = 0, iMax = pages.length; i < iMax; ++i) {
+        if (spread === null) {
+          spread = document.createElement('div');
+          spread.className = 'spread';
+          viewer.appendChild(spread);
+        } else if (i % 2 === parity) {
+          spread = spread.cloneNode(false);
+          viewer.appendChild(spread);
+        }
+        spread.appendChild(pages[i].div);
+      }
+    }
+    if (!pageNumber) {
+      return;
+    }
+    this.scrollPageIntoView({ pageNumber });
+    this.update();
+  }
+  setSpreadMode(mode) {}
 }
 exports.BaseViewer = BaseViewer;
 exports.ScrollMode = ScrollMode;
 exports.SpreadMode = SpreadMode;
 
@@ -8157,10 +8176,12 @@
   }
   reset() {
     this.pageNumber = 0;
     this.pagesCount = 0;
     this._updateUIState();
+    this.eventBus.dispatch('resetscrollmode', { source: this });
+    this.eventBus.dispatch('resetspreadmode', { source: this });
   }
   _updateUIState() {
     this.items.firstPage.disabled = this.pageNumber <= 1;
     this.items.lastPage.disabled = this.pageNumber >= this.pagesCount;
     this.items.pageRotateCw.disabled = this.pagesCount === 0;
@@ -8197,11 +8218,11 @@
           break;
       }
     });
   }
   _bindScrollModeListener(buttons) {
-    this.eventBus.on('scrollmodechanged', function (evt) {
+    function scrollModeChanged(evt) {
       buttons.scrollVerticalButton.classList.remove('toggled');
       buttons.scrollHorizontalButton.classList.remove('toggled');
       buttons.scrollWrappedButton.classList.remove('toggled');
       switch (evt.mode) {
         case _base_viewer.ScrollMode.VERTICAL:
@@ -8212,14 +8233,20 @@
           break;
         case _base_viewer.ScrollMode.WRAPPED:
           buttons.scrollWrappedButton.classList.add('toggled');
           break;
       }
+    }
+    this.eventBus.on('scrollmodechanged', scrollModeChanged);
+    this.eventBus.on('resetscrollmode', evt => {
+      if (evt.source === this) {
+        scrollModeChanged({ mode: _base_viewer.ScrollMode.VERTICAL });
+      }
     });
   }
   _bindSpreadModeListener(buttons) {
-    this.eventBus.on('spreadmodechanged', function (evt) {
+    function spreadModeChanged(evt) {
       buttons.spreadNoneButton.classList.remove('toggled');
       buttons.spreadOddButton.classList.remove('toggled');
       buttons.spreadEvenButton.classList.remove('toggled');
       switch (evt.mode) {
         case _base_viewer.SpreadMode.NONE:
@@ -8230,10 +8257,16 @@
           break;
         case _base_viewer.SpreadMode.EVEN:
           buttons.spreadEvenButton.classList.add('toggled');
           break;
       }
+    }
+    this.eventBus.on('spreadmodechanged', spreadModeChanged);
+    this.eventBus.on('resetspreadmode', evt => {
+      if (evt.source === this) {
+        spreadModeChanged({ mode: _base_viewer.SpreadMode.NONE });
+      }
     });
   }
   open() {
     if (this.opened) {
       return;
diff --git a/browser/locales/en-US/chrome/browser/downloads/downloads.properties b/browser/locales/en-US/chrome/browser/downloads/downloads.properties
--- a/browser/locales/en-US/chrome/browser/downloads/downloads.properties
+++ b/browser/locales/en-US/chrome/browser/downloads/downloads.properties
@@ -90,14 +90,10 @@
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator=%1$S \u2014 %2$S
 statusSeparatorBeforeNumber=%1$S \u2014  %2$S
 
-fileExecutableSecurityWarning=“%S” is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch “%S”?
-fileExecutableSecurityWarningTitle=Open Executable File?
-fileExecutableSecurityWarningDontAsk=Don’t ask me this again
-
 # LOCALIZATION NOTE (otherDownloads3):
 # This is displayed in an item at the bottom of the Downloads Panel when
 # there are more downloads than can fit in the list in the panel. Use a
 # semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/Localization_and_Plurals
diff --git a/browser/themes/shared/aboutNetError-new.css b/browser/themes/shared/aboutNetError-new.css
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/aboutNetError-new.css
@@ -0,0 +1,226 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 url("chrome://browser/skin/error-pages.css");
+
+:root {
+  --exception-button-container-background: #F5F5F7;
+}
+
+body.certerror {
+  border-style: solid;
+  border-color: #ffe900;
+  border-width: 16px;
+  width: 100%;
+}
+
+body.captiveportal .title {
+  background-image: url("wifi.svg");
+}
+
+body.certerror .title {
+  background-image: url("cert-error-new.svg");
+}
+
+body.blocked .title {
+  background-image: url("chrome://global/skin/icons/blocked.svg");
+}
+
+#errorContainer {
+  display: none;
+}
+
+/* Pressing the retry button will cause the cursor to flicker from a pointer to
+ * not-allowed. Override the disabled cursor behaviour since we will never show
+ * the button disabled as the initial state. */
+button:disabled {
+  cursor: pointer;
+}
+
+#prefChangeContainer {
+  display: none;
+}
+
+#learnMoreContainer {
+  display: none;
+}
+
+#certErrorAndCaptivePortalButtonContainer {
+  display: none;
+}
+
+body:not(.neterror) #certErrorAndCaptivePortalButtonContainer {
+  display: flex;
+}
+
+body:not(.neterror) #netErrorButtonContainer {
+  display: none;
+}
+
+#errorTryAgain {
+  margin-top: 1.2em;
+}
+
+#advancedButton {
+  display: none;
+}
+
+body.captiveportal #returnButton {
+  display: none;
+}
+
+body:not(.captiveportal) #openPortalLoginPageButton {
+  display: none;
+}
+
+#openPortalLoginPageButton {
+  margin-inline-start: 0;
+}
+
+body:not(.neterror) #advancedButton {
+  display: block;
+}
+
+#certificateErrorReporting {
+  display: none;
+}
+
+#advancedPanelContainer {
+  width: 100%;
+  left: 0;
+}
+
+.advanced-panel {
+  /* Hidden until the link is clicked */
+  display: none;
+  background-color: white;
+  border: 1px lightgray solid;
+  margin: 48px auto;
+  min-width: var(--in-content-container-min-width);
+  max-width: var(--in-content-container-max-width);
+}
+
+#overrideWeakCryptoPanel {
+  display: none;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-content: space-between;
+  align-items: flex-start;
+  margin-top: 1em;
+}
+
+span#hostname {
+  font-weight: bold;
+}
+
+#automaticallyReportInFuture {
+  cursor: pointer;
+}
+
+#errorCode:not([href]) {
+  color: var(--in-content-page-color);
+  cursor: text;
+  text-decoration: none;
+}
+
+#errorCode[href] {
+  white-space: nowrap;
+}
+
+#badCertTechnicalInfo {
+  margin: 3em;
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+#certificateErrorReporting {
+  display: none;
+}
+
+#certificateErrorDebugInformation {
+  display: none;
+  background-color: var(--in-content-box-background-hover) !important;
+  border-top: 1px solid var(--in-content-border-color);
+  width: 100%;
+  padding: 1em 17.5%;
+  box-sizing: border-box;
+}
+
+#certificateErrorText {
+  font-family: monospace;
+  white-space: pre-wrap;
+  padding: 1em 0;
+}
+
+#cert_domain_link:not([href]) {
+  color: var(--in-content-page-color);
+  text-decoration: none;
+}
+
+.exceptionDialogButtonContainer {
+  background-color: var(--exception-button-container-background);
+  display: flex;
+  justify-content: end;
+  padding: 10px;
+}
+
+.exceptionDialogButtonContainer[hidden] {
+  display: none;
+}
+
+.illustrated #errorPageContainer {
+  min-height: 300px;
+  display: flex;
+  flex-direction: column;
+  background-position: left center;
+}
+
+.illustrated[dir="rtl"] #errorPageContainer {
+  background-position: right center;
+}
+
+.illustrated .title {
+  background: none;
+  padding-inline-start: 0;
+  margin-inline-start: 0;
+}
+
+.illustrated #text-container {
+  margin: auto;
+  padding-inline-start: 38%;
+}
+
+.illustrated #errorPageContainer {
+  background-repeat: no-repeat;
+  background-size: 38%;
+}
+
+.connectionFailure #errorPageContainer,
+.netInterrupt #errorPageContainer,
+.netTimeout #errorPageContainer,
+.netReset #errorPageContainer,
+.netOffline #errorPageContainer {
+  background-image: url("chrome://browser/content/illustrations/error-connection-failure.svg");
+}
+
+.dnsNotFound #errorPageContainer {
+  background-image: url("chrome://browser/content/illustrations/error-server-not-found.svg");
+}
+
+.malformedURI #errorPageContainer {
+  background-image: url("chrome://browser/content/illustrations/error-malformed-url.svg");
+}
+
+.malformedURI #errorTryAgain {
+  display: none;
+}
+
+#wrongSystemTimePanel {
+  display: none;
+}
+
+#wrongSystemTimeWithoutReferencePanel {
+  display: none;
+}
diff --git a/browser/themes/shared/error-pages.css b/browser/themes/shared/error-pages.css
--- a/browser/themes/shared/error-pages.css
+++ b/browser/themes/shared/error-pages.css
@@ -5,13 +5,11 @@
 @import url("chrome://global/skin/in-content/info-pages.css");
 
 body {
   background-size: 64px 32px;
   background-repeat: repeat-x;
-  /* Top padding for when the window height is small.
-     Bottom padding to keep everything centered. */
-  padding: 75px 0;
+  padding: 0;
   /* info-pages.css sets a minimum width of 13em to the content
    * container. If we don't set a min-width here, the content
    * gets clipped in iframes with small width. We don't accomodate
    * any padding to prioritize real estate in the small viewport. */
   min-width: 13em;
@@ -26,14 +24,10 @@
 .button-spacer {
   flex: 1;
 }
 
 @media only screen and (max-width: 959px) {
-  body {
-    padding: 75px 48px;
-  }
-
   .title {
     background-image: none !important;
     padding-inline-start: 0;
     margin-inline-start: 0;
   }
@@ -43,15 +37,11 @@
   }
 }
 
 @media only screen and (max-width: 640px) {
   body {
-    justify-content: unset;
-    /* Now that everything is top-aligned, we don't need the
-     * bottom padding for centering - though it's added back
-     * when the viewport height is < 480px (see below). */
-    padding: 75px 20px 0;
+    padding: 0 75px;
   }
 
   .title-text {
     padding-bottom: 0;
     border-bottom: none;
diff --git a/browser/themes/shared/incontent-icons/cert-error-new.svg b/browser/themes/shared/incontent-icons/cert-error-new.svg
new file mode 100644
--- /dev/null
+++ b/browser/themes/shared/incontent-icons/cert-error-new.svg
@@ -0,0 +1,7 @@
+<svg height="96" viewBox="0 0 96 96" width="96" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" fill-rule="evenodd">
+    <path d="m54 87h-38.718c-4.1514504-.0042773-8.00579913-2.1539983-10.19089334-5.6838598-2.1850942-3.5298615-2.39050529-7.9383886-.54310666-11.6561402l29.718-59.46c2.0323569-4.06636891 6.1880314-6.63518463 10.734-6.63518463s8.7016431 2.56881572 10.734 6.63518463l19.0437959 38.0875919c-8.4035561 1.5187368-14.7777959 8.8711807-14.7777959 17.7124081v1.0104467c-3.547421 1.6851959-6 5.3009594-6 9.4895533z" fill="#ffe900" fill-rule="nonzero"/>
+    <path d="m39 27c0-3.3137085 2.6862915-6 6-6s6 2.6862915 6 6v24c0 3.3137085-2.6862915 6-6 6s-6-2.6862915-6-6zm6 49.5c-4.1421356 0-7.5-3.3578644-7.5-7.5s3.3578644-7.5 7.5-7.5 7.5 3.3578644 7.5 7.5-3.3578644 7.5-7.5 7.5z" fill="#3e2800"/>
+    <path d="m89.2954301 61.9390003c.4560585 1.2683141.7045699 2.6356354.7045699 4.0609997v6h1.5c2.4620372-.0002189 4.4671728 1.9781816 4.5 4.44v15c.0160526 1.203836-.4509571 2.3639032-1.296617 3.2208385-.8456598.8569353-1.99944 1.3392685-3.203383 1.3391615h-27c-2.4852814 0-4.5-2.0147186-4.5-4.5v-15c0-2.4852814 2.0147186-4.5 4.5-4.5h1.5v-6c0-6.627417 5.372583-12 12-12 2.9975478 0 5.7383932 1.0990736 7.8415359 2.9162204l-4.2654615 4.2654616c-.998662-.7424058-2.236069-1.181682-3.5760744-1.181682-3.3137085 0-6 2.6862915-6 6v6h12v-4.7655696z" fill="#b1b1b3" fill-rule="nonzero"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/shared/incontent-icons/cert-error.svg b/browser/themes/shared/incontent-icons/cert-error.svg
--- a/browser/themes/shared/incontent-icons/cert-error.svg
+++ b/browser/themes/shared/incontent-icons/cert-error.svg
@@ -37,6 +37,6 @@
   <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)" fill="#999" />
   <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)" fill="#999" />
 
   <line x1="2.5" y1="41.5" x2="41" y2="5" stroke="#d92d21" stroke-width="5.5" />
 
-</svg>
+</svg>
\ No newline at end of file
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -6,10 +6,11 @@
 # actual theme-specific manifests, so that shared resources need only
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
   skin/classic/browser/aboutNetError.css                       (../shared/aboutNetError.css)
+  skin/classic/browser/aboutNetError-new.css                   (../shared/aboutNetError-new.css)
   skin/classic/browser/blockedSite.css                         (../shared/blockedSite.css)
   skin/classic/browser/error-pages.css                         (../shared/error-pages.css)
   skin/classic/browser/aboutRestartRequired.css                (../shared/aboutRestartRequired.css)
 * skin/classic/browser/aboutSessionRestore.css                 (../shared/aboutSessionRestore.css)
   skin/classic/browser/aboutLibrary.css                        (../shared/aboutLibrary.css)
@@ -214,10 +215,11 @@
   skin/classic/browser/translation-16.png                      (../shared/translation/translation-16.png)
   skin/classic/browser/translation-16@2x.png                   (../shared/translation/translation-16@2x.png)
   skin/classic/browser/update-badge.svg                        (../shared/update-badge.svg)
   skin/classic/browser/warning.svg                             (../shared/warning.svg)
   skin/classic/browser/cert-error.svg                          (../shared/incontent-icons/cert-error.svg)
+  skin/classic/browser/cert-error-new.svg                      (../shared/incontent-icons/cert-error-new.svg)
   skin/classic/browser/wifi.svg                                (../shared/incontent-icons/wifi.svg)
   skin/classic/browser/tab-crashed.svg                         (../shared/incontent-icons/tab-crashed.svg)
   skin/classic/browser/favicon-search-16.svg                   (../shared/favicon-search-16.svg)
   skin/classic/browser/icon-search-64.svg                      (../shared/incontent-icons/icon-search-64.svg)
   skin/classic/browser/welcome-back.svg                        (../shared/incontent-icons/welcome-back.svg)
diff --git a/build/moz.configure/node.configure b/build/moz.configure/node.configure
new file mode 100644
--- /dev/null
+++ b/build/moz.configure/node.configure
@@ -0,0 +1,73 @@
+# -*- 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/.
+
+option('--enable-nodejs',
+       help='Require Node.js to build')
+
+
+# "nodejs" is first in the tuple on the assumption that it's only likely to
+# exist on systems (probably linux distros) where there is a program in the path
+# called "node" that does something else.
+nodejs = check_prog('NODEJS', ('nodejs', 'node',),
+                    allow_missing=True)
+
+
+@depends_if(nodejs)
+@checking('for node.js version')
+@imports('os')
+@imports('re')
+@imports('subprocess')
+def nodejs_version(node):
+    env = dict(os.environ)
+    env[b'NODE_DISABLE_COLORS'] = b'1'
+
+    try:
+        out = subprocess.check_output([node, '--version'], env=env,
+                                      stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+        return None
+
+    match = re.search(r'v(.+)$', out)
+
+    if not match:
+        return None
+
+    return Version(match.group(1))
+
+
+@depends('--enable-nodejs', nodejs, nodejs_version)
+def nodejs_suitability(require, node, version):
+    MIN_NODE_VERSION = Version('8.11')
+
+    if not node:
+        msg = ('could not find Node.js executable; ensure `node` or `nodejs` '
+               'is in PATH or set NODEJS in environment to point to an '
+               'executable')
+
+        if require:
+            raise FatalCheckError(msg)
+        else:
+            log.warning(msg)
+            log.warning('(This will become a fatal error in the near future.)')
+            return
+
+    if not version:
+        msg = 'could not resolve Node.js version'
+        if require:
+            raise FatalCheckError(msg)
+        else:
+            log.warning(msg)
+            log.warning('(This will become a fatal error in the near future.)')
+            return
+
+    if version < MIN_NODE_VERSION:
+        msg = 'NODEJS must point to node %s or newer; %s found' % (
+            MIN_NODE_VERSION, version)
+
+        if require:
+            raise FatalCheckError(msg)
+        else:
+            log.warning(msg)
diff --git a/caps/OriginAttributes.cpp b/caps/OriginAttributes.cpp
--- a/caps/OriginAttributes.cpp
+++ b/caps/OriginAttributes.cpp
@@ -126,12 +126,14 @@
     value.AppendInt(mPrivateBrowsingId);
     params.Set(NS_LITERAL_STRING("privateBrowsingId"), value);
   }
 
   if (!mFirstPartyDomain.IsEmpty()) {
-    MOZ_RELEASE_ASSERT(mFirstPartyDomain.FindCharInSet(dom::quota::QuotaManager::kReplaceChars) == kNotFound);
-    params.Set(NS_LITERAL_STRING("firstPartyDomain"), mFirstPartyDomain);
+    nsAutoString sanitizedFirstPartyDomain(mFirstPartyDomain);
+    sanitizedFirstPartyDomain.ReplaceChar(dom::quota::QuotaManager::kReplaceChars, '+');
+
+    params.Set(NS_LITERAL_STRING("firstPartyDomain"), sanitizedFirstPartyDomain);
   }
 
   aStr.Truncate();
 
   params.Serialize(value);
diff --git a/devtools/client/debugger/new/README.mozilla b/devtools/client/debugger/new/README.mozilla
--- a/devtools/client/debugger/new/README.mozilla
+++ b/devtools/client/debugger/new/README.mozilla
@@ -1,11 +1,11 @@
 This is the debugger.html project output.
 See https://github.com/devtools-html/debugger.html
 
-Version 66
+Version 68
 
-Comparison: https://github.com/devtools-html/debugger.html/compare/release-65...release-66
+Comparison: https://github.com/devtools-html/debugger.html/compare/release-67...release-68
 
 Packages:
 - babel-plugin-transform-es2015-modules-commonjs @6.26.2
 - babel-preset-react @6.24.1
 - react @16.2.0
diff --git a/devtools/client/debugger/new/dist/debugger.css b/devtools/client/debugger/new/dist/debugger.css
--- a/devtools/client/debugger/new/dist/debugger.css
+++ b/devtools/client/debugger/new/dist/debugger.css
@@ -245,11 +245,10 @@
 
 ::-webkit-scrollbar-thumb {
   border-radius: 8px;
   background: rgba(113, 113, 113, 0.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/>. */
 
 menupopup {
diff --git a/devtools/client/debugger/new/dist/vendors.js b/devtools/client/debugger/new/dist/vendors.js
--- a/devtools/client/debugger/new/dist/vendors.js
+++ b/devtools/client/debugger/new/dist/vendors.js
@@ -1,15 +1,15 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories"));
+		module.exports = factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/lodash"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories"));
 	else if(typeof define === 'function' && define.amd)
-		define(["devtools/client/shared/vendor/react", "devtools/client/shared/vendor/react-dom", "Services", "devtools/shared/flags", "devtools/client/shared/vendor/react-prop-types", "devtools/client/shared/vendor/react-dom-factories"], factory);
+		define(["devtools/client/shared/vendor/react", "devtools/client/shared/vendor/lodash", "devtools/client/shared/vendor/react-dom", "Services", "devtools/shared/flags", "devtools/client/shared/vendor/react-prop-types", "devtools/client/shared/vendor/react-dom-factories"], factory);
 	else {
-		var a = typeof exports === 'object' ? factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")) : factory(root["devtools/client/shared/vendor/react"], root["devtools/client/shared/vendor/react-dom"], root["Services"], root["devtools/shared/flags"], root["devtools/client/shared/vendor/react-prop-types"], root["devtools/client/shared/vendor/react-dom-factories"]);
+		var a = typeof exports === 'object' ? factory(require("devtools/client/shared/vendor/react"), require("devtools/client/shared/vendor/lodash"), require("devtools/client/shared/vendor/react-dom"), require("Services"), require("devtools/shared/flags"), require("devtools/client/shared/vendor/react-prop-types"), require("devtools/client/shared/vendor/react-dom-factories")) : factory(root["devtools/client/shared/vendor/react"], root["devtools/client/shared/vendor/lodash"], root["devtools/client/shared/vendor/react-dom"], root["Services"], root["devtools/shared/flags"], root["devtools/client/shared/vendor/react-prop-types"], root["devtools/client/shared/vendor/react-dom-factories"]);
 		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
 	}
-})(typeof self !== 'undefined' ? self : this, function(__WEBPACK_EXTERNAL_MODULE_0__, __WEBPACK_EXTERNAL_MODULE_4__, __WEBPACK_EXTERNAL_MODULE_22__, __WEBPACK_EXTERNAL_MODULE_52__, __WEBPACK_EXTERNAL_MODULE_3642__, __WEBPACK_EXTERNAL_MODULE_3643__) {
+})(typeof self !== 'undefined' ? self : this, function(__WEBPACK_EXTERNAL_MODULE_0__, __WEBPACK_EXTERNAL_MODULE_2__, __WEBPACK_EXTERNAL_MODULE_4__, __WEBPACK_EXTERNAL_MODULE_22__, __WEBPACK_EXTERNAL_MODULE_52__, __WEBPACK_EXTERNAL_MODULE_3642__, __WEBPACK_EXTERNAL_MODULE_3643__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
 /******/
 /******/ 	// The require function
@@ -78,96 +78,10 @@
 /***/ 0:
 /***/ (function(module, exports) {
 
 module.exports = __WEBPACK_EXTERNAL_MODULE_0__;
 
-/***/ }),
-
-/***/ 10:
-/***/ (function(module, exports, __webpack_require__) {
-
-var Symbol = __webpack_require__(7);
-
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
-/**
- * Used to resolve the
- * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
- * of values.
- */
-var nativeObjectToString = objectProto.toString;
-
-/** Built-in value references. */
-var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
-
-/**
- * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {string} Returns the raw `toStringTag`.
- */
-function getRawTag(value) {
-  var isOwn = hasOwnProperty.call(value, symToStringTag),
-      tag = value[symToStringTag];
-
-  try {
-    value[symToStringTag] = undefined;
-    var unmasked = true;
-  } catch (e) {}
-
-  var result = nativeObjectToString.call(value);
-  if (unmasked) {
-    if (isOwn) {
-      value[symToStringTag] = tag;
-    } else {
-      delete value[symToStringTag];
-    }
-  }
-  return result;
-}
-
-module.exports = getRawTag;
-
-
-/***/ }),
-
-/***/ 100:
-/***/ (function(module, exports, __webpack_require__) {
-
-var assocIndexOf = __webpack_require__(96);
-
-/**
- * Sets the list cache `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf ListCache
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the list cache instance.
- */
-function listCacheSet(key, value) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
-
-  if (index < 0) {
-    ++this.size;
-    data.push([key, value]);
-  } else {
-    data[index][1] = value;
-  }
-  return this;
-}
-
-module.exports = listCacheSet;
-
-
 /***/ }),
 
 /***/ 1000:
 /***/ (function(module, exports) {
 
@@ -201,608 +115,586 @@
 
 module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 version=\"1.1\" id=\"Layer_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 128 128\" style=\"enable-background:new 0 0 128 128;\" xml:space=\"preserve\"><style type=\"text/css\"> .st0{fill:#C1272D;} .st1{fill:#EFCCA3;} .st2{fill:#ED1C24;} .st3{fill:#CCAC8D;} .st4{fill:#FFFFFF;} .st5{fill:#FF931E;} .st6{fill:#FFB81E;} .st7{fill:#56332B;} .st8{fill:#442823;} .st9{fill:#7F4A41;} .st10{fill:#331712;} .st11{fill:#FFCC66;} .st12{fill:#CCCCCC;} .st13{fill:#B3B3B3;} .st14{fill:#989898;} .st15{fill:#323232;} .st16{fill:#1E1E1E;} .st17{fill:#4C4C4C;} .st18{fill:#E6E6E6;} .st19{fill:#606060;} </style><g><path class=\"st1\" d=\"M107.4,50.9c-0.2-4.4,0.4-8.3-1.6-11.6c-4.8-8.2-16.8-13-40.8-13V27c0,0-0.5,0-0.5,0c0,0,0.5,0,0.5,0v-0.7 c-24,0-36.6,4.8-41.4,13.1c-1.9,3.4-1.7,7.2-2,11.6c-0.2,3.5-1.8,7.2-1.1,11.2c0.8,5.2,1.1,10.4,1.9,15.2c0.6,3.9,6,7.2,6.5,10.9 c1.4,10.2,12,14.9,36,14.9v0.8h-0.6h0.1H65v-0.8c24,0,34.2-4.7,35.5-14.9c0.5-3.8,5.5-7,6.1-10.9c0.8-4.8,1.1-10,1.9-15.2 C109.2,58.2,107.6,54.4,107.4,50.9z\"></path><path class=\"st3\" d=\"M64.6,54.5c4.3,0.1,7.3,2.8,10.1,5.3c3.3,2.9,8.9,4.9,11.2,7.4c2.3,2.5,5.3,5,6.4,8.9 c1.1,3.9,1.4,8.9,1.4,10.2c0,1.3,0.7,1,2.7,0c4.7-2.3,9.9-8.5,9.9-8.5c-0.6,3.9-5.7,7.4-6.2,11.1C98.9,99.1,89,104,64.5,104h-0.1h0 H65\"></path><path class=\"st3\" d=\"M80.4,46.7c0.9,3.1,4.1,13.6-2.1,10.1c0,0,2.6,1.5,4.2,7.2c1.7,5.7,5.8,6.4,5.8,6.4s6.7,1.3,11.7-3 c4.2-3.6,4.9-10,3.1-14.9c-1.8-4.8-5-6.3-9.7-7.3C88.7,44.1,79.3,43.2,80.4,46.7z\"></path><g><circle cx=\"92.3\" cy=\"58.1\" r=\"8.8\"></circle><circle class=\"st4\" cx=\"90\" cy=\"54.2\" r=\"2.3\"></circle></g><path class=\"st1\" d=\"M78.9,57.7c0,0,7.9,5.4,12.2,10.7c4.3,5.3,4.2,6.3,4.2,6.3l-3.1,1.4c0,0-4.4-8.3-9.8-11.4 c-5.5-3.1-6.1-5.7-6.1-5.7L78.9,57.7z\"></path><path class=\"st3\" d=\"M64.9,54.5c-4.3,0.1-7.5,2.8-10.4,5.3c-3.3,2.9-9.1,4.9-11.4,7.4c-2.3,2.5-5.4,5-6.5,8.9 c-1.1,3.9-1.5,8.9-1.5,10.2c0,1.3,0.2,1.4-2.7,0c-4.7-2.2-9.9-8.5-9.9-8.5c0.6,3.9,5.7,7.4,6.2,11.1C30.1,99.1,40,104,64.5,104h0.1 h0H65\"></path><path class=\"st7\" d=\"M88.1,71.4C83.3,65.5,75.6,60,64.9,60h-0.1h0c-10.7,0-18.4,5.5-23.2,11.4c-5,6.1-4.6,8.5-4.6,14.3 c0,21,7.4,15,12.3,17.6c5,2.5,10.2,1.7,15.5,1.7h0h0.1c5.4,0,10.5,0.7,15.5-1.8c4.9-2.5,12.3,3.7,12.3-17.3 C92.8,80.1,93.1,77.5,88.1,71.4z\"></path><path class=\"st8\" d=\"M64.4,65.2c0,0-0.7,9.7-2.1,11.6l2.6-0.6L64.4,65.2z\"></path><path class=\"st8\" d=\"M65.1,65.2c0,0,0.7,9.7,2.1,11.6l-2.6-0.6L65.1,65.2z\"></path><path class=\"st7\" d=\"M56.7,62.9c-1-2.3,2.6-6,8.3-6.1c5.7,0,9.3,3.7,8.3,6.1c-1,2.4-4.6,3.1-8.3,3.2C61.4,66,57.7,65.3,56.7,62.9z\"></path><path d=\"M65,65.2c0-0.4,3.4-0.5,5.2-1.7c0,0-3.7,1.2-4.5,0.7c-0.8-0.4-1-1.6-1-1.6s-0.3,1.2-0.9,1.6c-0.7,0.4-4.9-0.7-4.9-0.7 s5.6,1.4,5.6,1.7c0,0.3-0.1,1.3-0.1,2c0,2.5,0,8.7,0.4,9.2c0.6,0.9,0.4-6.7,0.4-9.2C65.1,66.4,65.1,65.6,65,65.2z\"></path><path class=\"st9\" d=\"M65.2,78.6c1.7,0,4.7,1.2,7.4,3.1c-2.6-2.9-5.7-4.9-7.4-4.9c-1.8,0-5.6,2.2-8.3,5.4 C59.7,80,63.3,78.6,65.2,78.6z\"></path><path class=\"st8\" d=\"M64.5,96.3c-3.8,0-7.5-1.2-10.9-2.1c-0.7-0.2-1.4,0.3-2.1,0.1c-6.3-2-11.4-5.4-14.5-9.7c0,0.3,0,0.7,0,1 c0,21,7.4,15.1,12.3,17.6c5,2.5,10.2,1.7,15.5,1.7h0h0.1c5.4,0,10.5,0.7,15.5-1.8c4.9-2.5,12.3,3.6,12.3-17.4c0-0.8,0-1.6,0.1-2.3 c-2.9,4.7-8.2,8.4-14.8,10.6c-0.6,0.2-2-0.3-2.6-0.2C71.8,95,68.6,96.3,64.5,96.3z\"></path><path class=\"st8\" d=\"M55,85c0,0-2.5,7.5-0.8,10.8l-2.3-1C51.9,94.8,53.6,87.2,55,85z\"></path><path class=\"st8\" d=\"M74.8,85c0,0,2.5,7.5,0.8,10.8l2.3-1C77.9,94.8,76.1,87.2,74.8,85z\"></path><path class=\"st3\" d=\"M48.6,46.7c-0.9,3.1-4.1,13.6,2.1,10.1c0,0-2.6,1.5-4.2,7.2s-5.8,6.4-5.8,6.4s-6.7,1.3-11.7-3 c-4.2-3.6-4.9-10-3.1-14.9s5-6.3,9.7-7.3C40.3,44.1,49.6,43.2,48.6,46.7z\"></path><path d=\"M64.9,76.8c2.7,0,11.1,5.8,11.2,12.9c0-0.1,0-0.2,0-0.4c0-7.4-6.8-13.3-11.2-13.3c-4.4,0-11.2,6-11.2,13.3 c0,0.1,0,0.2,0,0.4C53.8,82.6,62.2,76.8,64.9,76.8z\"></path><g><ellipse transform=\"matrix(0.9683 -0.2497 0.2497 0.9683 -13.2339 18.6065)\" class=\"st10\" cx=\"66.7\" cy=\"61.5\" rx=\"0.8\" ry=\"1.5\"></ellipse><ellipse transform=\"matrix(0.9551 0.2963 -0.2963 0.9551 21.0115 -15.7209)\" class=\"st10\" cx=\"62.4\" cy=\"61.5\" rx=\"0.8\" ry=\"1.5\"></ellipse></g><g><circle cx=\"37.2\" cy=\"58.1\" r=\"8.8\"></circle><circle class=\"st4\" cx=\"39.5\" cy=\"54.2\" r=\"2.3\"></circle></g><g><path class=\"st9\" d=\"M67.5,58.2c0-0.1-2.3,1-2.9,1.1c-0.6-0.1-2.9-1.2-2.9-1.1c0,0,1.9,0,2.9,0C65.6,58.2,67.5,58.2,67.5,58.2z\"></path></g><path class=\"st1\" d=\"M50,57.7c0,0-7.9,5.4-12.2,10.7c-4.3,5.3-4.2,6.3-4.2,6.3l3.1,1.4c0,0,4.4-8.3,9.8-11.4s6.1-5.7,6.1-5.7 L50,57.7z\"></path><path class=\"st3\" d=\"M32.7,41.7c0,0-2.7,7.4-8.7,10.5C24,52.2,33.4,51.1,32.7,41.7z\"></path><path class=\"st3\" d=\"M95.8,41.7c0,0,2.7,7.4,8.7,10.5C104.5,52.2,95.1,51.1,95.8,41.7z\"></path><path class=\"st3\" d=\"M78.7,55.5c0,0-5.9-6.2-13.8-6.4l0,0c-0.1,0,0.2,0,0.1,0c-0.1,0,0.1,0,0.1,0v0c-8,0.2-13.8,6.4-13.8,6.4 c6.9-4.8,12.8-4.7,13.8-4.7v0c0,0,0,0,0,0c0,0,0,0,0,0v0C65,50.8,71.8,50.7,78.7,55.5z\"></path><path class=\"st3\" d=\"M71.8,42.5c0,0-3-4.2-7-4.3l0,0c0,0,0.1,0,0.1,0c0,0,0.1,0,0.1,0v0c-3,0.1-6.9,4.3-6.9,4.3 c3.4-3.3,6.9-3.2,6.9-3.2v0c0,0,0,0,0,0c0,0,0,0,0,0v0C65,39.3,68.3,39.2,71.8,42.5z\"></path><path class=\"st3\" d=\"M37.2,73.2c0,0-4.7,2.3-8.1,0.9l0,0c0,0-0.1,0-0.1,0c0,0,0,0,0,0v0c-3-1.7-4.5-6.8-4.5-6.8 S27.5,76.3,37.2,73.2z\"></path><path class=\"st3\" d=\"M92,73.2c0,0,4.7,2.3,8.1,0.9l0,0c0,0,0,0,0,0c0,0,0,0,0,0v0c4-1.7,4.6-6.8,4.6-6.8S101.7,76.3,92,73.2z\"></path><g><path class=\"st3\" d=\"M42.6,41.2c2.6-0.5,6.9-0.6,10.3,0.5c4.3,1.5,0.8,7,1.7,7.3c0.9,0.3,2.1-3.8,10.1-3.4c8.1,0.4,9,4,10.1,3.4 s-1.1-10,11-7.8c0,0-12.7-3.4-12.1,5.8c0,0-7.3-5.6-17.5-0.6C56.3,46.4,58.9,37.8,42.6,41.2z\"></path></g><path class=\"st3\" d=\"M86.9,41.2c0.2,0,0.3,0.1,0.4,0.1C87.4,41.3,87.2,41.2,86.9,41.2z\"></path><path class=\"st3\" d=\"M86.9,41.2C86.9,41.2,86.9,41.2,86.9,41.2C86.9,41.2,86.9,41.2,86.9,41.2z\"></path><path class=\"st3\" d=\"M39.1,28.9c0,0-10.8,13.6-12.4,18.8c-1.6,5.3-2.8,27-4.2,30.1l-5-21.4l9.2-22.3L39.1,28.9z\"></path><path class=\"st3\" d=\"M89.9,28.9c0,0,10.8,13.6,12.4,18.8c1.6,5.3,2.8,27,4.2,30.1l5-21.4l-9.2-22.3L89.9,28.9z\"></path><path class=\"st7\" d=\"M89.4,28.9c0,0,11.6,9.7,15,20.9c3.4,11.2,2,24.8,4.6,26.5c3.7,2.4,7.9-11.9,9.3-13.4c2.2-2.4,9.5-8.5,10-9.6 c0.5-1.1-14.8-17.8-21.5-21.1C98.7,28.4,88.7,28.1,89.4,28.9z\"></path><path class=\"st8\" d=\"M99.3,34.9c0,0,13.7,17.5,13.5,39.3l5.5-11.2C118.2,63,113.4,48.7,99.3,34.9z\"></path><path class=\"st7\" d=\"M39.1,28.9c0,0-11.6,9.7-15,20.9s-2,24.8-4.6,26.5c-3.7,2.4-7.9-11.9-9.3-13.4c-2.2-2.4-9.5-8.5-10-9.6 c-0.5-1.1,14.8-17.8,21.5-21.1C29.8,28.4,39.8,28.1,39.1,28.9z\"></path><path class=\"st8\" d=\"M29.2,34.9c0,0-13.7,17.5-13.5,39.3L10.3,63C10.3,63,15.1,48.7,29.2,34.9z\"></path><path class=\"st3\" d=\"M21.8,74.6c0,0,1,5.4,2.6,7.1s0.5-1.3,0.5-1.3s-1.7-0.9-1.4-7.8S21.8,74.6,21.8,74.6z\"></path><path class=\"st3\" d=\"M107.1,74.6c0,0-1,5.4-2.6,7.1s-0.5-1.3-0.5-1.3s1.7-0.9,1.4-7.8S107.1,74.6,107.1,74.6z\"></path><g><circle class=\"st8\" cx=\"54.5\" cy=\"70.5\" r=\"0.8\"></circle><circle class=\"st8\" cx=\"49.9\" cy=\"75.3\" r=\"0.8\"></circle><circle class=\"st8\" cx=\"48.4\" cy=\"70.5\" r=\"0.8\"></circle></g><g><circle class=\"st8\" cx=\"74\" cy=\"70.5\" r=\"0.8\"></circle><circle class=\"st8\" cx=\"78.6\" cy=\"75.3\" r=\"0.8\"></circle><circle class=\"st8\" cx=\"80.1\" cy=\"70.5\" r=\"0.8\"></circle></g></g></svg>"
 
 /***/ }),
 
-/***/ 101:
-/***/ (function(module, exports, __webpack_require__) {
-
-var getNative = __webpack_require__(81),
-    root = __webpack_require__(8);
-
-/* Built-in method references that are verified to be native. */
-var Map = getNative(root, 'Map');
-
-module.exports = Map;
+/***/ 1043:
+/***/ (function(module, exports) {
 
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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:svg=\"http://www.w3.org/2000/svg\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" id=\"svg2\" viewBox=\"0 0 34 34\"><defs id=\"defs4\"><linearGradient id=\"linearGradient4275\"><stop id=\"stop4277\" offset=\"0\" style=\"stop-color:#006e00;stop-opacity:1\"></stop><stop style=\"stop-color:#00cc00;stop-opacity:1;\" offset=\"0.55349338\" id=\"stop4283\"></stop><stop id=\"stop4279\" offset=\"1\" style=\"stop-color:#eeff2a;stop-opacity:1\"></stop></linearGradient><linearGradient gradientTransform=\"matrix(0.03267513,0,0,0.03267513,5.555801,1018.6805)\" gradientUnits=\"userSpaceOnUse\" y2=\"275.13159\" x2=\"162.84953\" y1=\"823.703\" x1=\"555.89331\" id=\"linearGradient4281\" xlink:href=\"#linearGradient4275\"></linearGradient></defs><g transform=\"translate(0,-1018.3622)\" id=\"layer1\"><path id=\"path4136\" d=\"m 13.661978,1019.0545 c -9.6447445,1.1926 -10.316754,13.2244 -4.2596149,18.1959 6.0571409,4.9714 13.9697969,9.3171 10.7466029,14.4295 9.372821,-1.0092 10.165143,-10.5469 5.793842,-15.3419 -4.371301,-4.7949 -17.4582341,-10.442 -12.28083,-17.2835 z\" style=\"opacity:1;fill:url(#linearGradient4281);fill-opacity:1;stroke:#000080;stroke-width:0.29986507;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1\"></path></g></svg>"
 
 /***/ }),
 
-/***/ 102:
-/***/ (function(module, exports, __webpack_require__) {
-
-var getMapData = __webpack_require__(103);
-
-/**
- * Removes `key` and its value from the map.
- *
- * @private
- * @name delete
- * @memberOf MapCache
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function mapCacheDelete(key) {
-  var result = getMapData(this, key)['delete'](key);
-  this.size -= result ? 1 : 0;
-  return result;
-}
-
-module.exports = mapCacheDelete;
+/***/ 1044:
+/***/ (function(module, exports) {
 
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 7 15\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><desc>Created with Sketch.</desc><defs></defs><g id=\"Symbols\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" stroke-linecap=\"square\"><g id=\"sources\" transform=\"translate(-1.000000, 0.000000)\" stroke=\"#DDE1E5\"><g id=\"Group\"><path d=\"M1.5,0.5 L1.5,14.5\" id=\"Line\"></path><path d=\"M4.5,0.5 L4.5,14.5\" id=\"Line\"></path><path d=\"M7.5,0.5 L7.5,14.5\" id=\"Line\"></path></g></g></g></svg>"
 
 /***/ }),
 
-/***/ 103:
-/***/ (function(module, exports, __webpack_require__) {
-
-var isKeyable = __webpack_require__(104);
-
-/**
- * Gets the data for `map`.
- *
- * @private
- * @param {Object} map The map to query.
- * @param {string} key The reference key.
- * @returns {*} Returns the map data.
- */
-function getMapData(map, key) {
-  var data = map.__data__;
-  return isKeyable(key)
-    ? data[typeof key == 'string' ? 'string' : 'hash']
-    : data.map;
-}
-
-module.exports = getMapData;
+/***/ 1045:
+/***/ (function(module, exports) {
 
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 14 5\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><desc>Created with Sketch.</desc><defs></defs><g id=\"Symbols\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" stroke-linecap=\"square\"><g id=\"outline\" transform=\"translate(0.000000, -2.000000)\" stroke=\"#DDE1E5\"><path d=\"M1.25,2.25 L1.25,2.75\" id=\"Line\" transform=\"translate(1.250000, 2.500000) rotate(90.000000) translate(-1.250000, -2.500000) \"></path><path d=\"M1.25,4.25 L1.25,4.75\" id=\"Line\" transform=\"translate(1.250000, 4.500000) rotate(90.000000) translate(-1.250000, -4.500000) \"></path><path d=\"M8.5,-3.5 L8.5,6.5\" id=\"Line\" transform=\"translate(8.000000, 2.000000) rotate(90.000000) translate(-8.000000, -2.000000) \"></path><path d=\"M8.5,-0.5 L8.5,9.5\" id=\"Line\" transform=\"translate(8.500000, 4.500000) rotate(90.000000) translate(-8.500000, -4.500000) \"></path><path d=\"M1.25,6.25 L1.25,6.75\" id=\"Line\" transform=\"translate(1.250000, 6.500000) rotate(90.000000) translate(-1.250000, -6.500000) \"></path><path d=\"M8.5,1.5 L8.5,11.5\" id=\"Line\" transform=\"translate(8.500000, 6.500000) rotate(90.000000) translate(-8.500000, -6.500000) \"></path></g></g></svg>"
 
 /***/ }),
 
-/***/ 104:
+/***/ 1117:
 /***/ (function(module, exports) {
 
-/**
- * Checks if `value` is suitable for use as unique object key.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
- */
-function isKeyable(value) {
-  var type = typeof value;
-  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
-    ? (value !== '__proto__')
-    : (value === null);
-}
-
-module.exports = isKeyable;
-
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 32 32\"><rect fill=\"#002f42\" width=\"16\" x=\"0\" y=\"28\" height=\"4\"></rect><rect fill=\"#0072b1\" width=\"16\" x=\"16\" y=\"28\" height=\"4\"></rect></svg>"
 
 /***/ }),
 
-/***/ 1043:
+/***/ 1118:
 /***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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:svg=\"http://www.w3.org/2000/svg\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" id=\"svg2\" viewBox=\"0 0 34 34\"><defs id=\"defs4\"><linearGradient id=\"linearGradient4275\"><stop id=\"stop4277\" offset=\"0\" style=\"stop-color:#006e00;stop-opacity:1\"></stop><stop style=\"stop-color:#00cc00;stop-opacity:1;\" offset=\"0.55349338\" id=\"stop4283\"></stop><stop id=\"stop4279\" offset=\"1\" style=\"stop-color:#eeff2a;stop-opacity:1\"></stop></linearGradient><linearGradient gradientTransform=\"matrix(0.03267513,0,0,0.03267513,5.555801,1018.6805)\" gradientUnits=\"userSpaceOnUse\" y2=\"275.13159\" x2=\"162.84953\" y1=\"823.703\" x1=\"555.89331\" id=\"linearGradient4281\" xlink:href=\"#linearGradient4275\"></linearGradient></defs><g transform=\"translate(0,-1018.3622)\" id=\"layer1\"><path id=\"path4136\" d=\"m 13.661978,1019.0545 c -9.6447445,1.1926 -10.316754,13.2244 -4.2596149,18.1959 6.0571409,4.9714 13.9697969,9.3171 10.7466029,14.4295 9.372821,-1.0092 10.165143,-10.5469 5.793842,-15.3419 -4.371301,-4.7949 -17.4582341,-10.442 -12.28083,-17.2835 z\" style=\"opacity:1;fill:url(#linearGradient4281);fill-opacity:1;stroke:#000080;stroke-width:0.29986507;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1\"></path></g></svg>"
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 2500 2500\"><path d=\"M70 188.5h220v1460h870v180H70v-1640zm1776 396c-225-3-450 140-520 357-100 250-54 564 142 755 190 158 476 170 690 58 147-78 240-233 260-396 26-170 13-356-70-510-98-164-290-270-480-263l-22-3zm20 174c165 0 313 126 340 288 50 183 20 407-130 536-140 114-365 98-480-43-140-150-140-380-68-560 50-130 183-223 323-220h18z\" fill=\"#000000\"></path><path d=\"M70 2061.5h2360v250H70v-250z\" fill=\"#3492ff\"></path></svg>"
 
 /***/ }),
 
-/***/ 1044:
+/***/ 1119:
 /***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 7 15\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><desc>Created with Sketch.</desc><defs></defs><g id=\"Symbols\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" stroke-linecap=\"square\"><g id=\"sources\" transform=\"translate(-1.000000, 0.000000)\" stroke=\"#DDE1E5\"><g id=\"Group\"><path d=\"M1.5,0.5 L1.5,14.5\" id=\"Line\"></path><path d=\"M4.5,0.5 L4.5,14.5\" id=\"Line\"></path><path d=\"M7.5,0.5 L7.5,14.5\" id=\"Line\"></path></g></g></g></svg>"
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0.1 31.4 256 244.5\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"xMinYMin meet\"><path fill=\"#FFF\" d=\"M57.9 219.3l.6-1.5.1-.2c.5-1.2 1-2.5 1.5-3.7.6-1.6 1.2-3.3 1.8-4.9.4-.9.7-1.8 1-2.8.8-2.2 1.9-5.1 3.2-7.9.8-1.7 1.4-2.9 2.1-4 .8-1.3 1.6-2.5 2.5-3.7l.7-1 1.1-.7c.1-.1.3-.2.5-.3.5-.3 1.1-.5 1.5-.7.7-.3 1.6-.6 2.6-.9 1.4-.4 3-.8 4.9-1.2 2.8-.6 5.8-1.2 9.6-1.8 5.7-.9 11.8-1.7 19.1-2.5 12.9-1.4 25.8-2.4 38.2-3 6.6-.3 11.6-.4 16.3-.4h3c3.1.1 6.7.2 10 .7 1.2.2 2.3.4 3.1.7.3.1.6.2.7.3l1 .4.8.7.9.9c1.1 1.1 2.3 2.4 3.5 3.9 3.8 4.8 7.2 10.6 10.2 17.2 2.9 6.4 4.7 12.1 5.8 17.7l1.5 7.9h-18.4l-1.1-5.3c-1.2-5.6-16.3-20.4-23.8-23.3-.8-.3-4-1.2-13.9-1.2-20.4 0-49.2 3.6-53.3 4.5-4.9 2.3-12.4 11.9-16.7 21.5l-1.8 3.9\"></path><path fill=\"#BA8449\" d=\"M182.9 190.1c-.9-1.2-1.9-2.3-3-3.3l-.7-.7s-.1 0-.2-.1c-.5-.2-1.2-.3-1.9-.4-2.9-.4-6-.5-9.1-.6-6.3-.1-12.6.1-18.9.4-12.6.6-25.3 1.6-37.8 3-6.3.7-12.6 1.5-18.8 2.5-3.1.5-6.2 1-9.2 1.7-1.5.3-3 .7-4.4 1.1-.7.2-1.4.4-2 .7-.3.1-.6.2-.7.4 0 0-.1 0-.1.1-.7 1-1.4 2-2.1 3.1-.7 1.1-1.2 2.3-1.8 3.5-1.1 2.4-2.1 4.9-3 7.4s-1.9 5.1-2.8 7.7c-.5 1.3-1 2.6-1.6 3.9-.2.6-.5 1.2-.8 1.8h8.5c4.6-10.3 13.3-22.1 20.5-25 2-.8 34.2-4.8 55.5-4.8 7.9 0 13.3.6 16.3 1.7 8.7 3.4 26.1 19.5 27.9 28.2h4.9c-1-5.5-3-10.9-5.3-16.1-2.6-6-5.7-11.5-9.4-16.2\"></path><path fill=\"#FFF\" d=\"M179.1 185.9z\"></path><path fill=\"#BA8449\" d=\"M179.1 185.9z\"></path><path fill=\"#FFF\" d=\"M192.1 228.6l-1-5.4c-.9-4.5-2.4-9.3-4.8-14.6-2.6-5.6-5.4-10.5-8.6-14.4-.6-.8-1.2-1.5-1.8-2.1-2.5-.4-5.4-.4-8-.5h-2.8c-4.5 0-9.3.1-15.7.4-12.2.6-24.7 1.6-37.4 3-7.1.8-13 1.6-18.4 2.4-3.5.5-6.3 1.1-8.8 1.6-1.6.4-2.8.7-3.9 1-.2 0-.3.1-.4.1-.2.4-.5.7-.7 1.1-.5.8-.9 1.7-1.6 2.9-1.1 2.3-2 4.7-2.8 6.8-.4.9-.7 1.8-1 2.7-.6 1.7-1.2 3.4-1.9 5.1-.5 1.3-1.1 2.6-1.6 4l-.1.2c-.2.6-.5 1.2-.7 1.7l-1.8 4H56.6l-1.7-.8-.2-.1c-4-2.3-4-5.7-3.9-7.1v-.3l.2-.9.3-1.1c.2-.7.4-1.5.6-2.2.4-1.5.9-2.9 1.4-4.3.9-2.6 2-5.4 3.3-8.4 1.4-3.1 2.7-5.8 4.2-8.3.7-1.3 1.5-2.6 2.5-4.1.9-1.4 1.9-2.8 2.9-4.1.9-1.1 1.7-1.8 2.3-2.2h.1c.6-.5 1.2-.8 1.5-.9.9-.5 1.6-.8 2.1-1 1.2-.5 2.3-.8 3.2-1.1 2-.6 3.9-1 5.3-1.3 2.9-.6 6-1.2 9.9-1.8 5.8-.9 11.9-1.6 19.4-2.4 13-1.3 26-2.3 38.6-2.8 6-.2 10.7-.4 15-.4h4.6c3.2.1 6.8.2 10.7.8h.1c.9.2 2.3.4 3.9.9h.1c.4.2 1 .4 1.7.7.5.3.9.5 1.2.7l.5.4.4.3.4.4 1.1 1.1c1.3 1.3 2.5 2.7 3.8 4.4 4 5.2 7.5 11.2 10.7 18.3 1.5 3.3 2.8 6.6 3.8 9.8 1.1 3.5 1.9 6.8 2.5 10l1.2 7.7h-18.2v.1z\"></path><path fill=\"#FFF\" d=\"M64.3 228.6l4.4-9.5c3.7-7.9 12.6-22.4 22.5-26.5l.2-.1c3.3-1.2 36.7-5.1 57.1-5.1 11.4 0 15.7 1.1 17.9 2 10.3 4 28.2 20.9 30.6 30.9l2 8.2H64.3z\"></path><path fill=\"#FFF\" d=\"M185.4 228.6l-1.2-5.1c-1.1-4.7-15.2-18.8-22.5-21.7-.7-.3-3.6-1.1-13.2-1.1-19.6 0-48 3.5-52.6 4.4-3.8 1.9-10.7 10-15.2 19.6l-1.8 3.8H62.3l4.2-9.3c4.9-11 14.6-24.6 24.1-28.4 3.7-1.5 37.5-5.3 58-5.3 8.9 0 14.9.7 18.6 2.1 10.3 4 29.6 21.4 32 33l1.6 8h-15.4z\"></path><path fill=\"#FFF\" d=\"M193.1 228.6l-1.9-1.8c-7.2-6.7-9.2-20.6-7-26.3 1.5-3.8 4.7-5.1 7.1-5.1.7 0 1.3.1 1.9.3 1.3-.1 4.3-2.6 5.2-4 1.4-2.6 4.1-4.2 7.4-4.2 4.9 0 12.9 3.9 15.5 7.6 1.5 2.1 1.9 4.6 1.1 6.8-.1.2-.2.6-.4 1.1-2.7 8.1-6.2 18-9 22.6l-1.9 3.1-18-.1z\"></path><path fill=\"#FFF\" d=\"M192.5 228.6l6.2-10.1c3-4.9 5.1-8.9 6.5-12-3.5 2.5-8.4 4-15.7 4.4l-.2-.2-.1.7c-4.3 0-7.8-3.5-8-7.8-.1-2.1.7-4.2 2.1-5.8 1.4-1.6 3.4-2.5 5.5-2.6 7.2-.3 8.1-2 9.4-4.5 1.8-3.4 5.7-5.4 10.8-5.4 1.3 0 2.6.1 3.8.4 6.3 1.4 10.4 6.2 10.7 12.4.3 6.3-3.2 15.5-10.2 27.3l-1.9 3.2h-18.9z\"></path><path fill=\"#FFF\" d=\"M218.8 208.9c-8.1 0-16.9-5.3-21.4-10.5-4.1-4.7-4.5-8.9-4.1-11.6.5-3.3 3.2-6.6 8.1-6.6.9 0 1.8.1 2.6.2.8-3.6 2.7-11.1 10.4-11.1h1.1c3.7.4 6.5 2.7 7.6 6.2 1.2-.6 2.6-1.1 4.2-1.1 2.4 0 4.7 1 6.4 2.8 2.7 2.9 3.3 6.9 1.6 10.7 1.8 1.1 3.2 2.8 3.8 5 .8 2.8.3 5.8-1.5 8.2-3.5 4.9-11.6 7.2-18 7.4-.4.4-.6.4-.8.4M210.8 44.2c-7.3 4.6-15.3 15.1-25.1 29.5-1.5 2.3-4 3.5-6.8 3.5-3.6 0-8.2-2.2-13.5-6.5-8.4-6.8-8.6-10.6-8.7-12.1-.2-4 2.8-7.4 7-7.8 8.1-.7 14.8-5.6 21.3-10.3 6.5-4.7 12.5-9 19.7-9 1.4 0 2.9.2 4.3.5\"></path><path fill=\"#FFF8EE\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4\"></path><path fill=\"#FFF\" d=\"M37.3 48.2c4.9-4.5 11.5-6.8 19.6-6.8 7 0 15.3 1.7 24.6 5.1 2.5.9 5.8 1.1 8.3 1.1h3.7c2.3 0 7.2 0 9.3 4.5.7 1.7 1.6 5.2-1.1 9.3-3.3 5.1-12 10.5-20.4 10.5h-.4c-4.5-.1-8.7-2.5-13.6-5.2-6.1-3.4-13-7.3-21.2-7.3-1.1 0-2.3.1-3.4.2M188.1 96.7c-3.6 0-10.4-1.5-14.7-11.7-2.4-5.4-3.2-11.5-3.2-14.9 0-7 3.7-8.9 6-9.4 1.6-1.6 4.6-5.7 6.8-8.8 9.1-12.4 15.7-20.5 23.4-20.5 1.3 0 2.5.2 3.7.7 10.3 4.1 15.3 12.8 13.6 23.8-1.2 8.1-6.3 17.7-13.8 26.5-3.5 4.1-12.6 13.7-20.7 14.3h-1.1\"></path><path fill=\"#FFF\" d=\"M69.9 100.5c-.9 0-1.8 0-2.6-.2-12.8-2.1-28.8-15-34.8-28.3-4.1-9.1-2.3-15.3 0-18.9 3.7-5.9 9.2-9 16-9 8.2 0 16.4 4.5 23.6 8.4 2.8 1.5 6.8 3.7 8.5 4.1.6-.2 1.2-.3 1.9-.3 2.6 0 5 1.4 6.4 3.8 3.3 5.8 1.3 21.4-3.9 30.4-3.6 6.6-9 10-15.1 10z\"></path><path fill=\"#FFF\" d=\"M114.5 212.1c-30 0-59.7-14.7-69.6-25.4-10.3-11.1-14-23.7-11.2-37.5 2.4-11.3 8.7-21.4 14.2-30.4 3.8-6.2 7.4-12 8.4-16.2 12.2-53.9 42.8-60.8 68.1-60.8 1.6 0 3.3 0 5.2.1 53.9 1.6 59.3 27.6 62.5 43.2.6 2.9 1.2 5.6 1.9 7.4 18.1 44.4 21.1 71 10 89-10.9 17.7-34.8 26.4-82.4 30.3-2.3.2-4.7.3-7.1.3z\"></path><path fill=\"#FFF\" d=\"M113.4 212.2c-30.6 0-58.9-15.2-68.4-25.5-10.3-11.1-14-23.7-11.2-37.5 2.4-11.3 8.7-21.4 14.2-30.4 3.8-6.2 7.4-12 8.4-16.2 12.2-53.9 42.8-60.8 68.1-60.8 1.6 0 3.3 0 5.2.1 53.9 1.6 59.3 27.6 62.5 43.2.6 2.9 1.2 5.6 1.9 7.4 17.8 43.7 20.7 70.1 9.8 88.1-12.5 20.7-41.9 27.4-82.1 31.2-2.8.3-5.6.4-8.4.4\"></path><path fill=\"#FFF\" d=\"M191.3 174.6c.4-.9.8-1.9 1.2-2.8 4.1-9.8 7.2-18.4 2.3-23.9-5.8-6.4-30.3-18-52.1-28.2-41.7-19.7-67.5-32.4-71.2-45-.9-3.2-.5-6.5 1.2-9.3C79.9 54.1 100 42 127.5 42h.8c25.9.2 44.7 7.7 56 22.1 9.6 12.2 11.7 26.5 13.3 36.9.5 3.5 1.2 8 1.9 9.2 19.6 33.7 10.6 58.6 3.5 70.3l-11.7-5.9z\"></path><path fill=\"#FFF\" d=\"M170.8 135.8c-10.1 0-27-2.5-32.8-8.1-4.6-4.4-6.3-11.7-8.1-18.8-.7-3-1.9-7.8-3-10h-.1c-.4 1.1-.9 2.5-1.3 3.6-2.7 7.6-6.5 18.1-14.4 23.8-3.4 2.5-15.7 4.7-25.2 4.7s-16.7-2-21.5-6.1c-6.9-5.8-12.1-16.5-15.6-31.8-.2-.1-.3-.2-.5-.3-1.6-1.1-3.7-2.4-4.8-4.7-1.8-3.6-1.1-10 .8-13.4 1.4-2.5 3.8-4.1 6.4-4.3h.9c1.4 0 2.8.2 4.4.5s3.5.6 5.1.6h.9c9.5-1.4 18.4-2 26.5-2 19.7 0 30.1 4 34 5.6.3.1.6.2.8.3 1.1.3 3.2.7 5.4.7.8 0 1.6 0 2.3-.2 8.9-1.4 17.4-2 25.2-2 20.8 0 31.8 4.7 36.6 6.8.4.2.8.4 1.1.4h.4c1.3 0 3.2-.4 4.8-.7 1.2-.3 2.4-.5 3.5-.7h.9c3.1 0 5.9 1.8 7.6 4.8 1.9 3.5 3.2 10.8.5 15-1.8 2.8-4.7 4.1-7.1 5.2-.3.1-.7.3-1 .5-.8 1.4-2.2 4.2-3.4 6.5-3.5 6.8-7.4 14.6-11 18.8-3.2 3.6-9.2 5.3-18.3 5.3\"></path><defs><path id=\"a\" d=\"M42.5 75H212v59.2H42.5z\"></path></defs><clipPath id=\"b\"><use xlink:href=\"#a\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#b)\"><path fill=\"#FFF\" d=\"M166.778 134.181c-8 0-19.3-1.2-27.4-6.9-4.6-3.3-6.7-9.9-9.6-20.5-.8-3-2-7.2-2.9-9.3-.5 1.2-1.1 2.8-1.6 4.1-3 8.1-7.1 19.1-14.6 23.7-3.9 2.4-16 4.6-25.4 4.6-10.1 0-17.4-2.3-21.6-6.7-10.7-11.2-12.8-21.9-14.1-28.2-.2-.9-.4-2.1-.6-2.8-6.3-3.3-6.7-8.2-6.6-10.3.3-3.9 3.3-6.8 7-6.8 2.5 0 4.1 1.2 5.3 2 .1.1.2.2.4.2.1 0 .4.1.5.2 1.6.5 6.3 1.8 7.3 7.9.2 1.1 1.8 7.5 4.4 14.2 4.1 10.7 7 12.5 7.3 12.6 3.4 1.2 7.4 1.8 11.9 1.8 7.4 0 13.6-1.6 16.1-2.4 1.5-2.3 4.5-8.3 6.6-12.4 6.3-12.5 7.4-14.4 10.1-15.8 1.5-.8 3.3-1.2 5.6-1.2 3 0 7.3.7 9.3 1.6 4.6 2 7 8 12.4 23.5 1 2.8 2.2 6.4 3 8.2 4 1.9 13.1 3.2 22.6 3.2 2.7 0 4.7-.1 6-.2.9-1.9 2.2-4.6 3.3-6.9 7.6-16.2 8.8-18.1 10.7-19.6 3.3-2.5 9.1-4.2 12.4-4.2 4.4 0 6.8 2.9 7.4 5.7 1.1 5.8-4.6 8-6.5 8.7-.5.2-1.2.5-1.7.7-.7 1.2-2 3.8-3 5.9-8.2 16-10.9 20.4-14 22.3-3.8 2.1-13 3.1-20 3.1\"></path></g><defs><path id=\"c\" d=\"M45 70.7h33.4v16.2H45z\"></path></defs><clipPath id=\"d\"><use xlink:href=\"#c\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#d)\"><path fill=\"#FFF\" d=\"M61.388 86.816c-1.2 0-3.5-.2-8.1-1.7-1.2-.4-2.3-.8-3-1.1-1.5-.6-5.4-2.1-5.4-6.7v-6.7h6.6c.9 0 1.5.2 2 .3 1.4.2 5.9.5 7.4.6l.9.1c1.2 0 4.9-.5 6.5-.7 2-.3 2.6-.4 3.4-.4h5.7l.9 5.6c.4 2.8-1.1 6.3-4.8 7.4-.2.1-.9.3-1.5.5-3.5 1.3-7 2.5-10 2.6-.2.2-.4.2-.6.2\"></path></g><defs><path id=\"e\" d=\"M181 79.3h25.4v17.2H181z\"></path></defs><clipPath id=\"f\"><use xlink:href=\"#e\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#f)\"><path fill=\"#FFF\" d=\"M193.488 96.41c-2.2 0-4.4-.9-7.4-3-2.9-2-5.1-4-5.1-7.5v-6.7h6.5c.9 0 1.8.2 2.7.6.7.3 3.4 1.2 4.6 1.5.4 0 1.2-.2 2.8-.5.8-.2 1.3-.2 2-.2h5.7l.9 5.6c.4 2.7-.8 6.1-4.5 7.4l-1.2.6c-1.8.9-3.9 1.9-6 2.3-.2-.1-.6-.1-1-.1\"></path></g><path fill=\"#FFF\" d=\"M171.7 243.3h-24.6V222h24.6v21.3z\"></path><path fill=\"#BA8449\" d=\"M182.9 190.1c-.9-1.2-1.9-2.3-3-3.3l-.7-.7s-.1 0-.2-.1c-.5-.2-1.2-.3-1.9-.4-2.9-.4-6-.5-9.1-.6-6.3-.1-12.6.1-18.9.4-12.6.6-25.3 1.6-37.8 3-6.3.7-12.6 1.5-18.8 2.5-3.1.5-6.2 1-9.2 1.7-1.5.3-3 .7-4.4 1.1-.7.2-1.4.4-2 .7-.3.1-.6.2-.7.4 0 0-.1 0-.1.1-.7 1-1.4 2-2.1 3.1-.7 1.1-1.2 2.3-1.8 3.5-1.1 2.4-2.1 4.9-3 7.4s-1.9 5.1-2.8 7.7c-.5 1.3-1 2.6-1.6 3.9-.2.6-.5 1.2-.8 1.8h8.5c4.6-10.3 13.3-22.1 20.5-25 2-.8 34.2-4.8 55.5-4.8 7.9 0 13.3.6 16.3 1.7 8.7 3.4 26.1 19.5 27.9 28.2h4.9c-1-5.5-3-10.9-5.3-16.1-2.6-6-5.7-11.5-9.4-16.2M179.1 185.9z\"></path><path fill=\"#895B2E\" d=\"M179.1 185.9zm17.8 17.9c-2.7-6-5.8-11.7-9.9-16.9-1-1.3-2.1-2.6-3.3-3.8l-.9-.9-.2-.2-.1-.1-.2-.2c-.2-.1-.4-.2-.5-.3-.3-.2-.6-.3-.9-.4-1.1-.4-1.9-.5-2.8-.7-3.4-.5-6.6-.6-9.8-.7-6.5-.1-12.8 0-19.2.3-12.8.5-25.5 1.5-38.2 2.8-6.3.7-12.7 1.4-19.1 2.4-3.2.5-6.3 1-9.5 1.7-1.6.4-3.2.7-4.8 1.2-.8.2-1.6.5-2.5.9-.4.2-.9.4-1.4.7-.2.2-.5.3-.8.5-.3.2-.6.5-1 1-.9 1.1-1.8 2.4-2.6 3.6-.8 1.2-1.6 2.5-2.3 3.8-1.4 2.5-2.7 5.1-3.9 7.7-1.1 2.6-2.2 5.2-3.1 7.9-.5 1.3-.9 2.6-1.2 4-.2.7-.4 1.3-.6 2l-.3 1-.1.5c0 .1.2.2.6.5H64.2c.3-.6.5-1.2.8-1.8.5-1.3 1.1-2.6 1.6-3.8 1-2.6 1.9-5.1 2.8-7.7.9-2.5 1.9-5.1 3-7.4.6-1.2 1.2-2.3 1.8-3.5.7-1.1 1.3-2.1 2.1-3.1 0 0 .1 0 .1-.1.2-.1.5-.2.7-.4.6-.2 1.3-.5 2-.7 1.4-.4 2.9-.8 4.4-1.1 3-.7 6.1-1.2 9.2-1.7 6.2-1 12.5-1.8 18.8-2.5 12.6-1.4 25.2-2.4 37.8-3 6.3-.3 12.6-.5 18.9-.4 3.1.1 6.3.2 9.1.6.7.1 1.4.3 1.9.4.1 0 .2 0 .2.1l.7.7c1.1 1.1 2 2.2 3 3.3 3.7 4.7 6.8 10.2 9.4 15.8 2.3 5.2 4.3 10.6 5.3 16.1h5c-.5-3.1-1.3-6.1-2.2-9-1.2-3.1-2.4-6.1-3.7-9.1\"></path><path fill=\"#FFF8EE\" d=\"M164.1 195.7c-2.6-1-7.9-1.6-15.5-1.6-21.4 0-53 4-54.7 4.7-6.5 2.6-14.6 13.6-19.1 23.2h115.9c-1.9-7.5-18-22.9-26.6-26.3\"></path><path fill=\"#E5D0AE\" d=\"M164.8 193.8c-2.9-1.1-8.4-1.7-16.3-1.7-21.3 0-53.5 4-55.5 4.8-7.3 3-15.9 14.7-20.5 25h2.2c4.5-9.5 12.6-20.5 19.1-23.2 1.7-.7 33.3-4.7 54.7-4.7 7.6 0 12.9.5 15.5 1.6 8.6 3.3 24.7 18.8 26.6 26.3h2c-1.7-8.6-19.1-24.7-27.8-28.1\"></path><path fill=\"#BA8449\" d=\"M204.4 194.7c-1.2 2.5-7.5 8.9-12.8 7.4-2.8-.8-2.3 14 4.1 19.9h11.6c3.2-5.1 8.2-20.7 8.8-22.3.7-1.9-10.5-7.5-11.7-5\"></path><path fill=\"#895B2E\" d=\"M216.7 198.4c-.2-3.2-2.1-5.5-5.5-6.3-2.7-.6-6.3-.1-7.2 1.6-1.8 3.4-4 7.5-14.9 8.1-.7 0-1.3.7-1.3 1.4s.7 1.3 1.4 1.3c11.4-.5 14.7-4.9 17.1-9.4.5-.4 3.2-.9 5.4 0 1.6.7 2.3 1.8 2.4 3.5.3 6.2-6.2 17.7-9.7 23.5h3.1c3.9-6.8 9.5-17.3 9.2-23.7\"></path><defs><path id=\"g\" d=\"M193.5 196.5H217v27.3h-23.5z\"></path></defs><clipPath id=\"h\"><use xlink:href=\"#g\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#h)\"><path fill=\"#E3AB5E\" d=\"M194.235 222.3c7.1-1.7 13.4-8.8 13.9-18.9.1-1.9-3.8-5.5-3.8-6.5s11.9.2 12.5 3c.5 2.8-7.4 19.7-10.1 22.5-2.6 2.7-16.7.9-12.5-.1\"></path></g><path fill=\"#FCD4C3\" d=\"M199.8 187.8c-.9 6.2 11.2 14.7 19.4 14.5 6.8-.2 14.5-3.4 13.4-7.2-1.1-3.9-7.7.7-8.3-2-.5-2.6 7.7-7.5 4.4-11.1-3.1-3.3-6.7 5.2-10.3 4-3.6-1.2.7-9.5-3.8-10-5.3-.5-3.3 11.3-7.3 11.5-2.8.3-7.2-1.7-7.5.3\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M199.8 187.8c-.9 6.2 11.2 14.7 19.4 14.5 6.8-.2 14.5-3.4 13.4-7.2-1.1-3.9-7.7.7-8.3-2-.5-2.6 7.7-7.5 4.4-11.1-3.1-3.3-6.7 5.2-10.3 4-3.6-1.2.7-9.5-3.8-10-5.3-.5-3.3 11.3-7.3 11.5-2.8.3-7.2-1.7-7.5.3z\"></path><defs><path id=\"i\" d=\"M203.2 182.8h7.8v6.4h-7.8z\"></path></defs><clipPath id=\"j\"><use xlink:href=\"#i\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#j)\"><path fill=\"#FCD4C3\" d=\"M203.238 187.742c1.3 1 6 2.3 6.7.6.8-1.7 1.4-5.1.9-5.6-.4 1.6-.9 4.6-2.6 5.3-1.3.5-4.1-.1-5-.3\"></path></g><defs><path id=\"k\" d=\"M215.9 181.2h7.7v7.2h-7.7z\"></path></defs><clipPath id=\"l\"><use xlink:href=\"#k\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#l)\"><path fill=\"#FCD4C3\" d=\"M216.159 181.142c-.2 1.1-1.1 6.3 1.6 7 2.3.6 4-.8 5.8-3.7-1 .9-3.5 3.1-5.4 2.3-1.9-.9-2.1-2.9-2-5.6\"></path></g><defs><path id=\"m\" d=\"M204.5 193h15.8v8.6h-15.8z\"></path></defs><clipPath id=\"n\"><use xlink:href=\"#m\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#n)\"><path fill=\"#FCD4C3\" d=\"M204.576 195.158c13.6-6.7 16.4 4.2 15.7 6.4-5.4.9-14.9-4.7-15.7-6.4\"></path></g><defs><path id=\"o\" d=\"M223 190.9h5.7v5H223z\"></path></defs><clipPath id=\"p\"><use xlink:href=\"#o\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#p)\"><path fill=\"#FCD4C3\" d=\"M224.351 190.896c-2.3 2.6-1.2 4.7.3 5 1.9.4 4.4-1.6 4-1.6-.5 0-4.2 1.2-4.9-.6-.5-1.4.3-2.2.6-2.8\"></path></g><defs><path id=\"q\" d=\"M66.1 182.6H195v36.5H66.1z\"></path></defs><clipPath id=\"r\"><use xlink:href=\"#q\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#r)\"><path fill=\"#E3AB5E\" d=\"M69.034 208.266c43.7 25.1 130.4-.4 125.8-8.6-6.1-10.9-8.5-17.7-21.9-17.1-13.3.7-98.9 7.5-102.4 10.1-3.4 2.7-7.2 12.3-1.5 15.6\"></path></g><path fill=\"#FFF8EE\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4\"></path><path fill=\"none\" stroke=\"#E5D0AE\" stroke-width=\"3\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-miterlimit=\"10\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4z\"></path><path fill=\"#BA8449\" d=\"M41.8 53.1c8.8-8.2 24.7-5 37.5-.4 7.3 2.6 16.8.5 17.4 2 1.6 3.5-7.9 10.7-15.7 10.5-7.7-.1-20.6-14.6-39.2-12.1\"></path><path fill=\"none\" stroke=\"#895B2E\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-miterlimit=\"10\" d=\"M41.8 53.1c8.8-8.2 24.7-5 37.5-.4 7.3 2.6 16.8.5 17.4 2 1.6 3.5-7.9 10.7-15.7 10.5-7.7-.1-20.6-14.6-39.2-12.1z\"></path><path fill=\"#FCD4C3\" d=\"M177.7 67.2c4.5 1.3 21.6-32.2 29.9-28.9 26.4 10.5-8 50.9-18.9 51.8-11 .8-13.5-23.7-11-22.9\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M177.7 67.2c4.5 1.3 21.6-32.2 29.9-28.9 26.4 10.5-8 50.9-18.9 51.8-11 .8-13.5-23.7-11-22.9z\"></path><path fill=\"#FCD4C3\" d=\"M82.3 63.2c-7.3 3.2-33.2-23.9-44.1-6.5C31 68.2 52.8 91.4 68.4 93.9s17.7-32.4 13.9-30.7\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M82.3 63.2c-7.3 3.2-33.2-23.9-44.1-6.5C31 68.2 52.8 91.4 68.4 93.9s17.7-32.4 13.9-30.7z\"></path><defs><path id=\"s\" d=\"M180.5 44.8h18v44.6h-18z\"></path></defs><clipPath id=\"t\"><use xlink:href=\"#s\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#t)\"><path fill=\"#FCD4C3\" d=\"M198.067 44.8c-1.4 4.6-13.2 16.5-11.6 26.7.6 3.8 4.6 15 6.3 14.6s6-3.1 5.6-2.5c-.4.6-6 4.7-8.1 5.8-2.1-1.1-11-21.8-9.7-22.9 3.9-3.5 15.8-21.5 17.5-21.7\"></path></g><defs><path id=\"u\" d=\"M38.6 51.5h44.2v31.6H38.6z\"></path></defs><clipPath id=\"v\"><use xlink:href=\"#u\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#v)\"><path fill=\"#FCD4C3\" d=\"M38.533 57.4c8-4.9 22.6-2.8 31.1 5.5 3 3 3.9 13-2.9 19.8-2.7 2.7 16-9.6 16.1-13.2 0-3.6-1.2-4.6-4-5.6-10.3-3.8-21.1-12.6-30.5-12.4-6.1.1-8.9 4.3-9.8 5.9\"></path></g><defs><path id=\"w\" d=\"M181.1 42.2h26.2v44.2h-26.2z\"></path></defs><clipPath id=\"x\"><use xlink:href=\"#w\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#x)\"><path fill=\"#FCD4C3\" d=\"M201.3 42.175c18.2 10-11.1 25.2-8.9 44.1-3.8-.4-13.2-18.7-10.9-20.3 3.2-2.2 16.7-24.6 19.8-23.8\"></path></g><path fill=\"#E5D0AE\" d=\"M60.9 103.6c.3-1.3.5-2.7.5-4 .1-1.4.2-2.8.5-4.1.1-.7.3-1.4.6-2 .3-.6.5-1.3.7-1.9.5-1.3 1-2.6 1.6-3.8 2.3-5.1 4.9-9.9 8.1-14.4 3.2-4.5 6.7-8.7 10.7-12.3 4-3.7 8.7-6.7 13.7-8.7 5-2.1 10.4-3.4 15.8-4 5.4-.7 10.8-.8 16.2-.7 5.4.1 10.8.4 16.2 1.1 5.4.7 10.8 1.9 16 3.8 2.6 1 5.1 2.1 7.5 3.5 2.4 1.4 4.7 3.1 6.8 5.1 2.1 1.9 3.9 4.2 5.4 6.6 1.5 2.4 2.6 5 3.6 7.7.9 2.6 1.6 5.3 2.2 8s1 5.3 1.6 7.8c.3 1.2.7 2.4 1.1 3.6.5 1.2 1 2.5 1.4 3.8.9 2.5 1.9 5.1 2.8 7.6 3.5 10.2 6.6 20.6 8.5 31.2.9 5.3 1.6 10.7 1.7 16.1.1 5.4-.4 10.8-1.9 16-.4 1.3-.8 2.6-1.3 3.8-.5 1.2-1.2 2.4-1.6 3.7-.2.7-.4 1.3-.7 1.9-.3.6-.7 1.2-1.1 1.8-.7 1.1-1.6 2.3-2.5 3.3-3.5 4.2-8 7.6-12.8 10.2s-10 4.6-15.2 6.1c-5.3 1.5-10.5 2.7-15.9 3.7s-10.7 1.7-16 2.4l-8.1.9-4 .4c-1.3.1-2.7.2-4.1.3-11 .6-22-1-32.5-3.9-5.3-1.5-10.4-3.3-15.4-5.5s-9.9-4.7-14.5-7.7c-2.3-1.5-4.6-3.2-6.7-5.1-.5-.5-1.1-1-1.6-1.5s-.9-1.1-1.4-1.6c-.9-1.1-1.8-2.2-2.6-3.3-3.1-4.6-5.6-10-6.4-15.6-.9-5.7-.1-11.5 1.5-16.8 1.6-5.4 4.1-10.3 6.7-15.1 2.7-4.7 5.6-9.3 8.4-13.8 1.4-2.3 2.7-4.6 3.9-6.9 1.1-3 2.1-5.3 2.6-7.7zm4 .9c-.7 2.8-1.9 5.4-3.2 7.9s-2.7 4.8-4.1 7.1c-2.8 4.6-5.7 9.1-8.2 13.7s-4.8 9.4-6.2 14.3c-1.4 4.9-2 10-1.2 15 .8 4.9 2.9 9.6 5.9 13.7.7 1 1.6 2 2.4 3 .4.5.9 1 1.3 1.4.4.5.9.9 1.3 1.3 1.8 1.7 3.9 3.2 6.1 4.7 4.4 2.8 9 5.3 13.9 7.4 4.8 2.1 9.8 3.9 14.9 5.3s10.2 2.5 15.4 3.2c5.2.7 10.4.9 15.6.7l3.9-.3 4-.4c2.6-.2 5.3-.5 8-.8 5.3-.5 10.6-1.2 15.8-2.1 5.3-.9 10.4-1.9 15.5-3.3s10.1-3 14.9-5.1c4.7-2.2 9.3-4.9 13-8.6.9-.9 1.8-1.9 2.6-2.9.4-.5.8-1.1 1.2-1.6.4-.5.9-1 1.3-1.6.9-1.1 1.3-2.3 1.9-3.5.5-1.2.9-2.5 1.2-3.8 1.3-5.2 1.6-10.6 1.3-15.9-.4-5.3-1.3-10.6-2.6-15.8-2.5-10.4-6.2-20.4-10.1-30.3-1-2.5-2-5-3-7.4l-1.6-3.7c-.5-1.3-1-2.7-1.4-4-.7-2.7-1.2-5.3-1.8-7.9-.5-2.6-1.2-5.1-2-7.5-1.7-4.9-4.2-9.3-7.9-12.8-3.6-3.5-8.1-6.2-12.9-8.2-4.8-2-10-3.3-15.2-4.2-5.2-.9-10.5-1.4-15.8-1.7-5.3-.2-10.7-.3-16 .3-5.3.6-10.5 1.7-15.4 3.8-4.9 2-9.4 4.9-13.2 8.5-3.9 3.6-7 8-9.3 12.6-2.4 4.7-4.1 9.7-5.6 14.7-.4 1.2-.7 2.5-1 3.8-.2.6-.3 1.3-.5 1.9-.1.3-.1.7-.2 1-.1.3-.2.6-.4.9-.5 1.2-1.1 2.4-1.7 3.6-.2 1.1-.6 2.3-.9 3.6z\"></path><path fill=\"#FFF8EE\" d=\"M62.9 104.1c-4.2 18.6-40.9 48-13 78.1 9.5 10.2 40.3 25.9 71.2 23 80.4-7.6 100.7-27 66.8-110.2-5.5-13.5.7-44.7-58.4-46.5-24.8-.7-54.6 2.7-66.6 55.6\"></path><path fill=\"#E5BFA1\" d=\"M76.8 67.7c2.6-4 6-7.3 9.8-10C90.4 55 94.7 53 99 51.4c8.8-3.2 18-4.4 27.2-4.7 9.2-.2 18.5.5 27.5 2.8 4.5 1.2 8.9 2.8 13.1 5.1s8.1 5.1 11.4 8.6c3.3 3.5 6 7.4 8.1 11.7 2.1 4.3 3.6 8.8 4.7 13.3 1.1 4.6 1.8 9.1 2.4 13.6.3 2.3.6 4.5 1.1 6.6.2 1.1.5 2.1.8 2.9l.3.6.1.1.1.1.2.4.9 1.5c4.4 8.1 7.7 17 8.9 26.3.6 4.6.7 9.3.2 14-.5 4.6-1.7 9.2-3.5 13.5-.9 2.1-1.9 4.2-3.1 6.3l-.9 1.5c-.3.5-.6.9-1 1.5-.1.1-.1.2-.2.3-.3-.2.4.7-1.6 0-.5-.9-.2-.7-.3-.9 0-.3.1-.4.1-.6l.3-.9.5-1.6c1.4-4.3 2.6-8.6 3.1-13.1.2-2.2.3-4.4 0-6.7-.3-2.2-.9-4.3-2-6.1-.3-.5-.6-.9-1-1.3s-.7-.8-1.1-1.2c-.8-.8-1.6-1.5-2.5-2.2-1.8-1.4-3.7-2.5-5.7-3.5-4.1-1.8-8.6-2.5-13-2.3-4.5.2-8.9 1.1-13.2 2.3-2.2.6-4.3 1.3-6.5 2-1.1.4-2.2.7-3.3 1-.6.2-1.1.3-1.8.4-.6.1-1.1.2-1.7.2-4.6.5-9.1.8-13.8.7-4.6-.1-9.2-.6-13.8-1.6-4.5-1-9-2.5-13.2-4.4-4.2-2-8.2-4.4-11.8-7.4-3.6-3-6.8-6.4-9.6-10.1-5.6-7.5-9.3-16.2-11.1-25.3-.9-4.6-1.3-9.2-1.1-13.9.1-2.3.4-4.7.9-7 .6-1.8 1.4-4.1 2.7-6.2zm2 1.3c-1.1 1.8-1.8 3.8-2.3 6-.5 2.1-.7 4.3-.9 6.5-.2 4.4.3 8.9 1.2 13.2 1.9 8.7 5.6 17 11 24 2.7 3.5 5.8 6.7 9.2 9.5 3.4 2.8 7.2 5.2 11.2 7.1 4 1.9 8.2 3.3 12.6 4.3 4.3 1 8.8 1.6 13.2 1.7 4.5.2 8.9 0 13.4-.5l1.7-.2c.5-.1 1-.2 1.6-.3 1.1-.3 2.1-.6 3.2-.9 2.2-.6 4.4-1.3 6.6-1.8 4.4-1.1 9-1.9 13.7-1.9 4.6 0 9.3.8 13.5 2.8 2.1 1 4.1 2.2 5.9 3.6.9.7 1.8 1.5 2.6 2.3l1.2 1.2c.4.4.8.9 1.1 1.4 1.3 2 2 4.3 2.3 6.7s.3 4.7.1 7c-.4 4.6-1.4 9.1-2.7 13.5l-.5 1.6-.2.8c0 .1-.1.3 0 .3-.1-.1.2.2-.2-.7-1.9-.7-1.2.2-1.4-.1.2-.4.5-.9.8-1.4.3-.5.5-1 .8-1.5 1-2 1.9-4 2.7-6.1 3-8.3 3.6-17.4 2.1-26.1-.7-4.4-2-8.6-3.6-12.7s-3.5-8.1-5.7-12l-.8-1.4-.2-.4-.1-.2-.1-.2c-.2-.3-.3-.6-.4-.9-.5-1.2-.8-2.5-1.1-3.6-.5-2.3-.9-4.6-1.2-6.8-.7-4.5-1.3-8.9-2.4-13.2-1-4.3-2.4-8.5-4.3-12.4-1.9-3.9-4.2-7.5-7.2-10.7-5.8-6.3-13.8-10.5-22.3-13s-17.5-3.3-26.5-3.3c-8.9 0-17.9 1.1-26.3 3.9-4.2 1.4-8.2 3.3-11.9 5.8-3.8 2.4-7 5.4-9.4 9.1z\"></path><path fill=\"#895B2E\" d=\"M75.6 67.2c1.5-2.4 3.3-4.3 5.1-6.1 1.9-1.8 3.9-3.3 6-4.7 4.2-2.8 8.7-5 13.4-6.7 9.4-3.3 19.3-4.6 29.1-4.4 9.7.3 19.5 1.5 28.9 4.9 4.7 1.7 9.2 3.9 13.3 6.9 4.1 2.9 7.7 6.5 10.7 10.6 2.9 4.1 5.1 8.6 6.8 13.3 1.6 4.7 2.7 9.5 3.5 14.2.4 2.4.7 4.7 1.1 7.1.4 2.3.7 4.7 1.1 6.8.2 1.1.5 2.1.9 2.9l.1.2.1.2.2.4.4.8.9 1.6c1.1 2.1 2.2 4.3 3.2 6.5 1.9 4.4 3.5 9.1 4.6 13.9 1.1 4.7 1.6 9.6 1.6 14.5-.1 9.8-2.8 19.5-7.9 27.8-.4.6-1.2.9-1.8.5-.6-.4-.8-1.1-.6-1.6 1.4-3.6 2.9-7 4-10.5 1.2-3.5 2-7.1 2-10.6s-.9-6.9-3-9.6c-.1-.2-.3-.4-.4-.5l-.2-.2-.2-.3-.9-.9c-.6-.6-1.3-1.2-2-1.7-1.4-1.1-3-2.1-4.5-3.1-6.3-3.9-13-7.3-19.8-10.7-6.8-3.3-13.7-6.5-20.5-9.6-13.8-6.3-27.6-12.6-41.2-19.4-6.8-3.5-13.5-7-20.1-11.2-3.5-2.5-6.7-4.7-9.8-7.5-1.5-1.4-3-3-4.2-5.2-.6-1.1-1.1-2.4-1.2-4 0-.8 0-1.6.2-2.4.1-.4.2-.8.4-1.2.1-.3.4-.9.5-1h.2zm5.6 3.4c-.2.3-.1.2-.2.3 0 .1 0 .1-.1.2v.4c0 .3.2.8.4 1.4.6 1.2 1.7 2.5 2.9 3.6 2.5 2.4 5.4 4.6 8.5 6.6 6.1 4.1 12.7 7.7 19.4 11.3 13.3 7 27 13.5 40.6 20.1 6.8 3.3 13.6 6.7 20.4 10.1 6.8 3.5 13.5 7 20 11.3 1.6 1.1 3.2 2.2 4.7 3.5.8.6 1.5 1.3 2.3 2 .4.4.7.7 1.1 1.2l.2.3.3.3c.2.2.3.4.5.6 1.2 1.7 2.1 3.6 2.7 5.6s.7 4.1.7 6.1c-.1 4-1.2 7.9-2.5 11.6-1.3 3.7-2.9 7.1-4.4 10.6l-2.4-1.2c4.7-8 6.9-17.2 6.8-26.4-.2-9.2-2.6-18.3-6.5-26.7-1-2.1-2-4.2-3.2-6.2l-1.8-3.2c-.7-1.3-1-2.6-1.3-3.8-.6-2.5-1-4.8-1.4-7.2s-.8-4.7-1.2-6.9c-.9-4.6-2-9-3.6-13.3-1.6-4.2-3.7-8.3-6.3-11.8-2.6-3.6-5.9-6.7-9.5-9.2-3.7-2.5-7.7-4.5-12-5.9-8.6-2.9-17.8-3.9-27-4-4.6 0-9.1.2-13.6 1-4.5.7-8.9 1.8-13.1 3.3s-8.3 3.4-12 5.8c-1.9 1.2-3.6 2.5-5.2 4s-3.1 3-4.2 4.6z\"></path><path fill=\"#BA8449\" d=\"M77.8 68.3c-11 17 2.1 82.3 71.2 73.5 7.3-.9 31.6-13.9 48 4.3 8.9 10-3.1 35.3 0 30 3.5-5.8 16.9-28.2-3.2-62.7-6.4-11.1 4.2-64.4-65-65.1-26.5-.1-43.7 8.7-51 20\"></path><defs><path id=\"y\" d=\"M61.7 64.6H179v111.9H61.7z\"></path></defs><clipPath id=\"z\"><use xlink:href=\"#y\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#z)\"><path fill=\"#E3AB5E\" d=\"M75.968 72.433c19.9-12.8 80.1-11.9 99.3 18.8 12.8 20.4-10.6 70.8-19.3 77.2-8.6 6.4-20.6 12-52.2 4.4-26.8-6.4 13.5-31.3-17.9-34.9-28.7-3.3-31.6-51.5-9.9-65.5\"></path></g><defs><path id=\"A\" d=\"M118.5 119.2h13.1v5.5h-13.1z\"></path></defs><clipPath id=\"B\"><use xlink:href=\"#A\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#B)\"><path fill=\"#E3AB5E\" d=\"M131.6 121.966c0 1.5-2.9 2.8-6.5 2.8s-6.5-1.2-6.5-2.8c0-1.5 2.9-2.8 6.5-2.8 3.6.1 6.5 1.3 6.5 2.8\"></path></g><path fill=\"#F8A38F\" d=\"M120.1 113.8c1.5-1 9.5-.7 10.5.4 1 1 3.2 5.2.7 7-.9.6-.9-1.9-2.9-1.5-2.4.5-1.1 3.6-3 3.6-2.9-.1-.1-3.4-2.6-3.8-1.9-.4-2.3 1.5-3.2 1.3-2.9-.6-1.6-5.6.5-7\"></path><defs><path id=\"C\" d=\"M117.9 113.2h14.5v9.9h-14.5z\"></path></defs><clipPath id=\"D\"><use xlink:href=\"#C\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#D)\"><path fill=\"#F8A38F\" d=\"M124.42 113.205c-1.9 0-3.7.2-4.3.6-2.1 1.4-3.4 6.4-.6 6.9h.1c.7 0 1.1-1.4 2.6-1.4h.5c2.5.4-.2 3.8 2.6 3.8 1.8 0 .5-3 3-3.5h.4c1.4 0 1.6 1.6 2.2 1.6.1 0 .2 0 .3-.1 2.6-1.8.4-6-.7-7-.5-.5-3.4-.9-6.1-.9m0 .7c3 0 5.3.4 5.7.7.6.6 1.8 2.8 1.6 4.4-.1.6-.3 1.1-.7 1.4 0-.1-.1-.1-.2-.2-.4-.5-1-1.3-2.1-1.3-.2 0-.4 0-.5.1-1.7.4-2 1.7-2.3 2.6-.2.9-.3.9-.6.9-.8 0-.8-.2-.8-1.1 0-.9 0-2.3-1.8-2.6h-.6c-1.1 0-1.8.7-2.3 1.1-.1.1-.3.3-.4.3-.4-.1-.8-.3-1-1.1-.3-1.4.7-3.8 1.8-4.6.6-.4 2-.6 4.2-.6\"></path></g><defs><path id=\"E\" d=\"M74.1 124.9H187V189H74.1z\"></path></defs><clipPath id=\"F\"><use xlink:href=\"#E\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#F)\"><path fill=\"#F7E8D0\" d=\"M186.799 140.05c3 19.2-21 43.3-53.3 48.3-32.3 4.9-56.1-23.9-59.1-43.2-3-19.2 16.8-11.9 49.1-16.8s60.3-7.5 63.3 11.7\"></path></g><defs><path id=\"G\" d=\"M80 125.9h93.6v47.5H80z\"></path></defs><clipPath id=\"H\"><use xlink:href=\"#G\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#H)\"><path fill=\"#D8CAB2\" d=\"M102.515 169.277c-.9-1.4-1.4-3.1-1.9-4.7l-1.5-4.8c-1-3.2-2.1-6.4-3.6-9.4s-3.4-5.8-5.8-7.9c-2.4-2.1-5.3-3.5-8.4-4.1-1.1-.4-1.6-1.5-1.2-2.5.4-1 1.4-1.5 2.3-1.3 7.2 1.7 14.7 2.5 22.1 2.6s15-.3 22.5-1.2c7.5-.9 14.9-2.2 22.2-3.9 7.3-1.7 14.6-3.7 21.7-6.1 1.1-.4 2.2.2 2.5 1.2.3.8 0 1.6-.6 2.1-.2.2-.6.5-.9.8-.3.3-.6.7-.9 1-.6.7-1.2 1.5-1.8 2.3-1.2 1.6-2.3 3.2-3.3 4.9-2.2 3.3-4.2 6.7-6.1 10.2-1.9 3.5-3.8 7-5.5 10.5-.9 1.8-1.7 3.6-2.4 5.4-.4.9-.7 1.8-1.1 2.8-.2.5-.3.9-.4 1.4v.2c0 .1 0 .1-.1.2 0 .1-.1.2-.2.2-.1.1-.2.2-.4.3-.2.2-.5.3-.7.4-1.9.8-3.9 1.2-5.8 1.6-1.9.4-3.9.7-5.9.9-4 .5-7.9.9-11.9 1-4 .2-8 .2-11.9-.2-2-.2-4-.5-5.9-1-1-.3-1.9-.6-2.8-1.1-.9-.4-1.7-1-2.3-1.8m.1-.1c.5.8 1.4 1.4 2.3 1.8.9.4 1.8.7 2.8 1 1.9.5 3.9.8 5.9.9 4 .3 7.9.3 11.9.1 4-.2 7.9-.7 11.8-1.2 1.9-.3 3.9-.6 5.8-1.1s3.9-.9 5.6-1.7c.2-.1.4-.2.6-.4.2-.1.3-.2.3-.3.1-.5.2-1 .4-1.5.3-1 .6-1.9.9-2.9.7-1.9 1.4-3.7 2.2-5.6 1.6-3.7 3.2-7.3 4.9-10.9 1.7-3.6 3.5-7.2 5.4-10.7.9-1.8 1.9-3.5 3-5.3.5-.9 1.1-1.8 1.7-2.6.3-.4.6-.9.9-1.3.4-.4.7-.9 1.2-1.3l1.9 3.4c-7.3 2.5-14.6 4.5-22.1 6.2-7.5 1.7-15 3.1-22.6 4-7.6.9-15.3 1.4-23 1.2s-15.4-1.1-23-2.9l1.1-4c3.3 2 6.3 3.9 8.6 6.6 2.3 2.7 3.9 5.8 5.2 9 1.2 3.2 2.2 6.5 3 9.7.4 1.6.9 3.3 1.3 4.9.6 1.9 1.1 3.5 2 4.9\"></path></g><defs><path id=\"I\" d=\"M81 126.9h91.6v46.5H81z\"></path></defs><clipPath id=\"J\"><use xlink:href=\"#I\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#J)\"><path fill=\"#D8CAB2\" d=\"M102.532 169.288c-.9-1.4-1.4-3-1.9-4.6-.5-1.6-.9-3.2-1.4-4.8-1-3.2-2-6.4-3.5-9.5-1.4-3-3.3-5.8-5.6-8-2.4-2.3-5.3-3.9-8.4-4.6v-.1c-.5-.2-.8-.8-.6-1.3.2-.5.7-.8 1.2-.7 7.3 1.7 14.8 2.5 22.4 2.6s15.1-.3 22.6-1.2c7.5-.9 14.9-2.3 22.3-3.9 7.4-1.7 14.7-3.7 21.8-6.1.5-.2 1.1.1 1.3.6.1.4 0 .8-.3 1.1-.6.5-1.3 1.3-1.9 2-.6.7-1.2 1.6-1.8 2.3-1.1 1.6-2.2 3.3-3.2 5-2.1 3.3-4.1 6.8-6 10.3-1.9 3.5-3.7 7-5.3 10.6l-2.4 5.4c-.4.9-.7 1.8-1 2.8-.2.5-.3.9-.4 1.4-.1.4-.4.5-.6.7-.2.2-.5.3-.7.4-1.9.8-3.9 1.2-5.8 1.6-1.9.4-3.9.7-5.9 1-3.9.5-7.9.9-11.9 1.1-4 .2-8 .2-11.9-.2-2-.2-4-.5-5.9-1-1-.3-1.9-.6-2.8-1-1-.5-1.9-1.1-2.4-1.9m0-.1c.5.8 1.4 1.4 2.3 1.9.9.4 1.8.7 2.8 1 1.9.5 3.9.8 5.9.9 4 .4 7.9.3 11.9.1 4-.2 7.9-.6 11.9-1.2 1.9-.3 3.9-.6 5.9-1.1 1.9-.4 3.9-.9 5.6-1.7.2-.1.4-.2.6-.4.2-.1.4-.3.4-.4.1-.5.2-1 .4-1.5.3-1 .6-1.9 1-2.8.7-1.9 1.5-3.7 2.3-5.5 1.6-3.7 3.3-7.2 5.1-10.8 1.8-3.6 3.6-7.1 5.6-10.6 1-1.8 2-3.5 3.1-5.1.5-.9 1.1-1.7 1.7-2.5.6-.8 1.2-1.6 2.1-2.4l1 1.8c-7.2 2.5-14.6 4.5-22 6.2s-14.9 3-22.5 4c-7.6.9-15.2 1.4-22.9 1.2-7.6-.2-15.3-1-22.8-2.7l.5-1.9c3.3 1.3 6.3 3.3 8.6 5.9 2.3 2.6 4 5.6 5.3 8.7 1.3 3.1 2.3 6.3 3.2 9.6.4 1.6.9 3.2 1.4 4.9.2 1.4.7 3 1.6 4.4\"></path></g><path fill=\"#333\" d=\"M102.6 169.2c5.1 8 46.8 2.5 47.5-.7 1.8-8.1 16.8-36.7 21.6-40.7-8.6 3-53.3 17.3-89.6 8.6 16.3 5.5 16.5 26.6 20.5 32.8\"></path><g><defs><path id=\"K\" d=\"M82 127.9h89.6v45.4H82z\"></path></defs><clipPath id=\"L\"><use xlink:href=\"#K\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#L)\"><path fill=\"#333\" d=\"M171.55 127.95c-6.7 2.3-34.9 11.4-64.1 11.4-8.6 0-17.2-.8-25.5-2.7 16.4 5.3 16.6 26.5 20.6 32.7 1.9 3 9.2 4.1 17.5 4.1 13.4 0 29.5-2.8 30-4.8 1.8-8.2 16.7-36.8 21.5-40.7m-5.6 3.9c-6.5 9.8-15.9 28.7-17.8 35.8-2.5 1.4-15.4 3.8-28.1 3.8-10.2 0-14.8-1.7-15.8-3.2-1-1.5-1.8-4.3-2.6-7.5-1.7-6.1-4.1-14.5-9.8-20.3 5 .6 10.2.9 15.7.9 23.8-.1 47.1-6.1 58.4-9.5\"></path></g></g><path fill=\"#FCD4C3\" d=\"M119.7 173.4c-8.6 0-14.2-1.2-16.4-3.6-.2-.2-.2-1.4.8-3.7 2.4-5.5 9.8-14.9 22.6-15.7.9 0 1.7-.1 2.5-.1 15 0 24 7.6 24 8.9-.2.4-.4 1-.7 1.8-.8 1.9-2 4.9-3.1 8.1-1.3 1.3-16.3 4.3-29.7 4.3\"></path><path fill=\"#F8A38F\" d=\"M129.2 149.8c-.9 0-1.7 0-2.6.1-17.5 1.1-25.6 18.4-23.8 20.5 2.6 2.8 9.3 3.8 16.9 3.8 13.5 0 29.8-3.1 30.3-4.6 1.5-4.5 3.2-8.2 3.9-10 .6-1.8-9.5-9.9-24.7-9.8m0 1.3c13.4 0 22.4 6.4 23.3 8.3-.2.4-.4.9-.6 1.5-.8 1.9-2 4.7-3.1 7.9-2.1 1.2-16.1 3.9-29.1 3.9-8.1 0-13.7-1.2-15.8-3.3-.1-.7.6-3.5 3.1-7 2.2-3.2 8.6-10.7 19.7-11.3h2.5\"></path><g><defs><path id=\"M\" d=\"M103.1 149.4h50.2v20.7h-50.2z\"></path></defs><clipPath id=\"N\"><use xlink:href=\"#M\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#N)\"><path fill=\"#FCD4C3\" d=\"M103.084 169.317c-1.2 5.4 31.9-21.1 49.7-8.4 3.7-4.9-16-13.2-27.5-11.3-9.7 1.7-19.7 7.9-22.2 19.7\"></path></g></g><path fill=\"#FFF7E3\" d=\"M109.8 140.8c1.7 3 4.8 17.6 6.1 17.9s9.5 2.6 10.6 2.1c1.2-.5 1.1-3.3 2.3-2.5 1 .7 1.5 2 2.5 1.5 1.8-.9 7.1-4.2 8-5.6.8-1.5.7-9.8 0-16.4-3.4 1.6-23.5 3.7-29.5 3\"></path><g><defs><path id=\"O\" d=\"M109.8 137.9h30.1v23.2h-30.1z\"></path></defs><clipPath id=\"P\"><use xlink:href=\"#O\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#P)\"><path fill=\"#FFDC99\" d=\"M139.35 137.85c-3 1.3-18.7 3.1-26.6 3.1-1.2 0-2.1 0-2.9-.1 1.7 3 4.8 17.6 6.1 17.9 1.2.3 8 2.2 10.1 2.2.2 0 .4 0 .5-.1 1-.4 1.1-2.6 1.9-2.6.1 0 .3 0 .4.2.9.5 1.3 1.6 2.1 1.6.1 0 .3 0 .4-.1 1.8-.9 7.1-4.2 8-5.6.9-1.5.7-9.8 0-16.5m-.5.9c.6 6.8.6 14 0 15.2-.7 1.2-5.5 4.3-7.7 5.4h-.1c-.2 0-.5-.3-.7-.6-.3-.3-.6-.6-1-.9-.3-.2-.5-.3-.8-.3-.9 0-1.2.9-1.5 1.6-.2.4-.4 1-.7 1.1h-.3c-1.7 0-6.8-1.4-8.9-1.9-.4-.1-.7-.2-.9-.2-.6-.7-1.9-5.4-2.9-8.8-.9-3.1-1.7-6-2.4-7.7h1.9c7.5 0 21.5-1.6 26-2.9\"></path></g></g><g><defs><path id=\"Q\" d=\"M109.9 137.5h29.7v10.3h-29.7z\"></path></defs><clipPath id=\"R\"><use xlink:href=\"#Q\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#R)\"><path fill=\"#EADCBE\" d=\"M112.151 147.85c-.5-5.4 24.4-7.2 27.5-6.7 0-1.3-.2-2.1-.2-3.6-4.1 2.1-26.5 4.3-29.5 3.4.3.6 1.4 3.6 2.2 6.9\"></path></g></g><g><defs><path id=\"S\" d=\"M124 143.8h5.5v14.7H124z\"></path></defs><clipPath id=\"T\"><use xlink:href=\"#S\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#T)\"><path fill=\"#FFDC99\" d=\"M124.558 143.768c.5 1.2 1 2.3 1.4 3.5l1.2 3.6 1.1 3.6 1.1 3.6-1.7.5-.8-3.7-.9-3.7-.9-3.6c-.4-1.2-.7-2.4-1.1-3.5l.6-.3z\"></path></g></g><g><defs><path id=\"U\" d=\"M39.1 51.5h39.4v35.7H39.1z\"></path></defs><clipPath id=\"V\"><use xlink:href=\"#U\" overflow=\"visible\"></use></clipPath><g opacity=\".4\" clip-path=\"url(#V)\"><path fill=\"#FCD4C3\" d=\"M40.384 59.116c13.2 3.4 11.1 26.2 18.9 28 7.9 1.8 18.2-18.8 19.2-23.3-15.2-6.5-22.3-14.1-33.2-11.9-3.6.7-8.6 6.2-4.9 7.2\"></path></g></g><g><defs><path id=\"W\" d=\"M59.9 88.7h133.7v42.5H59.9z\"></path></defs><clipPath id=\"X\"><use xlink:href=\"#W\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#X)\"><path fill=\"#E3AB5E\" d=\"M76.967 125.833c16.6 1.3 30.3 2 35.2-3.1s6.7-27.7 14.7-27.1c6.8.5 9.1 29.9 13.5 30.7 4.4.9 35.5 9.4 43.3 1.4 7.7-8 11.3-13 9.5-17.8-1.8-4.8-47.3-20.3-56.6-21.2-9.3-.9-72.1 7-73.7 10.9-1.6 4-3.3 3.4-3 7.6.6 8.1.5 17.3 17.1 18.6\"></path></g></g><path fill=\"#333\" d=\"M123.5 92.4c1.2 0 5.9-.4 7 .5 6 4.7 5.8 24 12.1 30 5.6 5.4 36.2 9.3 41.5 3.2 5.3-6.1 13.1-24.7 14.9-26.1 1.8-1.3 5.8-2.3 7-4.2 1.2-1.8.2-10-2.6-9.6-2.8.4-8.1 2.1-11.4 1.2-3.3-1-19.4-11.1-59.9-5-3.9.6-7.8 0-10.5-.7S103.7 72.2 63 78c-4 .6-9.6-1.2-11.6-1-2 .2-2.6 6.5-1.8 8.1s5 3 5.5 5 4.2 21.6 13.8 29.7c10.2 8.6 36.2 2.6 38.5 1 10.3-7.3 12.6-28.4 16.1-28.4\"></path><g><defs><path id=\"Y\" d=\"M49.1 76.1h157.3v53.1H49.1z\"></path></defs><clipPath id=\"Z\"><use xlink:href=\"#Y\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#Z)\"><path fill=\"#1A1A1A\" d=\"M88.438 76.123c-7.1 0-15.6.5-25.6 2-.6.1-1.2.1-1.8.1-3.5 0-7.6-1.1-9.5-1.1h-.3c-2 .2-2.6 6.5-1.8 8.1.8 1.7 5 3 5.5 5s4.2 21.6 13.8 29.7c4 3.4 10.6 4.5 17.2 4.5 10 0 19.9-2.5 21.3-3.5 10.4-7.4 12.8-28.5 16.3-28.5.5 0 1.8-.1 3-.1 1.6 0 3.3.1 3.9.5 6 4.7 5.8 24 12.1 30 3.6 3.4 17.4 6.3 28.2 6.3 6.1 0 11.3-.9 13.2-3.1 5.3-6.1 13.1-24.7 14.9-26.1 1.8-1.4 5.8-2.3 7-4.2 1.1-1.8.2-9.6-2.5-9.6h-.2c-2.2.3-6 1.4-9.1 1.4-.8 0-1.6-.1-2.3-.3-2.6-.8-12.7-6.9-35.7-6.9-6.9 0-14.9.5-24.2 1.9-1.1.2-2.3.2-3.3.2-2.7 0-5.2-.4-7.1-.9-2-.2-11.2-5.4-33-5.4m0 2c18.1 0 27.4 3.6 30.8 5 .7.3 1.2.5 1.7.6 1.8.4 4.5 1 7.6 1 1.2 0 2.5-.1 3.6-.3 8.5-1.3 16.5-1.9 23.9-1.9 19 0 28.9 4.2 33.2 6.1.9.4 1.5.6 2 .8.9.3 1.8.4 2.9.4 2.2 0 4.6-.5 6.6-.9.9-.2 1.8-.4 2.5-.5.9 1 1.5 5.4 1 6.6-.4.6-2.1 1.4-3.3 1.9-1.2.5-2.3 1-3.1 1.6-1.1.8-2.2 2.9-5.4 9.3-3.1 6.1-6.9 13.7-9.8 17-1 1.2-4.6 2.4-11.8 2.4-10.5 0-23.9-2.8-26.9-5.7-2.8-2.6-4.2-8.7-5.6-14.6-1.6-6.6-3.1-12.8-6.6-15.6-.9-.7-2.3-1-5.1-1h-3.1c-2.8 0-4 3.3-6.1 9.3-2.3 6.6-5.6 15.5-11.3 19.6-1.3.8-10.7 3.2-20.2 3.2-7.3 0-12.8-1.4-15.9-4-3.8-3.2-9.1-10.7-12.9-27.8-.1-.4-.2-.7-.2-.9-.5-1.9-2.3-3-3.8-4-.6-.4-1.6-1.1-1.8-1.4-.4-.9 0-4.2.6-5.3.7 0 1.7.2 2.8.4 1.9.3 4.3.7 6.5.7.7 0 1.5 0 2.1-.2 8.9-1.1 17.4-1.8 25.1-1.8\"></path></g></g><g><defs><path id=\"aa\" d=\"M64.4 83.4h50.5v34.2H64.4z\"></path></defs><clipPath id=\"ab\"><use xlink:href=\"#aa\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#ab)\"><path fill=\"none\" stroke=\"#333\" stroke-width=\"4\" stroke-miterlimit=\"10\" d=\"M66.2 90.45c-.9 1.2-1.5 18.9 6 23.7 4.9 3.2 25.7 2.5 29.9.2 6.5-3.7 12.9-20.5 11.1-22.9-3-4-24.6-9.3-40.8-5.1-2 .4-5.1 2.6-6.2 4.1z\"></path></g></g><path fill=\"#FFF\" d=\"M66.2 90.4c-.9 1.2-1.5 18.9 6 23.7 4.9 3.2 25.7 2.5 29.9.2 6.5-3.7 12.9-20.5 11.1-22.9-3-4-24.6-9.3-40.8-5.1-2 .5-5.1 2.6-6.2 4.1\"></path><g><defs><path id=\"ac\" d=\"M139.8 88.1h50.1v35h-50.1z\"></path></defs><clipPath id=\"ad\"><use xlink:href=\"#ac\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#ad)\"><path fill=\"none\" stroke=\"#333\" stroke-width=\"4\" stroke-miterlimit=\"10\" d=\"M188.394 98.163c.8 1.3-1 18.9-9 22.8-5.3 2.5-25.8-.9-29.6-3.7-6-4.5-10.2-22-8.1-24.2 3.5-3.6 25.6-6 41.1.2 1.9.7 4.7 3.3 5.6 4.9z\"></path></g></g><path fill=\"#FFF\" d=\"M188.4 98.2c.8 1.3-1 18.9-9 22.8-5.3 2.5-25.8-.9-29.6-3.7-6-4.5-10.2-22-8.1-24.2 3.5-3.6 25.6-6 41.1.2 1.9.7 4.6 3.2 5.6 4.9\"></path><path d=\"M89.9 101.2c-.5 3.9-2.5 6.8-4.4 6.5-1.9-.3-2.9-3.6-2.4-7.5s2.5-6.8 4.4-6.5c1.9.3 2.9 3.6 2.4 7.5M169.6 105.6c.4 3.9-.8 7.2-2.6 7.4-1.9.2-3.7-2.8-4.1-6.7-.4-3.9.8-7.2 2.6-7.4 1.8-.1 3.6 2.9 4.1 6.7\"></path><g><defs><path id=\"ae\" d=\"M49.1 81.6h156.3v46H49.1z\"></path></defs><clipPath id=\"af\"><use xlink:href=\"#ae\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#af)\"><path fill=\"#333\" d=\"M51.475 82.75c2.3 1.5 4.4.6 4.9 3.6s7.4 29 16 32c14.1 4.9 31.9.1 34.3-1.4 2.4-1.5 13.7-26.8 15.6-27.8 1.9-1 7.9.1 9.2.7 3.9 1.7 11.1 29.1 13 30.5 8.7 6.1 36.6 5.6 37.9 4 1.4-1.7 11.8-25.6 13.7-27 2.7-2.1 9-3.5 9.2-2.6.2.9-5.1 1.8-6.7 3.7-1.6 2-12.1 24.9-15.4 26.9-3.3 2-27.7 5.3-40.1-3.4-5.9-4.2-8.2-29.1-12.9-30.5-3-.9-5.3-.8-7.5-.2-2.9 1.9-7 23.1-15.7 28.4-3.5 2.1-30.6 7.4-38.7-1.1-15.1-15.8-10.5-29.9-15.4-31.9-3.3-1.4-4-3.2-4-4.4.3-1.3 1.4-.3 2.6.5\"></path></g></g><g><defs><path id=\"ag\" d=\"M51.6 77.2h20.2v3H51.6z\"></path></defs><clipPath id=\"ah\"><use xlink:href=\"#ag\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#ah)\"><path fill=\"#333\" d=\"M51.75 77.45c-1.6-.6 6.8 2.9 9.9 2.7 3.1-.2 8.3-2.4 10-2.9 1.5-.5-7.8 1.2-10.1 1.1s-8.9-.6-9.8-.9\"></path></g></g><g><defs><path id=\"ai\" d=\"M116.6 82.1h21.7v5.3h-21.7z\"></path></defs><clipPath id=\"aj\"><use xlink:href=\"#ai\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#aj)\"><path fill=\"#333\" d=\"M116.6 82.15c2.9 1.3 4.2 4.6 7 4.9s6.2.8 7.8-.1c1.6-.9 5.6-3 6.7-3.2 1.2-.2-8.7 1.3-12.4 1-3.7-.4-8-2.5-9.1-2.6\"></path></g></g><g><defs><path id=\"ak\" d=\"M187.4 86h12.3v3.9h-12.3z\"></path></defs><clipPath id=\"al\"><use xlink:href=\"#ak\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#al)\"><path fill=\"#333\" d=\"M187.575 85.975c-1.2-.5 4.4 4 6.1 3.8 1.7-.2 4.7-2.1 6-2.6 1-.4-4 1-5.5.7-1.5-.1-5.4-1.4-6.6-1.9\"></path></g></g><g><defs><path id=\"am\" d=\"M62.3 82.8h28.9v28.6H62.3z\"></path></defs><clipPath id=\"an\"><use xlink:href=\"#am\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#an)\"><path fill=\"#333\" d=\"M63.05 87.825c7.4-7.3 25-4.8 28.2-4.2-21.1 1.5-21.5 3.1-25.2 6.8-.5 2.9-1.2 12.5 2.1 20.9-3.7-2-7.6-21-5.1-23.5\"></path></g></g><g><defs><path id=\"ao\" d=\"M165.1 87.8h27.8v30.5h-27.8z\"></path></defs><clipPath id=\"ap\"><use xlink:href=\"#ao\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#ap)\"><path fill=\"#333\" d=\"M192.46 95.698c-6.4-8.2-24.1-8.1-27.4-7.8 20.7 4.3 20.9 5.9 24.1 10.1.2 2.9-.4 12.5-4.7 20.4 3.8-1.6 10.1-20 8-22.7\"></path></g></g><g><defs><path id=\"aq\" d=\"M65.8 84.8h47.8v27.5H65.8z\"></path></defs><clipPath id=\"ar\"><use xlink:href=\"#aq\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#ar)\"><path fill=\"#D0DDDC\" d=\"M66.412 102.575c.7-8.6 1.5-15.6 18.6-16.1 13.7-.4 24.6 2.8 26.1 6.1 1 2.1.2 11.3-6.6 19.7 4.4-3.9 11.4-19.4 8.4-21.3-11.1-7.1-33.2-7.3-41.4-4.4-1.5.5-3.9 2.2-5.5 4-.3 2.2-.3 10.8.4 12\"></path></g></g><g><defs><path id=\"as\" d=\"M66.8 103H102v13.9H66.8z\"></path></defs><clipPath id=\"at\"><use xlink:href=\"#as\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#at)\"><path fill=\"#D0DDDC\" d=\"M66.884 103.2c2.6 16.8 33.3 11.7 35.1 11-.1.9-16.1 5.4-29.5.2-5.4-2-5.8-13.1-5.6-11.2\"></path></g></g><g><defs><path id=\"au\" d=\"M141.2 89.5h47.7V115h-47.7z\"></path></defs><clipPath id=\"av\"><use xlink:href=\"#au\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#av)\"><path fill=\"#D0DDDC\" d=\"M186.957 110.087c.4-8.7.4-15.6-16.4-18.2-13.5-2.1-24.7-.3-26.7 2.8-1.2 1.9-1.6 11.2 4.2 20.4-3.9-4.5-9-20.6-5.7-22.2 11.9-5.7 33.9-3.2 41.6.7 1.4.7 3.7 2.6 5 4.7-.1 2.1-1.1 10.7-2 11.8\"></path></g></g><g><defs><path id=\"aw\" d=\"M150.2 110.4h36.3v11.7h-36.3z\"></path></defs><clipPath id=\"ax\"><use xlink:href=\"#aw\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#ax)\"><path fill=\"#D0DDDC\" d=\"M186.383 110.613c-4.6 16.3-34.5 7.5-36.2 6.6 0 .9 15.3 7.3 29.3 3.9 5.6-1.4 7.5-12.4 6.9-10.5\"></path></g></g><g><defs><path id=\"ay\" d=\"M87.3 95.2h2v2h-2z\"></path></defs><clipPath id=\"az\"><use xlink:href=\"#ay\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#az)\"><path fill=\"#FFF\" d=\"M89.375 96.2c0-.5-.4-1-1-1s-1 .4-1 1 .4 1 1 1 1-.4 1-1\"></path></g></g><g><defs><path id=\"aA\" d=\"M166.3 99.9h2v2h-2z\"></path></defs><clipPath id=\"aB\"><use xlink:href=\"#aA\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#aB)\"><path fill=\"#FFF\" d=\"M168.375 100.9c0-.5-.4-1-1-1-.5 0-1 .4-1 1s.4 1 1 1c.5 0 1-.5 1-1\"></path></g></g><g><defs><path id=\"aC\" d=\"M52 79.1h64.8v9.5H52z\"></path></defs><clipPath id=\"aD\"><use xlink:href=\"#aC\" overflow=\"visible\"></use></clipPath><g opacity=\".1\" clip-path=\"url(#aD)\"><path fill=\"#D0DDDC\" d=\"M52.025 81.675c2.4 2.7 3.9 3 7.1 2.6 31.1-4 48.3-3.9 56.8 4 1.8 1.7.8-5.1-2.6-6-26.2-6.9-45.2-.7-49.2-.2-4.1.6-7-.3-12.1-.4\"></path></g></g><g><defs><path id=\"aE\" d=\"M137.7 82.3h47.9v9.2h-47.9z\"></path></defs><clipPath id=\"aF\"><use xlink:href=\"#aE\" overflow=\"visible\"></use></clipPath><g opacity=\".1\" clip-path=\"url(#aF)\"><path fill=\"#D0DDDC\" d=\"M138.025 85.675c-.7.7-.4 7.9 3 5.2 9.8-7.8 30.3-6 44.6-1.2-2.3-4.5-19-7.6-28.4-7.5-4.5.2-17.3 1.5-19.2 3.5\"></path></g></g><path fill=\"#D0DDDC\" d=\"M197.2 91.4c0 .3-1.6.5-3.5.5s-3.5-.2-3.5-.5 1.6-.5 3.5-.5c2 0 3.5.3 3.5.5M62.4 82.8c0 .3-1.6.3-3.5 0s-3.4-.8-3.3-1.1 1.6-.3 3.5 0c1.9.2 3.4.7 3.3 1.1\"></path><g><path fill=\"#FFF\" d=\"M256.04 243.036c-.6-6.1-5.1-8.8-9.2-8.8-1.9 0-3.4.5-4 .8l-.8.4-.7.5c-1 .7-2.7 1.8-4.2 2.3-.1-1.2 0-2.8.2-4.2v-.2c1.1-10.7-1.1-17-6.7-18.6-.9-.3-1.9-.4-2.9-.4-3.4 0-6.4 1.6-8.3 3-1.6-2.1-4.4-3.2-7.8-3.2-5.1 0-9.2 2.4-10.7 6.2-.2.4-.4 1-.6 1.8-3-6.6-9.1-9.1-14.8-9.1-5.4 0-10.6 2.1-12.5 3.6-.1.1-.2.1-.3.2-5.1 3.6-9.1 8.2-11.9 13.7-1.4-4.7-4.4-9.2-9.7-12.5l-.1-.1c-.2-.1-.3-.2-.4-.2 5.3-9.3 9.9-21.7 7.1-33.5-3-12.6-10.4-14.4-14.5-14.4-1.7 0-3.5.3-5.3.9h-.2c-7.8 3.1-11.2 7.7-12 8.8-.8 1.2-9.3 14.2-11.4 33.2-.2 2.1-.5 4.3-.7 6.5-1.2-1.7-3.2-3.3-6.3-4.2-1-.3-2-.4-3-.4-4.3 0-7.8 2.6-9.7 4.4-1.6-2.4-4.2-3.9-7.1-4h-.7c-4.6 0-8.2 2-10.9 4.3-1.7-3-4.9-4.9-8.6-4.9h-1.5c-5.1 0-9.1 2.4-10.7 6.4-.1.3-.3.7-.4 1.2-4-5-9.1-7.3-16-7.3h-.7c-4.3.1-14.9 1.9-21.5 16.6-1 2.3-1.8 4.6-2.4 6.8-1.4-.7-2.8-.8-3.7-.8-3.4 0-6 1.9-7.2 3.8-1 1.5-4.2 6.7-2.6 11.9.9 2.8 2.8 4.9 5.6 6 2.5 1 5.6 1.9 7.9 2.6 1.4 3.3 4 7 8.6 10.5 3.2 2.5 7.4 3.7 12.2 3.7 8.2 0 16.1-3.5 16.9-3.9l.3-.2.1-.1c1.6 1.6 3.6 2.8 6.2 3.3.8.2 1.8.3 3 .3 4.4 0 7.5-2.3 10.4-6.5 2.3 3.7 6.6 5.7 11.6 5.7.3 0 .5.2.9.2 2.6 0 6-.9 8.7-5.4 2.3 4.1 6.5 6.5 11.5 6.5 4.4 0 8.3-1.8 9-2.2l.2-.1c1.5-.8 2.7-1.5 3.7-2 3.3 1.8 8.3 3.7 14.5 3.7 1.1 0 2.1 0 3.2-.2h.6c13-2.6 21.5-5.7 26.6-8.1 3.5 4 9.2 7.8 17.2 8.4.9.1 1.8.1 2.7.1 6.6 0 11.9-1.9 15.8-3.9 1.2 1.3 2.8 2.5 4.8 3.3 1.2.5 2.5.7 3.7.7 8.1 0 11.9-9.6 12.9-12.9l1.9-5.2c1.7 1.8 3.9 3.3 6.7 4.1 1.5.4 3.2.7 4.8.7 8.9 0 17.5-6.3 18.8-7.4 2.3-2.3 4.9-6.5 4.4-12.2\"></path></g><g><path fill=\"#E24B31\" d=\"M174.35 245.713s-1.1-4 3.1-11.6 7.4-3.5 7.4-3.5 3.6 3.9-.5 9.7c-4.1 5.8-10 5.4-10 5.4m-32.1 5.5c-4.8 12.5-16.4 7.4-16.4 7.4s-1.3-4.5 2.5-17 12.6-7.6 12.6-7.6 6.1 4.7 1.3 17.2m-8.7-52.5s7.2-18.9 9-9.7c1.8 9.2-15.2 36.5-15.2 36.5.2-6.1 6.2-26.8 6.2-26.8m-103.5 47c.3-12.1 8.2-17.4 11-14.8 2.8 2.6 1.8 8.4-3.5 11.9-5.1 3.6-7.5 2.9-7.5 2.9m219.3-2c-.4-4.1-4.1-2.6-4.1-2.6s-5.9 4.6-11.1 4.1c-5.2-.5-3.5-12.1-3.5-12.1s1.1-10.7-1.9-11.6c-3.1-.9-6.8 2.8-6.8 2.8s-4.7 5.2-6.9 11.8l-.6.2s.7-11.6-.1-14.3c-.6-1.3-6.2-1.2-7.1 1.1-.9 2.3-5.4 18.6-5.7 25.5 0 0-8.8 7.4-16.4 8.7-7.7 1.2-9.5-3.6-9.5-3.6s20.8-5.8 20.1-22.4c-.7-16.6-16.8-10.5-18.6-9.1-1.8 1.3-11.1 7-13.9 22.6-.1.5-.3 2.9-.3 2.9s-8.1 5.4-12.5 6.8c0 0 12.5-21.1-2.8-30.7-6.9-4.2-12.5 4.6-12.5 4.6s20.7-23 16.1-42.5c-2.2-9.3-6.8-10.3-11.1-8.8-6.5 2.6-8.9 6.3-8.9 6.3s-8.4 12.1-10.3 30.2-4.8 39.8-4.8 39.8-4 3.9-7.6 4.1c-3.7.2-2-10.9-2-10.9s2.8-16.9 2.6-19.8-.4-4.4-3.8-5.4c-3.3-1-7 3.3-7 3.3s-9.7 14.7-10.5 16.9l-.5.9-.5-.6s6.8-20 .3-20.3c-6.5-.3-10.8 7.1-10.8 7.1s-7.4 12.5-7.7 13.9l-.5-.6s3.1-14.5 2.5-18.1c-.6-3.6-4-2.8-4-2.8s-4.3-.5-5.4 2.3c-1.1 2.8-5.2 21-5.7 26.8 0 0-10.7 7.7-17.7 7.7-7 .1-6.3-4.5-6.3-4.5s25.8-8.8 18.8-26.3c-3.2-4.5-6.8-5.9-12-5.8-5.2.1-11.3 3.3-15.5 12.6-2 4.5-2.8 8.7-2.8 11.9 0 0-4.8.9-7.3-1.1s-3.9 0-3.9 0-4.3 6.1-.1 7.7c4.2 1.6 10.6 3.2 10.6 3.2.6 2.6 2.3 7 7.4 10.8 7.6 5.8 22.3-.9 22.3-.9l6-3.6s.2 5.4 4.6 6.2c4.4.8 6.2-.1 13.9-18.6 4.5-9.5 4.8-9 4.8-9l.5-.1s-3.5 18.1-2.1 23 7.1 4.4 7.1 4.4 3.2 1.1 5.7-7.9c2.6-9 7.4-18.4 7.4-18.4h.6s-2.1 18.1 1.1 24c3.3 5.9 11.7 1.8 11.7 1.8s5.9-3.1 6.8-4c0 0 7 5.9 16.9 4.8 22.1-4.4 30-10.3 30-10.3s3.8 9.6 15.6 10.5c13.5 1 20.8-7.5 20.8-7.5s-.1 5.5 4.6 7.4c4.7 1.9 7.9-8.3 7.9-8.3l7.9-21.1h.7s.4 13.5 8.2 15.7c7.8 2.2 17.9-5.6 17.9-5.6s2.2-1.1 1.7-5.2\"></path></g></svg>"
 
 /***/ }),
 
-/***/ 1045:
+/***/ 1174:
 /***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 14 5\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"><desc>Created with Sketch.</desc><defs></defs><g id=\"Symbols\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" stroke-linecap=\"square\"><g id=\"outline\" transform=\"translate(0.000000, -2.000000)\" stroke=\"#DDE1E5\"><path d=\"M1.25,2.25 L1.25,2.75\" id=\"Line\" transform=\"translate(1.250000, 2.500000) rotate(90.000000) translate(-1.250000, -2.500000) \"></path><path d=\"M1.25,4.25 L1.25,4.75\" id=\"Line\" transform=\"translate(1.250000, 4.500000) rotate(90.000000) translate(-1.250000, -4.500000) \"></path><path d=\"M8.5,-3.5 L8.5,6.5\" id=\"Line\" transform=\"translate(8.000000, 2.000000) rotate(90.000000) translate(-8.000000, -2.000000) \"></path><path d=\"M8.5,-0.5 L8.5,9.5\" id=\"Line\" transform=\"translate(8.500000, 4.500000) rotate(90.000000) translate(-8.500000, -4.500000) \"></path><path d=\"M1.25,6.25 L1.25,6.75\" id=\"Line\" transform=\"translate(1.250000, 6.500000) rotate(90.000000) translate(-1.250000, -6.500000) \"></path><path d=\"M8.5,1.5 L8.5,11.5\" id=\"Line\" transform=\"translate(8.500000, 6.500000) rotate(90.000000) translate(-8.500000, -6.500000) \"></path></g></g></svg>"
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 400 400\" xml:space=\"preserve\" id=\"svg2\" version=\"1.1\"><metadata id=\"metadata8\"><rdf:RDF><cc:Work rdf:about><dc:format>image/svg+xml</dc:format><dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"></dc></cc:Work></rdf:RDF></metadata><defs id=\"defs6\"></defs><g transform=\"matrix(1.3333333,0,0,-1.3333333,0,400)\" id=\"g10\"><g transform=\"translate(178.0626,235.0086)\" id=\"g12\"><path id=\"path14\" style=\"fill:#41b883;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 h -75.491 L -22.669,-170.017 75.491,0 Z\"></path></g><g transform=\"translate(178.0626,235.0086)\" id=\"g16\"><path id=\"path18\" style=\"fill:#34495e;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 H -81.565 L -22.669,-102.01 36.227,0 Z\"></path></g></g></svg>"
 
 /***/ }),
 
-/***/ 105:
-/***/ (function(module, exports, __webpack_require__) {
-
-var getMapData = __webpack_require__(103);
-
-/**
- * Gets the map value for `key`.
- *
- * @private
- * @name get
- * @memberOf MapCache
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function mapCacheGet(key) {
-  return getMapData(this, key).get(key);
-}
+/***/ 118:
+/***/ (function(module, exports) {
 
-module.exports = mapCacheGet;
 
 
 /***/ }),
 
-/***/ 106:
+/***/ 119:
 /***/ (function(module, exports, __webpack_require__) {
 
-var getMapData = __webpack_require__(103);
+/* WEBPACK VAR INJECTION */(function(process) {// Copyright Joyent, Inc. and other Node 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.
 
-/**
- * Checks if a map value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf MapCache
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function mapCacheHas(key) {
-  return getMapData(this, key).has(key);
-}
+// resolves . and .. elements in a path array with directory names there
+// must be no slashes, empty elements, or device names (c:\) in the array
+// (so also no leading and trailing slashes - it does not distinguish
+// relative and absolute paths)
+function normalizeArray(parts, allowAboveRoot) {
+  // if the path tries to go above the root, `up` ends up > 0
+  var up = 0;
+  for (var i = parts.length - 1; i >= 0; i--) {
+    var last = parts[i];
+    if (last === '.') {
+      parts.splice(i, 1);
+    } else if (last === '..') {
+      parts.splice(i, 1);
+      up++;
+    } else if (up) {
+      parts.splice(i, 1);
+      up--;
+    }
+  }
 
-module.exports = mapCacheHas;
+  // if the path is allowed to go above the root, restore leading ..s
+  if (allowAboveRoot) {
+    for (; up--; up) {
+      parts.unshift('..');
+    }
+  }
 
+  return parts;
+}
 
-/***/ }),
+// Split a filename into [root, dir, basename, ext], unix version
+// 'root' is just a slash, or nothing.
+var splitPathRe =
+    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
+var splitPath = function(filename) {
+  return splitPathRe.exec(filename).slice(1);
+};
 
-/***/ 107:
-/***/ (function(module, exports, __webpack_require__) {
+// path.resolve([from ...], to)
+// posix version
+exports.resolve = function() {
+  var resolvedPath = '',
+      resolvedAbsolute = false;
 
-var getMapData = __webpack_require__(103);
+  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
+    var path = (i >= 0) ? arguments[i] : process.cwd();
 
-/**
- * Sets the map `key` to `value`.
- *
- * @private
- * @name set
- * @memberOf MapCache
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the map cache instance.
- */
-function mapCacheSet(key, value) {
-  var data = getMapData(this, key),
-      size = data.size;
+    // Skip empty and invalid entries
+    if (typeof path !== 'string') {
+      throw new TypeError('Arguments to path.resolve must be strings');
+    } else if (!path) {
+      continue;
+    }
 
-  data.set(key, value);
-  this.size += data.size == size ? 0 : 1;
-  return this;
-}
+    resolvedPath = path + '/' + resolvedPath;
+    resolvedAbsolute = path.charAt(0) === '/';
+  }
 
-module.exports = mapCacheSet;
+  // At this point the path should be resolved to a full absolute path, but
+  // handle relative paths to be safe (might happen when process.cwd() fails)
 
+  // Normalize the path
+  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
+    return !!p;
+  }), !resolvedAbsolute).join('/');
 
-/***/ }),
+  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
+};
 
-/***/ 108:
-/***/ (function(module, exports, __webpack_require__) {
+// path.normalize(path)
+// posix version
+exports.normalize = function(path) {
+  var isAbsolute = exports.isAbsolute(path),
+      trailingSlash = substr(path, -1) === '/';
 
-var baseToString = __webpack_require__(109);
+  // Normalize the path
+  path = normalizeArray(filter(path.split('/'), function(p) {
+    return !!p;
+  }), !isAbsolute).join('/');
 
-/**
- * Converts `value` to a string. An empty string is returned for `null`
- * and `undefined` values. The sign of `-0` is preserved.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to convert.
- * @returns {string} Returns the converted string.
- * @example
- *
- * _.toString(null);
- * // => ''
- *
- * _.toString(-0);
- * // => '-0'
- *
- * _.toString([1, 2, 3]);
- * // => '1,2,3'
- */
-function toString(value) {
-  return value == null ? '' : baseToString(value);
-}
+  if (!path && !isAbsolute) {
+    path = '.';
+  }
+  if (path && trailingSlash) {
+    path += '/';
+  }
 
-module.exports = toString;
+  return (isAbsolute ? '/' : '') + path;
+};
 
+// posix version
+exports.isAbsolute = function(path) {
+  return path.charAt(0) === '/';
+};
 
-/***/ }),
+// posix version
+exports.join = function() {
+  var paths = Array.prototype.slice.call(arguments, 0);
+  return exports.normalize(filter(paths, function(p, index) {
+    if (typeof p !== 'string') {
+      throw new TypeError('Arguments to path.join must be strings');
+    }
+    return p;
+  }).join('/'));
+};
 
-/***/ 109:
-/***/ (function(module, exports, __webpack_require__) {
 
-var Symbol = __webpack_require__(7),
-    arrayMap = __webpack_require__(110),
-    isArray = __webpack_require__(70),
-    isSymbol = __webpack_require__(72);
+// path.relative(from, to)
+// posix version
+exports.relative = function(from, to) {
+  from = exports.resolve(from).substr(1);
+  to = exports.resolve(to).substr(1);
 
-/** Used as references for various `Number` constants. */
-var INFINITY = 1 / 0;
+  function trim(arr) {
+    var start = 0;
+    for (; start < arr.length; start++) {
+      if (arr[start] !== '') break;
+    }
 
-/** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol ? Symbol.prototype : undefined,
-    symbolToString = symbolProto ? symbolProto.toString : undefined;
+    var end = arr.length - 1;
+    for (; end >= 0; end--) {
+      if (arr[end] !== '') break;
+    }
 
-/**
- * The base implementation of `_.toString` which doesn't convert nullish
- * values to empty strings.
- *
- * @private
- * @param {*} value The value to process.
- * @returns {string} Returns the string.
- */
-function baseToString(value) {
-  // Exit early for strings to avoid a performance hit in some environments.
-  if (typeof value == 'string') {
-    return value;
-  }
-  if (isArray(value)) {
-    // Recursively convert values (susceptible to call stack limits).
-    return arrayMap(value, baseToString) + '';
-  }
-  if (isSymbol(value)) {
-    return symbolToString ? symbolToString.call(value) : '';
+    if (start > end) return [];
+    return arr.slice(start, end - start + 1);
   }
-  var result = (value + '');
-  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
-}
-
-module.exports = baseToString;
 
+  var fromParts = trim(from.split('/'));
+  var toParts = trim(to.split('/'));
 
-/***/ }),
-
-/***/ 11:
-/***/ (function(module, exports) {
-
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
-
-/**
- * Used to resolve the
- * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
- * of values.
- */
-var nativeObjectToString = objectProto.toString;
-
-/**
- * Converts `value` to a string using `Object.prototype.toString`.
- *
- * @private
- * @param {*} value The value to convert.
- * @returns {string} Returns the converted string.
- */
-function objectToString(value) {
-  return nativeObjectToString.call(value);
-}
-
-module.exports = objectToString;
-
-
-/***/ }),
-
-/***/ 110:
-/***/ (function(module, exports) {
-
-/**
- * A specialized version of `_.map` for arrays without support for iteratee
- * shorthands.
- *
- * @private
- * @param {Array} [array] The array to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Array} Returns the new mapped array.
- */
-function arrayMap(array, iteratee) {
-  var index = -1,
-      length = array == null ? 0 : array.length,
-      result = Array(length);
-
-  while (++index < length) {
-    result[index] = iteratee(array[index], index, array);
+  var length = Math.min(fromParts.length, toParts.length);
+  var samePartsLength = length;
+  for (var i = 0; i < length; i++) {
+    if (fromParts[i] !== toParts[i]) {
+      samePartsLength = i;
+      break;
+    }
   }
-  return result;
-}
 
-module.exports = arrayMap;
+  var outputParts = [];
+  for (var i = samePartsLength; i < fromParts.length; i++) {
+    outputParts.push('..');
+  }
 
+  outputParts = outputParts.concat(toParts.slice(samePartsLength));
 
-/***/ }),
+  return outputParts.join('/');
+};
 
-/***/ 111:
-/***/ (function(module, exports, __webpack_require__) {
+exports.sep = '/';
+exports.delimiter = ':';
 
-var isSymbol = __webpack_require__(72);
+exports.dirname = function(path) {
+  var result = splitPath(path),
+      root = result[0],
+      dir = result[1];
 
-/** Used as references for various `Number` constants. */
-var INFINITY = 1 / 0;
+  if (!root && !dir) {
+    // No dirname whatsoever
+    return '.';
+  }
 
-/**
- * Converts `value` to a string key if it's not a string or symbol.
- *
- * @private
- * @param {*} value The value to inspect.
- * @returns {string|symbol} Returns the key.
- */
-function toKey(value) {
-  if (typeof value == 'string' || isSymbol(value)) {
-    return value;
+  if (dir) {
+    // It has a dirname, strip trailing slash
+    dir = dir.substr(0, dir.length - 1);
   }
-  var result = (value + '');
-  return (result == '0' && (1 / value) == -INFINITY) ? '-0' : result;
-}
 
-module.exports = toKey;
+  return root + dir;
+};
 
 
-/***/ }),
+exports.basename = function(path, ext) {
+  var f = splitPath(path)[2];
+  // TODO: make this comparison case-insensitive on windows?
+  if (ext && f.substr(-1 * ext.length) === ext) {
+    f = f.substr(0, f.length - ext.length);
+  }
+  return f;
+};
 
-/***/ 1117:
-/***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 32 32\"><rect fill=\"#002f42\" width=\"16\" x=\"0\" y=\"28\" height=\"4\"></rect><rect fill=\"#0072b1\" width=\"16\" x=\"16\" y=\"28\" height=\"4\"></rect></svg>"
+exports.extname = function(path) {
+  return splitPath(path)[3];
+};
 
-/***/ }),
+function filter (xs, f) {
+    if (xs.filter) return xs.filter(f);
+    var res = [];
+    for (var i = 0; i < xs.length; i++) {
+        if (f(xs[i], i, xs)) res.push(xs[i]);
+    }
+    return res;
+}
 
-/***/ 1118:
-/***/ (function(module, exports) {
+// String.prototype.substr - negative index don't work in IE8
+var substr = 'ab'.substr(-1) === 'b'
+    ? function (str, start, len) { return str.substr(start, len) }
+    : function (str, start, len) {
+        if (start < 0) start = str.length + start;
+        return str.substr(start, len);
+    }
+;
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 2500 2500\"><path d=\"M70 188.5h220v1460h870v180H70v-1640zm1776 396c-225-3-450 140-520 357-100 250-54 564 142 755 190 158 476 170 690 58 147-78 240-233 260-396 26-170 13-356-70-510-98-164-290-270-480-263l-22-3zm20 174c165 0 313 126 340 288 50 183 20 407-130 536-140 114-365 98-480-43-140-150-140-380-68-560 50-130 183-223 323-220h18z\" fill=\"#000000\"></path><path d=\"M70 2061.5h2360v250H70v-250z\" fill=\"#3492ff\"></path></svg>"
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(120)))
 
 /***/ }),
 
-/***/ 1119:
+/***/ 120:
 /***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0.1 31.4 256 244.5\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"xMinYMin meet\"><path fill=\"#FFF\" d=\"M57.9 219.3l.6-1.5.1-.2c.5-1.2 1-2.5 1.5-3.7.6-1.6 1.2-3.3 1.8-4.9.4-.9.7-1.8 1-2.8.8-2.2 1.9-5.1 3.2-7.9.8-1.7 1.4-2.9 2.1-4 .8-1.3 1.6-2.5 2.5-3.7l.7-1 1.1-.7c.1-.1.3-.2.5-.3.5-.3 1.1-.5 1.5-.7.7-.3 1.6-.6 2.6-.9 1.4-.4 3-.8 4.9-1.2 2.8-.6 5.8-1.2 9.6-1.8 5.7-.9 11.8-1.7 19.1-2.5 12.9-1.4 25.8-2.4 38.2-3 6.6-.3 11.6-.4 16.3-.4h3c3.1.1 6.7.2 10 .7 1.2.2 2.3.4 3.1.7.3.1.6.2.7.3l1 .4.8.7.9.9c1.1 1.1 2.3 2.4 3.5 3.9 3.8 4.8 7.2 10.6 10.2 17.2 2.9 6.4 4.7 12.1 5.8 17.7l1.5 7.9h-18.4l-1.1-5.3c-1.2-5.6-16.3-20.4-23.8-23.3-.8-.3-4-1.2-13.9-1.2-20.4 0-49.2 3.6-53.3 4.5-4.9 2.3-12.4 11.9-16.7 21.5l-1.8 3.9\"></path><path fill=\"#BA8449\" d=\"M182.9 190.1c-.9-1.2-1.9-2.3-3-3.3l-.7-.7s-.1 0-.2-.1c-.5-.2-1.2-.3-1.9-.4-2.9-.4-6-.5-9.1-.6-6.3-.1-12.6.1-18.9.4-12.6.6-25.3 1.6-37.8 3-6.3.7-12.6 1.5-18.8 2.5-3.1.5-6.2 1-9.2 1.7-1.5.3-3 .7-4.4 1.1-.7.2-1.4.4-2 .7-.3.1-.6.2-.7.4 0 0-.1 0-.1.1-.7 1-1.4 2-2.1 3.1-.7 1.1-1.2 2.3-1.8 3.5-1.1 2.4-2.1 4.9-3 7.4s-1.9 5.1-2.8 7.7c-.5 1.3-1 2.6-1.6 3.9-.2.6-.5 1.2-.8 1.8h8.5c4.6-10.3 13.3-22.1 20.5-25 2-.8 34.2-4.8 55.5-4.8 7.9 0 13.3.6 16.3 1.7 8.7 3.4 26.1 19.5 27.9 28.2h4.9c-1-5.5-3-10.9-5.3-16.1-2.6-6-5.7-11.5-9.4-16.2\"></path><path fill=\"#FFF\" d=\"M179.1 185.9z\"></path><path fill=\"#BA8449\" d=\"M179.1 185.9z\"></path><path fill=\"#FFF\" d=\"M192.1 228.6l-1-5.4c-.9-4.5-2.4-9.3-4.8-14.6-2.6-5.6-5.4-10.5-8.6-14.4-.6-.8-1.2-1.5-1.8-2.1-2.5-.4-5.4-.4-8-.5h-2.8c-4.5 0-9.3.1-15.7.4-12.2.6-24.7 1.6-37.4 3-7.1.8-13 1.6-18.4 2.4-3.5.5-6.3 1.1-8.8 1.6-1.6.4-2.8.7-3.9 1-.2 0-.3.1-.4.1-.2.4-.5.7-.7 1.1-.5.8-.9 1.7-1.6 2.9-1.1 2.3-2 4.7-2.8 6.8-.4.9-.7 1.8-1 2.7-.6 1.7-1.2 3.4-1.9 5.1-.5 1.3-1.1 2.6-1.6 4l-.1.2c-.2.6-.5 1.2-.7 1.7l-1.8 4H56.6l-1.7-.8-.2-.1c-4-2.3-4-5.7-3.9-7.1v-.3l.2-.9.3-1.1c.2-.7.4-1.5.6-2.2.4-1.5.9-2.9 1.4-4.3.9-2.6 2-5.4 3.3-8.4 1.4-3.1 2.7-5.8 4.2-8.3.7-1.3 1.5-2.6 2.5-4.1.9-1.4 1.9-2.8 2.9-4.1.9-1.1 1.7-1.8 2.3-2.2h.1c.6-.5 1.2-.8 1.5-.9.9-.5 1.6-.8 2.1-1 1.2-.5 2.3-.8 3.2-1.1 2-.6 3.9-1 5.3-1.3 2.9-.6 6-1.2 9.9-1.8 5.8-.9 11.9-1.6 19.4-2.4 13-1.3 26-2.3 38.6-2.8 6-.2 10.7-.4 15-.4h4.6c3.2.1 6.8.2 10.7.8h.1c.9.2 2.3.4 3.9.9h.1c.4.2 1 .4 1.7.7.5.3.9.5 1.2.7l.5.4.4.3.4.4 1.1 1.1c1.3 1.3 2.5 2.7 3.8 4.4 4 5.2 7.5 11.2 10.7 18.3 1.5 3.3 2.8 6.6 3.8 9.8 1.1 3.5 1.9 6.8 2.5 10l1.2 7.7h-18.2v.1z\"></path><path fill=\"#FFF\" d=\"M64.3 228.6l4.4-9.5c3.7-7.9 12.6-22.4 22.5-26.5l.2-.1c3.3-1.2 36.7-5.1 57.1-5.1 11.4 0 15.7 1.1 17.9 2 10.3 4 28.2 20.9 30.6 30.9l2 8.2H64.3z\"></path><path fill=\"#FFF\" d=\"M185.4 228.6l-1.2-5.1c-1.1-4.7-15.2-18.8-22.5-21.7-.7-.3-3.6-1.1-13.2-1.1-19.6 0-48 3.5-52.6 4.4-3.8 1.9-10.7 10-15.2 19.6l-1.8 3.8H62.3l4.2-9.3c4.9-11 14.6-24.6 24.1-28.4 3.7-1.5 37.5-5.3 58-5.3 8.9 0 14.9.7 18.6 2.1 10.3 4 29.6 21.4 32 33l1.6 8h-15.4z\"></path><path fill=\"#FFF\" d=\"M193.1 228.6l-1.9-1.8c-7.2-6.7-9.2-20.6-7-26.3 1.5-3.8 4.7-5.1 7.1-5.1.7 0 1.3.1 1.9.3 1.3-.1 4.3-2.6 5.2-4 1.4-2.6 4.1-4.2 7.4-4.2 4.9 0 12.9 3.9 15.5 7.6 1.5 2.1 1.9 4.6 1.1 6.8-.1.2-.2.6-.4 1.1-2.7 8.1-6.2 18-9 22.6l-1.9 3.1-18-.1z\"></path><path fill=\"#FFF\" d=\"M192.5 228.6l6.2-10.1c3-4.9 5.1-8.9 6.5-12-3.5 2.5-8.4 4-15.7 4.4l-.2-.2-.1.7c-4.3 0-7.8-3.5-8-7.8-.1-2.1.7-4.2 2.1-5.8 1.4-1.6 3.4-2.5 5.5-2.6 7.2-.3 8.1-2 9.4-4.5 1.8-3.4 5.7-5.4 10.8-5.4 1.3 0 2.6.1 3.8.4 6.3 1.4 10.4 6.2 10.7 12.4.3 6.3-3.2 15.5-10.2 27.3l-1.9 3.2h-18.9z\"></path><path fill=\"#FFF\" d=\"M218.8 208.9c-8.1 0-16.9-5.3-21.4-10.5-4.1-4.7-4.5-8.9-4.1-11.6.5-3.3 3.2-6.6 8.1-6.6.9 0 1.8.1 2.6.2.8-3.6 2.7-11.1 10.4-11.1h1.1c3.7.4 6.5 2.7 7.6 6.2 1.2-.6 2.6-1.1 4.2-1.1 2.4 0 4.7 1 6.4 2.8 2.7 2.9 3.3 6.9 1.6 10.7 1.8 1.1 3.2 2.8 3.8 5 .8 2.8.3 5.8-1.5 8.2-3.5 4.9-11.6 7.2-18 7.4-.4.4-.6.4-.8.4M210.8 44.2c-7.3 4.6-15.3 15.1-25.1 29.5-1.5 2.3-4 3.5-6.8 3.5-3.6 0-8.2-2.2-13.5-6.5-8.4-6.8-8.6-10.6-8.7-12.1-.2-4 2.8-7.4 7-7.8 8.1-.7 14.8-5.6 21.3-10.3 6.5-4.7 12.5-9 19.7-9 1.4 0 2.9.2 4.3.5\"></path><path fill=\"#FFF8EE\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4\"></path><path fill=\"#FFF\" d=\"M37.3 48.2c4.9-4.5 11.5-6.8 19.6-6.8 7 0 15.3 1.7 24.6 5.1 2.5.9 5.8 1.1 8.3 1.1h3.7c2.3 0 7.2 0 9.3 4.5.7 1.7 1.6 5.2-1.1 9.3-3.3 5.1-12 10.5-20.4 10.5h-.4c-4.5-.1-8.7-2.5-13.6-5.2-6.1-3.4-13-7.3-21.2-7.3-1.1 0-2.3.1-3.4.2M188.1 96.7c-3.6 0-10.4-1.5-14.7-11.7-2.4-5.4-3.2-11.5-3.2-14.9 0-7 3.7-8.9 6-9.4 1.6-1.6 4.6-5.7 6.8-8.8 9.1-12.4 15.7-20.5 23.4-20.5 1.3 0 2.5.2 3.7.7 10.3 4.1 15.3 12.8 13.6 23.8-1.2 8.1-6.3 17.7-13.8 26.5-3.5 4.1-12.6 13.7-20.7 14.3h-1.1\"></path><path fill=\"#FFF\" d=\"M69.9 100.5c-.9 0-1.8 0-2.6-.2-12.8-2.1-28.8-15-34.8-28.3-4.1-9.1-2.3-15.3 0-18.9 3.7-5.9 9.2-9 16-9 8.2 0 16.4 4.5 23.6 8.4 2.8 1.5 6.8 3.7 8.5 4.1.6-.2 1.2-.3 1.9-.3 2.6 0 5 1.4 6.4 3.8 3.3 5.8 1.3 21.4-3.9 30.4-3.6 6.6-9 10-15.1 10z\"></path><path fill=\"#FFF\" d=\"M114.5 212.1c-30 0-59.7-14.7-69.6-25.4-10.3-11.1-14-23.7-11.2-37.5 2.4-11.3 8.7-21.4 14.2-30.4 3.8-6.2 7.4-12 8.4-16.2 12.2-53.9 42.8-60.8 68.1-60.8 1.6 0 3.3 0 5.2.1 53.9 1.6 59.3 27.6 62.5 43.2.6 2.9 1.2 5.6 1.9 7.4 18.1 44.4 21.1 71 10 89-10.9 17.7-34.8 26.4-82.4 30.3-2.3.2-4.7.3-7.1.3z\"></path><path fill=\"#FFF\" d=\"M113.4 212.2c-30.6 0-58.9-15.2-68.4-25.5-10.3-11.1-14-23.7-11.2-37.5 2.4-11.3 8.7-21.4 14.2-30.4 3.8-6.2 7.4-12 8.4-16.2 12.2-53.9 42.8-60.8 68.1-60.8 1.6 0 3.3 0 5.2.1 53.9 1.6 59.3 27.6 62.5 43.2.6 2.9 1.2 5.6 1.9 7.4 17.8 43.7 20.7 70.1 9.8 88.1-12.5 20.7-41.9 27.4-82.1 31.2-2.8.3-5.6.4-8.4.4\"></path><path fill=\"#FFF\" d=\"M191.3 174.6c.4-.9.8-1.9 1.2-2.8 4.1-9.8 7.2-18.4 2.3-23.9-5.8-6.4-30.3-18-52.1-28.2-41.7-19.7-67.5-32.4-71.2-45-.9-3.2-.5-6.5 1.2-9.3C79.9 54.1 100 42 127.5 42h.8c25.9.2 44.7 7.7 56 22.1 9.6 12.2 11.7 26.5 13.3 36.9.5 3.5 1.2 8 1.9 9.2 19.6 33.7 10.6 58.6 3.5 70.3l-11.7-5.9z\"></path><path fill=\"#FFF\" d=\"M170.8 135.8c-10.1 0-27-2.5-32.8-8.1-4.6-4.4-6.3-11.7-8.1-18.8-.7-3-1.9-7.8-3-10h-.1c-.4 1.1-.9 2.5-1.3 3.6-2.7 7.6-6.5 18.1-14.4 23.8-3.4 2.5-15.7 4.7-25.2 4.7s-16.7-2-21.5-6.1c-6.9-5.8-12.1-16.5-15.6-31.8-.2-.1-.3-.2-.5-.3-1.6-1.1-3.7-2.4-4.8-4.7-1.8-3.6-1.1-10 .8-13.4 1.4-2.5 3.8-4.1 6.4-4.3h.9c1.4 0 2.8.2 4.4.5s3.5.6 5.1.6h.9c9.5-1.4 18.4-2 26.5-2 19.7 0 30.1 4 34 5.6.3.1.6.2.8.3 1.1.3 3.2.7 5.4.7.8 0 1.6 0 2.3-.2 8.9-1.4 17.4-2 25.2-2 20.8 0 31.8 4.7 36.6 6.8.4.2.8.4 1.1.4h.4c1.3 0 3.2-.4 4.8-.7 1.2-.3 2.4-.5 3.5-.7h.9c3.1 0 5.9 1.8 7.6 4.8 1.9 3.5 3.2 10.8.5 15-1.8 2.8-4.7 4.1-7.1 5.2-.3.1-.7.3-1 .5-.8 1.4-2.2 4.2-3.4 6.5-3.5 6.8-7.4 14.6-11 18.8-3.2 3.6-9.2 5.3-18.3 5.3\"></path><defs><path id=\"a\" d=\"M42.5 75H212v59.2H42.5z\"></path></defs><clipPath id=\"b\"><use xlink:href=\"#a\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#b)\"><path fill=\"#FFF\" d=\"M166.778 134.181c-8 0-19.3-1.2-27.4-6.9-4.6-3.3-6.7-9.9-9.6-20.5-.8-3-2-7.2-2.9-9.3-.5 1.2-1.1 2.8-1.6 4.1-3 8.1-7.1 19.1-14.6 23.7-3.9 2.4-16 4.6-25.4 4.6-10.1 0-17.4-2.3-21.6-6.7-10.7-11.2-12.8-21.9-14.1-28.2-.2-.9-.4-2.1-.6-2.8-6.3-3.3-6.7-8.2-6.6-10.3.3-3.9 3.3-6.8 7-6.8 2.5 0 4.1 1.2 5.3 2 .1.1.2.2.4.2.1 0 .4.1.5.2 1.6.5 6.3 1.8 7.3 7.9.2 1.1 1.8 7.5 4.4 14.2 4.1 10.7 7 12.5 7.3 12.6 3.4 1.2 7.4 1.8 11.9 1.8 7.4 0 13.6-1.6 16.1-2.4 1.5-2.3 4.5-8.3 6.6-12.4 6.3-12.5 7.4-14.4 10.1-15.8 1.5-.8 3.3-1.2 5.6-1.2 3 0 7.3.7 9.3 1.6 4.6 2 7 8 12.4 23.5 1 2.8 2.2 6.4 3 8.2 4 1.9 13.1 3.2 22.6 3.2 2.7 0 4.7-.1 6-.2.9-1.9 2.2-4.6 3.3-6.9 7.6-16.2 8.8-18.1 10.7-19.6 3.3-2.5 9.1-4.2 12.4-4.2 4.4 0 6.8 2.9 7.4 5.7 1.1 5.8-4.6 8-6.5 8.7-.5.2-1.2.5-1.7.7-.7 1.2-2 3.8-3 5.9-8.2 16-10.9 20.4-14 22.3-3.8 2.1-13 3.1-20 3.1\"></path></g><defs><path id=\"c\" d=\"M45 70.7h33.4v16.2H45z\"></path></defs><clipPath id=\"d\"><use xlink:href=\"#c\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#d)\"><path fill=\"#FFF\" d=\"M61.388 86.816c-1.2 0-3.5-.2-8.1-1.7-1.2-.4-2.3-.8-3-1.1-1.5-.6-5.4-2.1-5.4-6.7v-6.7h6.6c.9 0 1.5.2 2 .3 1.4.2 5.9.5 7.4.6l.9.1c1.2 0 4.9-.5 6.5-.7 2-.3 2.6-.4 3.4-.4h5.7l.9 5.6c.4 2.8-1.1 6.3-4.8 7.4-.2.1-.9.3-1.5.5-3.5 1.3-7 2.5-10 2.6-.2.2-.4.2-.6.2\"></path></g><defs><path id=\"e\" d=\"M181 79.3h25.4v17.2H181z\"></path></defs><clipPath id=\"f\"><use xlink:href=\"#e\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#f)\"><path fill=\"#FFF\" d=\"M193.488 96.41c-2.2 0-4.4-.9-7.4-3-2.9-2-5.1-4-5.1-7.5v-6.7h6.5c.9 0 1.8.2 2.7.6.7.3 3.4 1.2 4.6 1.5.4 0 1.2-.2 2.8-.5.8-.2 1.3-.2 2-.2h5.7l.9 5.6c.4 2.7-.8 6.1-4.5 7.4l-1.2.6c-1.8.9-3.9 1.9-6 2.3-.2-.1-.6-.1-1-.1\"></path></g><path fill=\"#FFF\" d=\"M171.7 243.3h-24.6V222h24.6v21.3z\"></path><path fill=\"#BA8449\" d=\"M182.9 190.1c-.9-1.2-1.9-2.3-3-3.3l-.7-.7s-.1 0-.2-.1c-.5-.2-1.2-.3-1.9-.4-2.9-.4-6-.5-9.1-.6-6.3-.1-12.6.1-18.9.4-12.6.6-25.3 1.6-37.8 3-6.3.7-12.6 1.5-18.8 2.5-3.1.5-6.2 1-9.2 1.7-1.5.3-3 .7-4.4 1.1-.7.2-1.4.4-2 .7-.3.1-.6.2-.7.4 0 0-.1 0-.1.1-.7 1-1.4 2-2.1 3.1-.7 1.1-1.2 2.3-1.8 3.5-1.1 2.4-2.1 4.9-3 7.4s-1.9 5.1-2.8 7.7c-.5 1.3-1 2.6-1.6 3.9-.2.6-.5 1.2-.8 1.8h8.5c4.6-10.3 13.3-22.1 20.5-25 2-.8 34.2-4.8 55.5-4.8 7.9 0 13.3.6 16.3 1.7 8.7 3.4 26.1 19.5 27.9 28.2h4.9c-1-5.5-3-10.9-5.3-16.1-2.6-6-5.7-11.5-9.4-16.2M179.1 185.9z\"></path><path fill=\"#895B2E\" d=\"M179.1 185.9zm17.8 17.9c-2.7-6-5.8-11.7-9.9-16.9-1-1.3-2.1-2.6-3.3-3.8l-.9-.9-.2-.2-.1-.1-.2-.2c-.2-.1-.4-.2-.5-.3-.3-.2-.6-.3-.9-.4-1.1-.4-1.9-.5-2.8-.7-3.4-.5-6.6-.6-9.8-.7-6.5-.1-12.8 0-19.2.3-12.8.5-25.5 1.5-38.2 2.8-6.3.7-12.7 1.4-19.1 2.4-3.2.5-6.3 1-9.5 1.7-1.6.4-3.2.7-4.8 1.2-.8.2-1.6.5-2.5.9-.4.2-.9.4-1.4.7-.2.2-.5.3-.8.5-.3.2-.6.5-1 1-.9 1.1-1.8 2.4-2.6 3.6-.8 1.2-1.6 2.5-2.3 3.8-1.4 2.5-2.7 5.1-3.9 7.7-1.1 2.6-2.2 5.2-3.1 7.9-.5 1.3-.9 2.6-1.2 4-.2.7-.4 1.3-.6 2l-.3 1-.1.5c0 .1.2.2.6.5H64.2c.3-.6.5-1.2.8-1.8.5-1.3 1.1-2.6 1.6-3.8 1-2.6 1.9-5.1 2.8-7.7.9-2.5 1.9-5.1 3-7.4.6-1.2 1.2-2.3 1.8-3.5.7-1.1 1.3-2.1 2.1-3.1 0 0 .1 0 .1-.1.2-.1.5-.2.7-.4.6-.2 1.3-.5 2-.7 1.4-.4 2.9-.8 4.4-1.1 3-.7 6.1-1.2 9.2-1.7 6.2-1 12.5-1.8 18.8-2.5 12.6-1.4 25.2-2.4 37.8-3 6.3-.3 12.6-.5 18.9-.4 3.1.1 6.3.2 9.1.6.7.1 1.4.3 1.9.4.1 0 .2 0 .2.1l.7.7c1.1 1.1 2 2.2 3 3.3 3.7 4.7 6.8 10.2 9.4 15.8 2.3 5.2 4.3 10.6 5.3 16.1h5c-.5-3.1-1.3-6.1-2.2-9-1.2-3.1-2.4-6.1-3.7-9.1\"></path><path fill=\"#FFF8EE\" d=\"M164.1 195.7c-2.6-1-7.9-1.6-15.5-1.6-21.4 0-53 4-54.7 4.7-6.5 2.6-14.6 13.6-19.1 23.2h115.9c-1.9-7.5-18-22.9-26.6-26.3\"></path><path fill=\"#E5D0AE\" d=\"M164.8 193.8c-2.9-1.1-8.4-1.7-16.3-1.7-21.3 0-53.5 4-55.5 4.8-7.3 3-15.9 14.7-20.5 25h2.2c4.5-9.5 12.6-20.5 19.1-23.2 1.7-.7 33.3-4.7 54.7-4.7 7.6 0 12.9.5 15.5 1.6 8.6 3.3 24.7 18.8 26.6 26.3h2c-1.7-8.6-19.1-24.7-27.8-28.1\"></path><path fill=\"#BA8449\" d=\"M204.4 194.7c-1.2 2.5-7.5 8.9-12.8 7.4-2.8-.8-2.3 14 4.1 19.9h11.6c3.2-5.1 8.2-20.7 8.8-22.3.7-1.9-10.5-7.5-11.7-5\"></path><path fill=\"#895B2E\" d=\"M216.7 198.4c-.2-3.2-2.1-5.5-5.5-6.3-2.7-.6-6.3-.1-7.2 1.6-1.8 3.4-4 7.5-14.9 8.1-.7 0-1.3.7-1.3 1.4s.7 1.3 1.4 1.3c11.4-.5 14.7-4.9 17.1-9.4.5-.4 3.2-.9 5.4 0 1.6.7 2.3 1.8 2.4 3.5.3 6.2-6.2 17.7-9.7 23.5h3.1c3.9-6.8 9.5-17.3 9.2-23.7\"></path><defs><path id=\"g\" d=\"M193.5 196.5H217v27.3h-23.5z\"></path></defs><clipPath id=\"h\"><use xlink:href=\"#g\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#h)\"><path fill=\"#E3AB5E\" d=\"M194.235 222.3c7.1-1.7 13.4-8.8 13.9-18.9.1-1.9-3.8-5.5-3.8-6.5s11.9.2 12.5 3c.5 2.8-7.4 19.7-10.1 22.5-2.6 2.7-16.7.9-12.5-.1\"></path></g><path fill=\"#FCD4C3\" d=\"M199.8 187.8c-.9 6.2 11.2 14.7 19.4 14.5 6.8-.2 14.5-3.4 13.4-7.2-1.1-3.9-7.7.7-8.3-2-.5-2.6 7.7-7.5 4.4-11.1-3.1-3.3-6.7 5.2-10.3 4-3.6-1.2.7-9.5-3.8-10-5.3-.5-3.3 11.3-7.3 11.5-2.8.3-7.2-1.7-7.5.3\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M199.8 187.8c-.9 6.2 11.2 14.7 19.4 14.5 6.8-.2 14.5-3.4 13.4-7.2-1.1-3.9-7.7.7-8.3-2-.5-2.6 7.7-7.5 4.4-11.1-3.1-3.3-6.7 5.2-10.3 4-3.6-1.2.7-9.5-3.8-10-5.3-.5-3.3 11.3-7.3 11.5-2.8.3-7.2-1.7-7.5.3z\"></path><defs><path id=\"i\" d=\"M203.2 182.8h7.8v6.4h-7.8z\"></path></defs><clipPath id=\"j\"><use xlink:href=\"#i\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#j)\"><path fill=\"#FCD4C3\" d=\"M203.238 187.742c1.3 1 6 2.3 6.7.6.8-1.7 1.4-5.1.9-5.6-.4 1.6-.9 4.6-2.6 5.3-1.3.5-4.1-.1-5-.3\"></path></g><defs><path id=\"k\" d=\"M215.9 181.2h7.7v7.2h-7.7z\"></path></defs><clipPath id=\"l\"><use xlink:href=\"#k\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#l)\"><path fill=\"#FCD4C3\" d=\"M216.159 181.142c-.2 1.1-1.1 6.3 1.6 7 2.3.6 4-.8 5.8-3.7-1 .9-3.5 3.1-5.4 2.3-1.9-.9-2.1-2.9-2-5.6\"></path></g><defs><path id=\"m\" d=\"M204.5 193h15.8v8.6h-15.8z\"></path></defs><clipPath id=\"n\"><use xlink:href=\"#m\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#n)\"><path fill=\"#FCD4C3\" d=\"M204.576 195.158c13.6-6.7 16.4 4.2 15.7 6.4-5.4.9-14.9-4.7-15.7-6.4\"></path></g><defs><path id=\"o\" d=\"M223 190.9h5.7v5H223z\"></path></defs><clipPath id=\"p\"><use xlink:href=\"#o\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#p)\"><path fill=\"#FCD4C3\" d=\"M224.351 190.896c-2.3 2.6-1.2 4.7.3 5 1.9.4 4.4-1.6 4-1.6-.5 0-4.2 1.2-4.9-.6-.5-1.4.3-2.2.6-2.8\"></path></g><defs><path id=\"q\" d=\"M66.1 182.6H195v36.5H66.1z\"></path></defs><clipPath id=\"r\"><use xlink:href=\"#q\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#r)\"><path fill=\"#E3AB5E\" d=\"M69.034 208.266c43.7 25.1 130.4-.4 125.8-8.6-6.1-10.9-8.5-17.7-21.9-17.1-13.3.7-98.9 7.5-102.4 10.1-3.4 2.7-7.2 12.3-1.5 15.6\"></path></g><path fill=\"#FFF8EE\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4\"></path><path fill=\"none\" stroke=\"#E5D0AE\" stroke-width=\"3\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-miterlimit=\"10\" d=\"M164.3 57.5c19.6-1.8 31.1-22.1 43-19-8 5-15.9 15-27 31.4-2.7 3.9-21.4-11.9-16-12.4z\"></path><path fill=\"#BA8449\" d=\"M41.8 53.1c8.8-8.2 24.7-5 37.5-.4 7.3 2.6 16.8.5 17.4 2 1.6 3.5-7.9 10.7-15.7 10.5-7.7-.1-20.6-14.6-39.2-12.1\"></path><path fill=\"none\" stroke=\"#895B2E\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-miterlimit=\"10\" d=\"M41.8 53.1c8.8-8.2 24.7-5 37.5-.4 7.3 2.6 16.8.5 17.4 2 1.6 3.5-7.9 10.7-15.7 10.5-7.7-.1-20.6-14.6-39.2-12.1z\"></path><path fill=\"#FCD4C3\" d=\"M177.7 67.2c4.5 1.3 21.6-32.2 29.9-28.9 26.4 10.5-8 50.9-18.9 51.8-11 .8-13.5-23.7-11-22.9\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M177.7 67.2c4.5 1.3 21.6-32.2 29.9-28.9 26.4 10.5-8 50.9-18.9 51.8-11 .8-13.5-23.7-11-22.9z\"></path><path fill=\"#FCD4C3\" d=\"M82.3 63.2c-7.3 3.2-33.2-23.9-44.1-6.5C31 68.2 52.8 91.4 68.4 93.9s17.7-32.4 13.9-30.7\"></path><path fill=\"none\" stroke=\"#F8A38F\" stroke-width=\"2\" stroke-miterlimit=\"10\" d=\"M82.3 63.2c-7.3 3.2-33.2-23.9-44.1-6.5C31 68.2 52.8 91.4 68.4 93.9s17.7-32.4 13.9-30.7z\"></path><defs><path id=\"s\" d=\"M180.5 44.8h18v44.6h-18z\"></path></defs><clipPath id=\"t\"><use xlink:href=\"#s\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#t)\"><path fill=\"#FCD4C3\" d=\"M198.067 44.8c-1.4 4.6-13.2 16.5-11.6 26.7.6 3.8 4.6 15 6.3 14.6s6-3.1 5.6-2.5c-.4.6-6 4.7-8.1 5.8-2.1-1.1-11-21.8-9.7-22.9 3.9-3.5 15.8-21.5 17.5-21.7\"></path></g><defs><path id=\"u\" d=\"M38.6 51.5h44.2v31.6H38.6z\"></path></defs><clipPath id=\"v\"><use xlink:href=\"#u\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#v)\"><path fill=\"#FCD4C3\" d=\"M38.533 57.4c8-4.9 22.6-2.8 31.1 5.5 3 3 3.9 13-2.9 19.8-2.7 2.7 16-9.6 16.1-13.2 0-3.6-1.2-4.6-4-5.6-10.3-3.8-21.1-12.6-30.5-12.4-6.1.1-8.9 4.3-9.8 5.9\"></path></g><defs><path id=\"w\" d=\"M181.1 42.2h26.2v44.2h-26.2z\"></path></defs><clipPath id=\"x\"><use xlink:href=\"#w\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#x)\"><path fill=\"#FCD4C3\" d=\"M201.3 42.175c18.2 10-11.1 25.2-8.9 44.1-3.8-.4-13.2-18.7-10.9-20.3 3.2-2.2 16.7-24.6 19.8-23.8\"></path></g><path fill=\"#E5D0AE\" d=\"M60.9 103.6c.3-1.3.5-2.7.5-4 .1-1.4.2-2.8.5-4.1.1-.7.3-1.4.6-2 .3-.6.5-1.3.7-1.9.5-1.3 1-2.6 1.6-3.8 2.3-5.1 4.9-9.9 8.1-14.4 3.2-4.5 6.7-8.7 10.7-12.3 4-3.7 8.7-6.7 13.7-8.7 5-2.1 10.4-3.4 15.8-4 5.4-.7 10.8-.8 16.2-.7 5.4.1 10.8.4 16.2 1.1 5.4.7 10.8 1.9 16 3.8 2.6 1 5.1 2.1 7.5 3.5 2.4 1.4 4.7 3.1 6.8 5.1 2.1 1.9 3.9 4.2 5.4 6.6 1.5 2.4 2.6 5 3.6 7.7.9 2.6 1.6 5.3 2.2 8s1 5.3 1.6 7.8c.3 1.2.7 2.4 1.1 3.6.5 1.2 1 2.5 1.4 3.8.9 2.5 1.9 5.1 2.8 7.6 3.5 10.2 6.6 20.6 8.5 31.2.9 5.3 1.6 10.7 1.7 16.1.1 5.4-.4 10.8-1.9 16-.4 1.3-.8 2.6-1.3 3.8-.5 1.2-1.2 2.4-1.6 3.7-.2.7-.4 1.3-.7 1.9-.3.6-.7 1.2-1.1 1.8-.7 1.1-1.6 2.3-2.5 3.3-3.5 4.2-8 7.6-12.8 10.2s-10 4.6-15.2 6.1c-5.3 1.5-10.5 2.7-15.9 3.7s-10.7 1.7-16 2.4l-8.1.9-4 .4c-1.3.1-2.7.2-4.1.3-11 .6-22-1-32.5-3.9-5.3-1.5-10.4-3.3-15.4-5.5s-9.9-4.7-14.5-7.7c-2.3-1.5-4.6-3.2-6.7-5.1-.5-.5-1.1-1-1.6-1.5s-.9-1.1-1.4-1.6c-.9-1.1-1.8-2.2-2.6-3.3-3.1-4.6-5.6-10-6.4-15.6-.9-5.7-.1-11.5 1.5-16.8 1.6-5.4 4.1-10.3 6.7-15.1 2.7-4.7 5.6-9.3 8.4-13.8 1.4-2.3 2.7-4.6 3.9-6.9 1.1-3 2.1-5.3 2.6-7.7zm4 .9c-.7 2.8-1.9 5.4-3.2 7.9s-2.7 4.8-4.1 7.1c-2.8 4.6-5.7 9.1-8.2 13.7s-4.8 9.4-6.2 14.3c-1.4 4.9-2 10-1.2 15 .8 4.9 2.9 9.6 5.9 13.7.7 1 1.6 2 2.4 3 .4.5.9 1 1.3 1.4.4.5.9.9 1.3 1.3 1.8 1.7 3.9 3.2 6.1 4.7 4.4 2.8 9 5.3 13.9 7.4 4.8 2.1 9.8 3.9 14.9 5.3s10.2 2.5 15.4 3.2c5.2.7 10.4.9 15.6.7l3.9-.3 4-.4c2.6-.2 5.3-.5 8-.8 5.3-.5 10.6-1.2 15.8-2.1 5.3-.9 10.4-1.9 15.5-3.3s10.1-3 14.9-5.1c4.7-2.2 9.3-4.9 13-8.6.9-.9 1.8-1.9 2.6-2.9.4-.5.8-1.1 1.2-1.6.4-.5.9-1 1.3-1.6.9-1.1 1.3-2.3 1.9-3.5.5-1.2.9-2.5 1.2-3.8 1.3-5.2 1.6-10.6 1.3-15.9-.4-5.3-1.3-10.6-2.6-15.8-2.5-10.4-6.2-20.4-10.1-30.3-1-2.5-2-5-3-7.4l-1.6-3.7c-.5-1.3-1-2.7-1.4-4-.7-2.7-1.2-5.3-1.8-7.9-.5-2.6-1.2-5.1-2-7.5-1.7-4.9-4.2-9.3-7.9-12.8-3.6-3.5-8.1-6.2-12.9-8.2-4.8-2-10-3.3-15.2-4.2-5.2-.9-10.5-1.4-15.8-1.7-5.3-.2-10.7-.3-16 .3-5.3.6-10.5 1.7-15.4 3.8-4.9 2-9.4 4.9-13.2 8.5-3.9 3.6-7 8-9.3 12.6-2.4 4.7-4.1 9.7-5.6 14.7-.4 1.2-.7 2.5-1 3.8-.2.6-.3 1.3-.5 1.9-.1.3-.1.7-.2 1-.1.3-.2.6-.4.9-.5 1.2-1.1 2.4-1.7 3.6-.2 1.1-.6 2.3-.9 3.6z\"></path><path fill=\"#FFF8EE\" d=\"M62.9 104.1c-4.2 18.6-40.9 48-13 78.1 9.5 10.2 40.3 25.9 71.2 23 80.4-7.6 100.7-27 66.8-110.2-5.5-13.5.7-44.7-58.4-46.5-24.8-.7-54.6 2.7-66.6 55.6\"></path><path fill=\"#E5BFA1\" d=\"M76.8 67.7c2.6-4 6-7.3 9.8-10C90.4 55 94.7 53 99 51.4c8.8-3.2 18-4.4 27.2-4.7 9.2-.2 18.5.5 27.5 2.8 4.5 1.2 8.9 2.8 13.1 5.1s8.1 5.1 11.4 8.6c3.3 3.5 6 7.4 8.1 11.7 2.1 4.3 3.6 8.8 4.7 13.3 1.1 4.6 1.8 9.1 2.4 13.6.3 2.3.6 4.5 1.1 6.6.2 1.1.5 2.1.8 2.9l.3.6.1.1.1.1.2.4.9 1.5c4.4 8.1 7.7 17 8.9 26.3.6 4.6.7 9.3.2 14-.5 4.6-1.7 9.2-3.5 13.5-.9 2.1-1.9 4.2-3.1 6.3l-.9 1.5c-.3.5-.6.9-1 1.5-.1.1-.1.2-.2.3-.3-.2.4.7-1.6 0-.5-.9-.2-.7-.3-.9 0-.3.1-.4.1-.6l.3-.9.5-1.6c1.4-4.3 2.6-8.6 3.1-13.1.2-2.2.3-4.4 0-6.7-.3-2.2-.9-4.3-2-6.1-.3-.5-.6-.9-1-1.3s-.7-.8-1.1-1.2c-.8-.8-1.6-1.5-2.5-2.2-1.8-1.4-3.7-2.5-5.7-3.5-4.1-1.8-8.6-2.5-13-2.3-4.5.2-8.9 1.1-13.2 2.3-2.2.6-4.3 1.3-6.5 2-1.1.4-2.2.7-3.3 1-.6.2-1.1.3-1.8.4-.6.1-1.1.2-1.7.2-4.6.5-9.1.8-13.8.7-4.6-.1-9.2-.6-13.8-1.6-4.5-1-9-2.5-13.2-4.4-4.2-2-8.2-4.4-11.8-7.4-3.6-3-6.8-6.4-9.6-10.1-5.6-7.5-9.3-16.2-11.1-25.3-.9-4.6-1.3-9.2-1.1-13.9.1-2.3.4-4.7.9-7 .6-1.8 1.4-4.1 2.7-6.2zm2 1.3c-1.1 1.8-1.8 3.8-2.3 6-.5 2.1-.7 4.3-.9 6.5-.2 4.4.3 8.9 1.2 13.2 1.9 8.7 5.6 17 11 24 2.7 3.5 5.8 6.7 9.2 9.5 3.4 2.8 7.2 5.2 11.2 7.1 4 1.9 8.2 3.3 12.6 4.3 4.3 1 8.8 1.6 13.2 1.7 4.5.2 8.9 0 13.4-.5l1.7-.2c.5-.1 1-.2 1.6-.3 1.1-.3 2.1-.6 3.2-.9 2.2-.6 4.4-1.3 6.6-1.8 4.4-1.1 9-1.9 13.7-1.9 4.6 0 9.3.8 13.5 2.8 2.1 1 4.1 2.2 5.9 3.6.9.7 1.8 1.5 2.6 2.3l1.2 1.2c.4.4.8.9 1.1 1.4 1.3 2 2 4.3 2.3 6.7s.3 4.7.1 7c-.4 4.6-1.4 9.1-2.7 13.5l-.5 1.6-.2.8c0 .1-.1.3 0 .3-.1-.1.2.2-.2-.7-1.9-.7-1.2.2-1.4-.1.2-.4.5-.9.8-1.4.3-.5.5-1 .8-1.5 1-2 1.9-4 2.7-6.1 3-8.3 3.6-17.4 2.1-26.1-.7-4.4-2-8.6-3.6-12.7s-3.5-8.1-5.7-12l-.8-1.4-.2-.4-.1-.2-.1-.2c-.2-.3-.3-.6-.4-.9-.5-1.2-.8-2.5-1.1-3.6-.5-2.3-.9-4.6-1.2-6.8-.7-4.5-1.3-8.9-2.4-13.2-1-4.3-2.4-8.5-4.3-12.4-1.9-3.9-4.2-7.5-7.2-10.7-5.8-6.3-13.8-10.5-22.3-13s-17.5-3.3-26.5-3.3c-8.9 0-17.9 1.1-26.3 3.9-4.2 1.4-8.2 3.3-11.9 5.8-3.8 2.4-7 5.4-9.4 9.1z\"></path><path fill=\"#895B2E\" d=\"M75.6 67.2c1.5-2.4 3.3-4.3 5.1-6.1 1.9-1.8 3.9-3.3 6-4.7 4.2-2.8 8.7-5 13.4-6.7 9.4-3.3 19.3-4.6 29.1-4.4 9.7.3 19.5 1.5 28.9 4.9 4.7 1.7 9.2 3.9 13.3 6.9 4.1 2.9 7.7 6.5 10.7 10.6 2.9 4.1 5.1 8.6 6.8 13.3 1.6 4.7 2.7 9.5 3.5 14.2.4 2.4.7 4.7 1.1 7.1.4 2.3.7 4.7 1.1 6.8.2 1.1.5 2.1.9 2.9l.1.2.1.2.2.4.4.8.9 1.6c1.1 2.1 2.2 4.3 3.2 6.5 1.9 4.4 3.5 9.1 4.6 13.9 1.1 4.7 1.6 9.6 1.6 14.5-.1 9.8-2.8 19.5-7.9 27.8-.4.6-1.2.9-1.8.5-.6-.4-.8-1.1-.6-1.6 1.4-3.6 2.9-7 4-10.5 1.2-3.5 2-7.1 2-10.6s-.9-6.9-3-9.6c-.1-.2-.3-.4-.4-.5l-.2-.2-.2-.3-.9-.9c-.6-.6-1.3-1.2-2-1.7-1.4-1.1-3-2.1-4.5-3.1-6.3-3.9-13-7.3-19.8-10.7-6.8-3.3-13.7-6.5-20.5-9.6-13.8-6.3-27.6-12.6-41.2-19.4-6.8-3.5-13.5-7-20.1-11.2-3.5-2.5-6.7-4.7-9.8-7.5-1.5-1.4-3-3-4.2-5.2-.6-1.1-1.1-2.4-1.2-4 0-.8 0-1.6.2-2.4.1-.4.2-.8.4-1.2.1-.3.4-.9.5-1h.2zm5.6 3.4c-.2.3-.1.2-.2.3 0 .1 0 .1-.1.2v.4c0 .3.2.8.4 1.4.6 1.2 1.7 2.5 2.9 3.6 2.5 2.4 5.4 4.6 8.5 6.6 6.1 4.1 12.7 7.7 19.4 11.3 13.3 7 27 13.5 40.6 20.1 6.8 3.3 13.6 6.7 20.4 10.1 6.8 3.5 13.5 7 20 11.3 1.6 1.1 3.2 2.2 4.7 3.5.8.6 1.5 1.3 2.3 2 .4.4.7.7 1.1 1.2l.2.3.3.3c.2.2.3.4.5.6 1.2 1.7 2.1 3.6 2.7 5.6s.7 4.1.7 6.1c-.1 4-1.2 7.9-2.5 11.6-1.3 3.7-2.9 7.1-4.4 10.6l-2.4-1.2c4.7-8 6.9-17.2 6.8-26.4-.2-9.2-2.6-18.3-6.5-26.7-1-2.1-2-4.2-3.2-6.2l-1.8-3.2c-.7-1.3-1-2.6-1.3-3.8-.6-2.5-1-4.8-1.4-7.2s-.8-4.7-1.2-6.9c-.9-4.6-2-9-3.6-13.3-1.6-4.2-3.7-8.3-6.3-11.8-2.6-3.6-5.9-6.7-9.5-9.2-3.7-2.5-7.7-4.5-12-5.9-8.6-2.9-17.8-3.9-27-4-4.6 0-9.1.2-13.6 1-4.5.7-8.9 1.8-13.1 3.3s-8.3 3.4-12 5.8c-1.9 1.2-3.6 2.5-5.2 4s-3.1 3-4.2 4.6z\"></path><path fill=\"#BA8449\" d=\"M77.8 68.3c-11 17 2.1 82.3 71.2 73.5 7.3-.9 31.6-13.9 48 4.3 8.9 10-3.1 35.3 0 30 3.5-5.8 16.9-28.2-3.2-62.7-6.4-11.1 4.2-64.4-65-65.1-26.5-.1-43.7 8.7-51 20\"></path><defs><path id=\"y\" d=\"M61.7 64.6H179v111.9H61.7z\"></path></defs><clipPath id=\"z\"><use xlink:href=\"#y\" overflow=\"visible\"></use></clipPath><g opacity=\".15\" clip-path=\"url(#z)\"><path fill=\"#E3AB5E\" d=\"M75.968 72.433c19.9-12.8 80.1-11.9 99.3 18.8 12.8 20.4-10.6 70.8-19.3 77.2-8.6 6.4-20.6 12-52.2 4.4-26.8-6.4 13.5-31.3-17.9-34.9-28.7-3.3-31.6-51.5-9.9-65.5\"></path></g><defs><path id=\"A\" d=\"M118.5 119.2h13.1v5.5h-13.1z\"></path></defs><clipPath id=\"B\"><use xlink:href=\"#A\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#B)\"><path fill=\"#E3AB5E\" d=\"M131.6 121.966c0 1.5-2.9 2.8-6.5 2.8s-6.5-1.2-6.5-2.8c0-1.5 2.9-2.8 6.5-2.8 3.6.1 6.5 1.3 6.5 2.8\"></path></g><path fill=\"#F8A38F\" d=\"M120.1 113.8c1.5-1 9.5-.7 10.5.4 1 1 3.2 5.2.7 7-.9.6-.9-1.9-2.9-1.5-2.4.5-1.1 3.6-3 3.6-2.9-.1-.1-3.4-2.6-3.8-1.9-.4-2.3 1.5-3.2 1.3-2.9-.6-1.6-5.6.5-7\"></path><defs><path id=\"C\" d=\"M117.9 113.2h14.5v9.9h-14.5z\"></path></defs><clipPath id=\"D\"><use xlink:href=\"#C\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#D)\"><path fill=\"#F8A38F\" d=\"M124.42 113.205c-1.9 0-3.7.2-4.3.6-2.1 1.4-3.4 6.4-.6 6.9h.1c.7 0 1.1-1.4 2.6-1.4h.5c2.5.4-.2 3.8 2.6 3.8 1.8 0 .5-3 3-3.5h.4c1.4 0 1.6 1.6 2.2 1.6.1 0 .2 0 .3-.1 2.6-1.8.4-6-.7-7-.5-.5-3.4-.9-6.1-.9m0 .7c3 0 5.3.4 5.7.7.6.6 1.8 2.8 1.6 4.4-.1.6-.3 1.1-.7 1.4 0-.1-.1-.1-.2-.2-.4-.5-1-1.3-2.1-1.3-.2 0-.4 0-.5.1-1.7.4-2 1.7-2.3 2.6-.2.9-.3.9-.6.9-.8 0-.8-.2-.8-1.1 0-.9 0-2.3-1.8-2.6h-.6c-1.1 0-1.8.7-2.3 1.1-.1.1-.3.3-.4.3-.4-.1-.8-.3-1-1.1-.3-1.4.7-3.8 1.8-4.6.6-.4 2-.6 4.2-.6\"></path></g><defs><path id=\"E\" d=\"M74.1 124.9H187V189H74.1z\"></path></defs><clipPath id=\"F\"><use xlink:href=\"#E\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#F)\"><path fill=\"#F7E8D0\" d=\"M186.799 140.05c3 19.2-21 43.3-53.3 48.3-32.3 4.9-56.1-23.9-59.1-43.2-3-19.2 16.8-11.9 49.1-16.8s60.3-7.5 63.3 11.7\"></path></g><defs><path id=\"G\" d=\"M80 125.9h93.6v47.5H80z\"></path></defs><clipPath id=\"H\"><use xlink:href=\"#G\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#H)\"><path fill=\"#D8CAB2\" d=\"M102.515 169.277c-.9-1.4-1.4-3.1-1.9-4.7l-1.5-4.8c-1-3.2-2.1-6.4-3.6-9.4s-3.4-5.8-5.8-7.9c-2.4-2.1-5.3-3.5-8.4-4.1-1.1-.4-1.6-1.5-1.2-2.5.4-1 1.4-1.5 2.3-1.3 7.2 1.7 14.7 2.5 22.1 2.6s15-.3 22.5-1.2c7.5-.9 14.9-2.2 22.2-3.9 7.3-1.7 14.6-3.7 21.7-6.1 1.1-.4 2.2.2 2.5 1.2.3.8 0 1.6-.6 2.1-.2.2-.6.5-.9.8-.3.3-.6.7-.9 1-.6.7-1.2 1.5-1.8 2.3-1.2 1.6-2.3 3.2-3.3 4.9-2.2 3.3-4.2 6.7-6.1 10.2-1.9 3.5-3.8 7-5.5 10.5-.9 1.8-1.7 3.6-2.4 5.4-.4.9-.7 1.8-1.1 2.8-.2.5-.3.9-.4 1.4v.2c0 .1 0 .1-.1.2 0 .1-.1.2-.2.2-.1.1-.2.2-.4.3-.2.2-.5.3-.7.4-1.9.8-3.9 1.2-5.8 1.6-1.9.4-3.9.7-5.9.9-4 .5-7.9.9-11.9 1-4 .2-8 .2-11.9-.2-2-.2-4-.5-5.9-1-1-.3-1.9-.6-2.8-1.1-.9-.4-1.7-1-2.3-1.8m.1-.1c.5.8 1.4 1.4 2.3 1.8.9.4 1.8.7 2.8 1 1.9.5 3.9.8 5.9.9 4 .3 7.9.3 11.9.1 4-.2 7.9-.7 11.8-1.2 1.9-.3 3.9-.6 5.8-1.1s3.9-.9 5.6-1.7c.2-.1.4-.2.6-.4.2-.1.3-.2.3-.3.1-.5.2-1 .4-1.5.3-1 .6-1.9.9-2.9.7-1.9 1.4-3.7 2.2-5.6 1.6-3.7 3.2-7.3 4.9-10.9 1.7-3.6 3.5-7.2 5.4-10.7.9-1.8 1.9-3.5 3-5.3.5-.9 1.1-1.8 1.7-2.6.3-.4.6-.9.9-1.3.4-.4.7-.9 1.2-1.3l1.9 3.4c-7.3 2.5-14.6 4.5-22.1 6.2-7.5 1.7-15 3.1-22.6 4-7.6.9-15.3 1.4-23 1.2s-15.4-1.1-23-2.9l1.1-4c3.3 2 6.3 3.9 8.6 6.6 2.3 2.7 3.9 5.8 5.2 9 1.2 3.2 2.2 6.5 3 9.7.4 1.6.9 3.3 1.3 4.9.6 1.9 1.1 3.5 2 4.9\"></path></g><defs><path id=\"I\" d=\"M81 126.9h91.6v46.5H81z\"></path></defs><clipPath id=\"J\"><use xlink:href=\"#I\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#J)\"><path fill=\"#D8CAB2\" d=\"M102.532 169.288c-.9-1.4-1.4-3-1.9-4.6-.5-1.6-.9-3.2-1.4-4.8-1-3.2-2-6.4-3.5-9.5-1.4-3-3.3-5.8-5.6-8-2.4-2.3-5.3-3.9-8.4-4.6v-.1c-.5-.2-.8-.8-.6-1.3.2-.5.7-.8 1.2-.7 7.3 1.7 14.8 2.5 22.4 2.6s15.1-.3 22.6-1.2c7.5-.9 14.9-2.3 22.3-3.9 7.4-1.7 14.7-3.7 21.8-6.1.5-.2 1.1.1 1.3.6.1.4 0 .8-.3 1.1-.6.5-1.3 1.3-1.9 2-.6.7-1.2 1.6-1.8 2.3-1.1 1.6-2.2 3.3-3.2 5-2.1 3.3-4.1 6.8-6 10.3-1.9 3.5-3.7 7-5.3 10.6l-2.4 5.4c-.4.9-.7 1.8-1 2.8-.2.5-.3.9-.4 1.4-.1.4-.4.5-.6.7-.2.2-.5.3-.7.4-1.9.8-3.9 1.2-5.8 1.6-1.9.4-3.9.7-5.9 1-3.9.5-7.9.9-11.9 1.1-4 .2-8 .2-11.9-.2-2-.2-4-.5-5.9-1-1-.3-1.9-.6-2.8-1-1-.5-1.9-1.1-2.4-1.9m0-.1c.5.8 1.4 1.4 2.3 1.9.9.4 1.8.7 2.8 1 1.9.5 3.9.8 5.9.9 4 .4 7.9.3 11.9.1 4-.2 7.9-.6 11.9-1.2 1.9-.3 3.9-.6 5.9-1.1 1.9-.4 3.9-.9 5.6-1.7.2-.1.4-.2.6-.4.2-.1.4-.3.4-.4.1-.5.2-1 .4-1.5.3-1 .6-1.9 1-2.8.7-1.9 1.5-3.7 2.3-5.5 1.6-3.7 3.3-7.2 5.1-10.8 1.8-3.6 3.6-7.1 5.6-10.6 1-1.8 2-3.5 3.1-5.1.5-.9 1.1-1.7 1.7-2.5.6-.8 1.2-1.6 2.1-2.4l1 1.8c-7.2 2.5-14.6 4.5-22 6.2s-14.9 3-22.5 4c-7.6.9-15.2 1.4-22.9 1.2-7.6-.2-15.3-1-22.8-2.7l.5-1.9c3.3 1.3 6.3 3.3 8.6 5.9 2.3 2.6 4 5.6 5.3 8.7 1.3 3.1 2.3 6.3 3.2 9.6.4 1.6.9 3.2 1.4 4.9.2 1.4.7 3 1.6 4.4\"></path></g><path fill=\"#333\" d=\"M102.6 169.2c5.1 8 46.8 2.5 47.5-.7 1.8-8.1 16.8-36.7 21.6-40.7-8.6 3-53.3 17.3-89.6 8.6 16.3 5.5 16.5 26.6 20.5 32.8\"></path><g><defs><path id=\"K\" d=\"M82 127.9h89.6v45.4H82z\"></path></defs><clipPath id=\"L\"><use xlink:href=\"#K\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#L)\"><path fill=\"#333\" d=\"M171.55 127.95c-6.7 2.3-34.9 11.4-64.1 11.4-8.6 0-17.2-.8-25.5-2.7 16.4 5.3 16.6 26.5 20.6 32.7 1.9 3 9.2 4.1 17.5 4.1 13.4 0 29.5-2.8 30-4.8 1.8-8.2 16.7-36.8 21.5-40.7m-5.6 3.9c-6.5 9.8-15.9 28.7-17.8 35.8-2.5 1.4-15.4 3.8-28.1 3.8-10.2 0-14.8-1.7-15.8-3.2-1-1.5-1.8-4.3-2.6-7.5-1.7-6.1-4.1-14.5-9.8-20.3 5 .6 10.2.9 15.7.9 23.8-.1 47.1-6.1 58.4-9.5\"></path></g></g><path fill=\"#FCD4C3\" d=\"M119.7 173.4c-8.6 0-14.2-1.2-16.4-3.6-.2-.2-.2-1.4.8-3.7 2.4-5.5 9.8-14.9 22.6-15.7.9 0 1.7-.1 2.5-.1 15 0 24 7.6 24 8.9-.2.4-.4 1-.7 1.8-.8 1.9-2 4.9-3.1 8.1-1.3 1.3-16.3 4.3-29.7 4.3\"></path><path fill=\"#F8A38F\" d=\"M129.2 149.8c-.9 0-1.7 0-2.6.1-17.5 1.1-25.6 18.4-23.8 20.5 2.6 2.8 9.3 3.8 16.9 3.8 13.5 0 29.8-3.1 30.3-4.6 1.5-4.5 3.2-8.2 3.9-10 .6-1.8-9.5-9.9-24.7-9.8m0 1.3c13.4 0 22.4 6.4 23.3 8.3-.2.4-.4.9-.6 1.5-.8 1.9-2 4.7-3.1 7.9-2.1 1.2-16.1 3.9-29.1 3.9-8.1 0-13.7-1.2-15.8-3.3-.1-.7.6-3.5 3.1-7 2.2-3.2 8.6-10.7 19.7-11.3h2.5\"></path><g><defs><path id=\"M\" d=\"M103.1 149.4h50.2v20.7h-50.2z\"></path></defs><clipPath id=\"N\"><use xlink:href=\"#M\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#N)\"><path fill=\"#FCD4C3\" d=\"M103.084 169.317c-1.2 5.4 31.9-21.1 49.7-8.4 3.7-4.9-16-13.2-27.5-11.3-9.7 1.7-19.7 7.9-22.2 19.7\"></path></g></g><path fill=\"#FFF7E3\" d=\"M109.8 140.8c1.7 3 4.8 17.6 6.1 17.9s9.5 2.6 10.6 2.1c1.2-.5 1.1-3.3 2.3-2.5 1 .7 1.5 2 2.5 1.5 1.8-.9 7.1-4.2 8-5.6.8-1.5.7-9.8 0-16.4-3.4 1.6-23.5 3.7-29.5 3\"></path><g><defs><path id=\"O\" d=\"M109.8 137.9h30.1v23.2h-30.1z\"></path></defs><clipPath id=\"P\"><use xlink:href=\"#O\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#P)\"><path fill=\"#FFDC99\" d=\"M139.35 137.85c-3 1.3-18.7 3.1-26.6 3.1-1.2 0-2.1 0-2.9-.1 1.7 3 4.8 17.6 6.1 17.9 1.2.3 8 2.2 10.1 2.2.2 0 .4 0 .5-.1 1-.4 1.1-2.6 1.9-2.6.1 0 .3 0 .4.2.9.5 1.3 1.6 2.1 1.6.1 0 .3 0 .4-.1 1.8-.9 7.1-4.2 8-5.6.9-1.5.7-9.8 0-16.5m-.5.9c.6 6.8.6 14 0 15.2-.7 1.2-5.5 4.3-7.7 5.4h-.1c-.2 0-.5-.3-.7-.6-.3-.3-.6-.6-1-.9-.3-.2-.5-.3-.8-.3-.9 0-1.2.9-1.5 1.6-.2.4-.4 1-.7 1.1h-.3c-1.7 0-6.8-1.4-8.9-1.9-.4-.1-.7-.2-.9-.2-.6-.7-1.9-5.4-2.9-8.8-.9-3.1-1.7-6-2.4-7.7h1.9c7.5 0 21.5-1.6 26-2.9\"></path></g></g><g><defs><path id=\"Q\" d=\"M109.9 137.5h29.7v10.3h-29.7z\"></path></defs><clipPath id=\"R\"><use xlink:href=\"#Q\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#R)\"><path fill=\"#EADCBE\" d=\"M112.151 147.85c-.5-5.4 24.4-7.2 27.5-6.7 0-1.3-.2-2.1-.2-3.6-4.1 2.1-26.5 4.3-29.5 3.4.3.6 1.4 3.6 2.2 6.9\"></path></g></g><g><defs><path id=\"S\" d=\"M124 143.8h5.5v14.7H124z\"></path></defs><clipPath id=\"T\"><use xlink:href=\"#S\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#T)\"><path fill=\"#FFDC99\" d=\"M124.558 143.768c.5 1.2 1 2.3 1.4 3.5l1.2 3.6 1.1 3.6 1.1 3.6-1.7.5-.8-3.7-.9-3.7-.9-3.6c-.4-1.2-.7-2.4-1.1-3.5l.6-.3z\"></path></g></g><g><defs><path id=\"U\" d=\"M39.1 51.5h39.4v35.7H39.1z\"></path></defs><clipPath id=\"V\"><use xlink:href=\"#U\" overflow=\"visible\"></use></clipPath><g opacity=\".4\" clip-path=\"url(#V)\"><path fill=\"#FCD4C3\" d=\"M40.384 59.116c13.2 3.4 11.1 26.2 18.9 28 7.9 1.8 18.2-18.8 19.2-23.3-15.2-6.5-22.3-14.1-33.2-11.9-3.6.7-8.6 6.2-4.9 7.2\"></path></g></g><g><defs><path id=\"W\" d=\"M59.9 88.7h133.7v42.5H59.9z\"></path></defs><clipPath id=\"X\"><use xlink:href=\"#W\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#X)\"><path fill=\"#E3AB5E\" d=\"M76.967 125.833c16.6 1.3 30.3 2 35.2-3.1s6.7-27.7 14.7-27.1c6.8.5 9.1 29.9 13.5 30.7 4.4.9 35.5 9.4 43.3 1.4 7.7-8 11.3-13 9.5-17.8-1.8-4.8-47.3-20.3-56.6-21.2-9.3-.9-72.1 7-73.7 10.9-1.6 4-3.3 3.4-3 7.6.6 8.1.5 17.3 17.1 18.6\"></path></g></g><path fill=\"#333\" d=\"M123.5 92.4c1.2 0 5.9-.4 7 .5 6 4.7 5.8 24 12.1 30 5.6 5.4 36.2 9.3 41.5 3.2 5.3-6.1 13.1-24.7 14.9-26.1 1.8-1.3 5.8-2.3 7-4.2 1.2-1.8.2-10-2.6-9.6-2.8.4-8.1 2.1-11.4 1.2-3.3-1-19.4-11.1-59.9-5-3.9.6-7.8 0-10.5-.7S103.7 72.2 63 78c-4 .6-9.6-1.2-11.6-1-2 .2-2.6 6.5-1.8 8.1s5 3 5.5 5 4.2 21.6 13.8 29.7c10.2 8.6 36.2 2.6 38.5 1 10.3-7.3 12.6-28.4 16.1-28.4\"></path><g><defs><path id=\"Y\" d=\"M49.1 76.1h157.3v53.1H49.1z\"></path></defs><clipPath id=\"Z\"><use xlink:href=\"#Y\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#Z)\"><path fill=\"#1A1A1A\" d=\"M88.438 76.123c-7.1 0-15.6.5-25.6 2-.6.1-1.2.1-1.8.1-3.5 0-7.6-1.1-9.5-1.1h-.3c-2 .2-2.6 6.5-1.8 8.1.8 1.7 5 3 5.5 5s4.2 21.6 13.8 29.7c4 3.4 10.6 4.5 17.2 4.5 10 0 19.9-2.5 21.3-3.5 10.4-7.4 12.8-28.5 16.3-28.5.5 0 1.8-.1 3-.1 1.6 0 3.3.1 3.9.5 6 4.7 5.8 24 12.1 30 3.6 3.4 17.4 6.3 28.2 6.3 6.1 0 11.3-.9 13.2-3.1 5.3-6.1 13.1-24.7 14.9-26.1 1.8-1.4 5.8-2.3 7-4.2 1.1-1.8.2-9.6-2.5-9.6h-.2c-2.2.3-6 1.4-9.1 1.4-.8 0-1.6-.1-2.3-.3-2.6-.8-12.7-6.9-35.7-6.9-6.9 0-14.9.5-24.2 1.9-1.1.2-2.3.2-3.3.2-2.7 0-5.2-.4-7.1-.9-2-.2-11.2-5.4-33-5.4m0 2c18.1 0 27.4 3.6 30.8 5 .7.3 1.2.5 1.7.6 1.8.4 4.5 1 7.6 1 1.2 0 2.5-.1 3.6-.3 8.5-1.3 16.5-1.9 23.9-1.9 19 0 28.9 4.2 33.2 6.1.9.4 1.5.6 2 .8.9.3 1.8.4 2.9.4 2.2 0 4.6-.5 6.6-.9.9-.2 1.8-.4 2.5-.5.9 1 1.5 5.4 1 6.6-.4.6-2.1 1.4-3.3 1.9-1.2.5-2.3 1-3.1 1.6-1.1.8-2.2 2.9-5.4 9.3-3.1 6.1-6.9 13.7-9.8 17-1 1.2-4.6 2.4-11.8 2.4-10.5 0-23.9-2.8-26.9-5.7-2.8-2.6-4.2-8.7-5.6-14.6-1.6-6.6-3.1-12.8-6.6-15.6-.9-.7-2.3-1-5.1-1h-3.1c-2.8 0-4 3.3-6.1 9.3-2.3 6.6-5.6 15.5-11.3 19.6-1.3.8-10.7 3.2-20.2 3.2-7.3 0-12.8-1.4-15.9-4-3.8-3.2-9.1-10.7-12.9-27.8-.1-.4-.2-.7-.2-.9-.5-1.9-2.3-3-3.8-4-.6-.4-1.6-1.1-1.8-1.4-.4-.9 0-4.2.6-5.3.7 0 1.7.2 2.8.4 1.9.3 4.3.7 6.5.7.7 0 1.5 0 2.1-.2 8.9-1.1 17.4-1.8 25.1-1.8\"></path></g></g><g><defs><path id=\"aa\" d=\"M64.4 83.4h50.5v34.2H64.4z\"></path></defs><clipPath id=\"ab\"><use xlink:href=\"#aa\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#ab)\"><path fill=\"none\" stroke=\"#333\" stroke-width=\"4\" stroke-miterlimit=\"10\" d=\"M66.2 90.45c-.9 1.2-1.5 18.9 6 23.7 4.9 3.2 25.7 2.5 29.9.2 6.5-3.7 12.9-20.5 11.1-22.9-3-4-24.6-9.3-40.8-5.1-2 .4-5.1 2.6-6.2 4.1z\"></path></g></g><path fill=\"#FFF\" d=\"M66.2 90.4c-.9 1.2-1.5 18.9 6 23.7 4.9 3.2 25.7 2.5 29.9.2 6.5-3.7 12.9-20.5 11.1-22.9-3-4-24.6-9.3-40.8-5.1-2 .5-5.1 2.6-6.2 4.1\"></path><g><defs><path id=\"ac\" d=\"M139.8 88.1h50.1v35h-50.1z\"></path></defs><clipPath id=\"ad\"><use xlink:href=\"#ac\" overflow=\"visible\"></use></clipPath><g opacity=\".5\" clip-path=\"url(#ad)\"><path fill=\"none\" stroke=\"#333\" stroke-width=\"4\" stroke-miterlimit=\"10\" d=\"M188.394 98.163c.8 1.3-1 18.9-9 22.8-5.3 2.5-25.8-.9-29.6-3.7-6-4.5-10.2-22-8.1-24.2 3.5-3.6 25.6-6 41.1.2 1.9.7 4.7 3.3 5.6 4.9z\"></path></g></g><path fill=\"#FFF\" d=\"M188.4 98.2c.8 1.3-1 18.9-9 22.8-5.3 2.5-25.8-.9-29.6-3.7-6-4.5-10.2-22-8.1-24.2 3.5-3.6 25.6-6 41.1.2 1.9.7 4.6 3.2 5.6 4.9\"></path><path d=\"M89.9 101.2c-.5 3.9-2.5 6.8-4.4 6.5-1.9-.3-2.9-3.6-2.4-7.5s2.5-6.8 4.4-6.5c1.9.3 2.9 3.6 2.4 7.5M169.6 105.6c.4 3.9-.8 7.2-2.6 7.4-1.9.2-3.7-2.8-4.1-6.7-.4-3.9.8-7.2 2.6-7.4 1.8-.1 3.6 2.9 4.1 6.7\"></path><g><defs><path id=\"ae\" d=\"M49.1 81.6h156.3v46H49.1z\"></path></defs><clipPath id=\"af\"><use xlink:href=\"#ae\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#af)\"><path fill=\"#333\" d=\"M51.475 82.75c2.3 1.5 4.4.6 4.9 3.6s7.4 29 16 32c14.1 4.9 31.9.1 34.3-1.4 2.4-1.5 13.7-26.8 15.6-27.8 1.9-1 7.9.1 9.2.7 3.9 1.7 11.1 29.1 13 30.5 8.7 6.1 36.6 5.6 37.9 4 1.4-1.7 11.8-25.6 13.7-27 2.7-2.1 9-3.5 9.2-2.6.2.9-5.1 1.8-6.7 3.7-1.6 2-12.1 24.9-15.4 26.9-3.3 2-27.7 5.3-40.1-3.4-5.9-4.2-8.2-29.1-12.9-30.5-3-.9-5.3-.8-7.5-.2-2.9 1.9-7 23.1-15.7 28.4-3.5 2.1-30.6 7.4-38.7-1.1-15.1-15.8-10.5-29.9-15.4-31.9-3.3-1.4-4-3.2-4-4.4.3-1.3 1.4-.3 2.6.5\"></path></g></g><g><defs><path id=\"ag\" d=\"M51.6 77.2h20.2v3H51.6z\"></path></defs><clipPath id=\"ah\"><use xlink:href=\"#ag\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#ah)\"><path fill=\"#333\" d=\"M51.75 77.45c-1.6-.6 6.8 2.9 9.9 2.7 3.1-.2 8.3-2.4 10-2.9 1.5-.5-7.8 1.2-10.1 1.1s-8.9-.6-9.8-.9\"></path></g></g><g><defs><path id=\"ai\" d=\"M116.6 82.1h21.7v5.3h-21.7z\"></path></defs><clipPath id=\"aj\"><use xlink:href=\"#ai\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#aj)\"><path fill=\"#333\" d=\"M116.6 82.15c2.9 1.3 4.2 4.6 7 4.9s6.2.8 7.8-.1c1.6-.9 5.6-3 6.7-3.2 1.2-.2-8.7 1.3-12.4 1-3.7-.4-8-2.5-9.1-2.6\"></path></g></g><g><defs><path id=\"ak\" d=\"M187.4 86h12.3v3.9h-12.3z\"></path></defs><clipPath id=\"al\"><use xlink:href=\"#ak\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#al)\"><path fill=\"#333\" d=\"M187.575 85.975c-1.2-.5 4.4 4 6.1 3.8 1.7-.2 4.7-2.1 6-2.6 1-.4-4 1-5.5.7-1.5-.1-5.4-1.4-6.6-1.9\"></path></g></g><g><defs><path id=\"am\" d=\"M62.3 82.8h28.9v28.6H62.3z\"></path></defs><clipPath id=\"an\"><use xlink:href=\"#am\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#an)\"><path fill=\"#333\" d=\"M63.05 87.825c7.4-7.3 25-4.8 28.2-4.2-21.1 1.5-21.5 3.1-25.2 6.8-.5 2.9-1.2 12.5 2.1 20.9-3.7-2-7.6-21-5.1-23.5\"></path></g></g><g><defs><path id=\"ao\" d=\"M165.1 87.8h27.8v30.5h-27.8z\"></path></defs><clipPath id=\"ap\"><use xlink:href=\"#ao\" overflow=\"visible\"></use></clipPath><g opacity=\".3\" clip-path=\"url(#ap)\"><path fill=\"#333\" d=\"M192.46 95.698c-6.4-8.2-24.1-8.1-27.4-7.8 20.7 4.3 20.9 5.9 24.1 10.1.2 2.9-.4 12.5-4.7 20.4 3.8-1.6 10.1-20 8-22.7\"></path></g></g><g><defs><path id=\"aq\" d=\"M65.8 84.8h47.8v27.5H65.8z\"></path></defs><clipPath id=\"ar\"><use xlink:href=\"#aq\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#ar)\"><path fill=\"#D0DDDC\" d=\"M66.412 102.575c.7-8.6 1.5-15.6 18.6-16.1 13.7-.4 24.6 2.8 26.1 6.1 1 2.1.2 11.3-6.6 19.7 4.4-3.9 11.4-19.4 8.4-21.3-11.1-7.1-33.2-7.3-41.4-4.4-1.5.5-3.9 2.2-5.5 4-.3 2.2-.3 10.8.4 12\"></path></g></g><g><defs><path id=\"as\" d=\"M66.8 103H102v13.9H66.8z\"></path></defs><clipPath id=\"at\"><use xlink:href=\"#as\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#at)\"><path fill=\"#D0DDDC\" d=\"M66.884 103.2c2.6 16.8 33.3 11.7 35.1 11-.1.9-16.1 5.4-29.5.2-5.4-2-5.8-13.1-5.6-11.2\"></path></g></g><g><defs><path id=\"au\" d=\"M141.2 89.5h47.7V115h-47.7z\"></path></defs><clipPath id=\"av\"><use xlink:href=\"#au\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#av)\"><path fill=\"#D0DDDC\" d=\"M186.957 110.087c.4-8.7.4-15.6-16.4-18.2-13.5-2.1-24.7-.3-26.7 2.8-1.2 1.9-1.6 11.2 4.2 20.4-3.9-4.5-9-20.6-5.7-22.2 11.9-5.7 33.9-3.2 41.6.7 1.4.7 3.7 2.6 5 4.7-.1 2.1-1.1 10.7-2 11.8\"></path></g></g><g><defs><path id=\"aw\" d=\"M150.2 110.4h36.3v11.7h-36.3z\"></path></defs><clipPath id=\"ax\"><use xlink:href=\"#aw\" overflow=\"visible\"></use></clipPath><g clip-path=\"url(#ax)\"><path fill=\"#D0DDDC\" d=\"M186.383 110.613c-4.6 16.3-34.5 7.5-36.2 6.6 0 .9 15.3 7.3 29.3 3.9 5.6-1.4 7.5-12.4 6.9-10.5\"></path></g></g><g><defs><path id=\"ay\" d=\"M87.3 95.2h2v2h-2z\"></path></defs><clipPath id=\"az\"><use xlink:href=\"#ay\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#az)\"><path fill=\"#FFF\" d=\"M89.375 96.2c0-.5-.4-1-1-1s-1 .4-1 1 .4 1 1 1 1-.4 1-1\"></path></g></g><g><defs><path id=\"aA\" d=\"M166.3 99.9h2v2h-2z\"></path></defs><clipPath id=\"aB\"><use xlink:href=\"#aA\" overflow=\"visible\"></use></clipPath><g opacity=\".25\" clip-path=\"url(#aB)\"><path fill=\"#FFF\" d=\"M168.375 100.9c0-.5-.4-1-1-1-.5 0-1 .4-1 1s.4 1 1 1c.5 0 1-.5 1-1\"></path></g></g><g><defs><path id=\"aC\" d=\"M52 79.1h64.8v9.5H52z\"></path></defs><clipPath id=\"aD\"><use xlink:href=\"#aC\" overflow=\"visible\"></use></clipPath><g opacity=\".1\" clip-path=\"url(#aD)\"><path fill=\"#D0DDDC\" d=\"M52.025 81.675c2.4 2.7 3.9 3 7.1 2.6 31.1-4 48.3-3.9 56.8 4 1.8 1.7.8-5.1-2.6-6-26.2-6.9-45.2-.7-49.2-.2-4.1.6-7-.3-12.1-.4\"></path></g></g><g><defs><path id=\"aE\" d=\"M137.7 82.3h47.9v9.2h-47.9z\"></path></defs><clipPath id=\"aF\"><use xlink:href=\"#aE\" overflow=\"visible\"></use></clipPath><g opacity=\".1\" clip-path=\"url(#aF)\"><path fill=\"#D0DDDC\" d=\"M138.025 85.675c-.7.7-.4 7.9 3 5.2 9.8-7.8 30.3-6 44.6-1.2-2.3-4.5-19-7.6-28.4-7.5-4.5.2-17.3 1.5-19.2 3.5\"></path></g></g><path fill=\"#D0DDDC\" d=\"M197.2 91.4c0 .3-1.6.5-3.5.5s-3.5-.2-3.5-.5 1.6-.5 3.5-.5c2 0 3.5.3 3.5.5M62.4 82.8c0 .3-1.6.3-3.5 0s-3.4-.8-3.3-1.1 1.6-.3 3.5 0c1.9.2 3.4.7 3.3 1.1\"></path><g><path fill=\"#FFF\" d=\"M256.04 243.036c-.6-6.1-5.1-8.8-9.2-8.8-1.9 0-3.4.5-4 .8l-.8.4-.7.5c-1 .7-2.7 1.8-4.2 2.3-.1-1.2 0-2.8.2-4.2v-.2c1.1-10.7-1.1-17-6.7-18.6-.9-.3-1.9-.4-2.9-.4-3.4 0-6.4 1.6-8.3 3-1.6-2.1-4.4-3.2-7.8-3.2-5.1 0-9.2 2.4-10.7 6.2-.2.4-.4 1-.6 1.8-3-6.6-9.1-9.1-14.8-9.1-5.4 0-10.6 2.1-12.5 3.6-.1.1-.2.1-.3.2-5.1 3.6-9.1 8.2-11.9 13.7-1.4-4.7-4.4-9.2-9.7-12.5l-.1-.1c-.2-.1-.3-.2-.4-.2 5.3-9.3 9.9-21.7 7.1-33.5-3-12.6-10.4-14.4-14.5-14.4-1.7 0-3.5.3-5.3.9h-.2c-7.8 3.1-11.2 7.7-12 8.8-.8 1.2-9.3 14.2-11.4 33.2-.2 2.1-.5 4.3-.7 6.5-1.2-1.7-3.2-3.3-6.3-4.2-1-.3-2-.4-3-.4-4.3 0-7.8 2.6-9.7 4.4-1.6-2.4-4.2-3.9-7.1-4h-.7c-4.6 0-8.2 2-10.9 4.3-1.7-3-4.9-4.9-8.6-4.9h-1.5c-5.1 0-9.1 2.4-10.7 6.4-.1.3-.3.7-.4 1.2-4-5-9.1-7.3-16-7.3h-.7c-4.3.1-14.9 1.9-21.5 16.6-1 2.3-1.8 4.6-2.4 6.8-1.4-.7-2.8-.8-3.7-.8-3.4 0-6 1.9-7.2 3.8-1 1.5-4.2 6.7-2.6 11.9.9 2.8 2.8 4.9 5.6 6 2.5 1 5.6 1.9 7.9 2.6 1.4 3.3 4 7 8.6 10.5 3.2 2.5 7.4 3.7 12.2 3.7 8.2 0 16.1-3.5 16.9-3.9l.3-.2.1-.1c1.6 1.6 3.6 2.8 6.2 3.3.8.2 1.8.3 3 .3 4.4 0 7.5-2.3 10.4-6.5 2.3 3.7 6.6 5.7 11.6 5.7.3 0 .5.2.9.2 2.6 0 6-.9 8.7-5.4 2.3 4.1 6.5 6.5 11.5 6.5 4.4 0 8.3-1.8 9-2.2l.2-.1c1.5-.8 2.7-1.5 3.7-2 3.3 1.8 8.3 3.7 14.5 3.7 1.1 0 2.1 0 3.2-.2h.6c13-2.6 21.5-5.7 26.6-8.1 3.5 4 9.2 7.8 17.2 8.4.9.1 1.8.1 2.7.1 6.6 0 11.9-1.9 15.8-3.9 1.2 1.3 2.8 2.5 4.8 3.3 1.2.5 2.5.7 3.7.7 8.1 0 11.9-9.6 12.9-12.9l1.9-5.2c1.7 1.8 3.9 3.3 6.7 4.1 1.5.4 3.2.7 4.8.7 8.9 0 17.5-6.3 18.8-7.4 2.3-2.3 4.9-6.5 4.4-12.2\"></path></g><g><path fill=\"#E24B31\" d=\"M174.35 245.713s-1.1-4 3.1-11.6 7.4-3.5 7.4-3.5 3.6 3.9-.5 9.7c-4.1 5.8-10 5.4-10 5.4m-32.1 5.5c-4.8 12.5-16.4 7.4-16.4 7.4s-1.3-4.5 2.5-17 12.6-7.6 12.6-7.6 6.1 4.7 1.3 17.2m-8.7-52.5s7.2-18.9 9-9.7c1.8 9.2-15.2 36.5-15.2 36.5.2-6.1 6.2-26.8 6.2-26.8m-103.5 47c.3-12.1 8.2-17.4 11-14.8 2.8 2.6 1.8 8.4-3.5 11.9-5.1 3.6-7.5 2.9-7.5 2.9m219.3-2c-.4-4.1-4.1-2.6-4.1-2.6s-5.9 4.6-11.1 4.1c-5.2-.5-3.5-12.1-3.5-12.1s1.1-10.7-1.9-11.6c-3.1-.9-6.8 2.8-6.8 2.8s-4.7 5.2-6.9 11.8l-.6.2s.7-11.6-.1-14.3c-.6-1.3-6.2-1.2-7.1 1.1-.9 2.3-5.4 18.6-5.7 25.5 0 0-8.8 7.4-16.4 8.7-7.7 1.2-9.5-3.6-9.5-3.6s20.8-5.8 20.1-22.4c-.7-16.6-16.8-10.5-18.6-9.1-1.8 1.3-11.1 7-13.9 22.6-.1.5-.3 2.9-.3 2.9s-8.1 5.4-12.5 6.8c0 0 12.5-21.1-2.8-30.7-6.9-4.2-12.5 4.6-12.5 4.6s20.7-23 16.1-42.5c-2.2-9.3-6.8-10.3-11.1-8.8-6.5 2.6-8.9 6.3-8.9 6.3s-8.4 12.1-10.3 30.2-4.8 39.8-4.8 39.8-4 3.9-7.6 4.1c-3.7.2-2-10.9-2-10.9s2.8-16.9 2.6-19.8-.4-4.4-3.8-5.4c-3.3-1-7 3.3-7 3.3s-9.7 14.7-10.5 16.9l-.5.9-.5-.6s6.8-20 .3-20.3c-6.5-.3-10.8 7.1-10.8 7.1s-7.4 12.5-7.7 13.9l-.5-.6s3.1-14.5 2.5-18.1c-.6-3.6-4-2.8-4-2.8s-4.3-.5-5.4 2.3c-1.1 2.8-5.2 21-5.7 26.8 0 0-10.7 7.7-17.7 7.7-7 .1-6.3-4.5-6.3-4.5s25.8-8.8 18.8-26.3c-3.2-4.5-6.8-5.9-12-5.8-5.2.1-11.3 3.3-15.5 12.6-2 4.5-2.8 8.7-2.8 11.9 0 0-4.8.9-7.3-1.1s-3.9 0-3.9 0-4.3 6.1-.1 7.7c4.2 1.6 10.6 3.2 10.6 3.2.6 2.6 2.3 7 7.4 10.8 7.6 5.8 22.3-.9 22.3-.9l6-3.6s.2 5.4 4.6 6.2c4.4.8 6.2-.1 13.9-18.6 4.5-9.5 4.8-9 4.8-9l.5-.1s-3.5 18.1-2.1 23 7.1 4.4 7.1 4.4 3.2 1.1 5.7-7.9c2.6-9 7.4-18.4 7.4-18.4h.6s-2.1 18.1 1.1 24c3.3 5.9 11.7 1.8 11.7 1.8s5.9-3.1 6.8-4c0 0 7 5.9 16.9 4.8 22.1-4.4 30-10.3 30-10.3s3.8 9.6 15.6 10.5c13.5 1 20.8-7.5 20.8-7.5s-.1 5.5 4.6 7.4c4.7 1.9 7.9-8.3 7.9-8.3l7.9-21.1h.7s.4 13.5 8.2 15.7c7.8 2.2 17.9-5.6 17.9-5.6s2.2-1.1 1.7-5.2\"></path></g></svg>"
-
-/***/ }),
+// shim for using process in browser
+var process = module.exports = {};
 
-/***/ 112:
-/***/ (function(module, exports, __webpack_require__) {
+// cached from whatever global is present so that test runners that stub it
+// don't break things.  But we need to wrap it in a try catch in case it is
+// wrapped in strict mode code which doesn't define any globals.  It's inside a
+// function because try/catches deoptimize in certain engines.
 
-var baseSet = __webpack_require__(113);
+var cachedSetTimeout;
+var cachedClearTimeout;
 
-/**
- * Sets the value at `path` of `object`. If a portion of `path` doesn't exist,
- * it's created. Arrays are created for missing index properties while objects
- * are created for all other missing properties. Use `_.setWith` to customize
- * `path` creation.
- *
- * **Note:** This method mutates `object`.
- *
- * @static
- * @memberOf _
- * @since 3.7.0
- * @category Object
- * @param {Object} object The object to modify.
- * @param {Array|string} path The path of the property to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns `object`.
- * @example
- *
- * var object = { 'a': [{ 'b': { 'c': 3 } }] };
- *
- * _.set(object, 'a[0].b.c', 4);
- * console.log(object.a[0].b.c);
- * // => 4
- *
- * _.set(object, ['x', '0', 'y', 'z'], 5);
- * console.log(object.x[0].y.z);
- * // => 5
- */
-function set(object, path, value) {
-  return object == null ? object : baseSet(object, path, value);
+function defaultSetTimout() {
+    throw new Error('setTimeout has not been defined');
+}
+function defaultClearTimeout () {
+    throw new Error('clearTimeout has not been defined');
 }
+(function () {
+    try {
+        if (typeof setTimeout === 'function') {
+            cachedSetTimeout = setTimeout;
+        } else {
+            cachedSetTimeout = defaultSetTimout;
+        }
+    } catch (e) {
+        cachedSetTimeout = defaultSetTimout;
+    }
+    try {
+        if (typeof clearTimeout === 'function') {
+            cachedClearTimeout = clearTimeout;
+        } else {
+            cachedClearTimeout = defaultClearTimeout;
+        }
+    } catch (e) {
+        cachedClearTimeout = defaultClearTimeout;
+    }
+} ())
+function runTimeout(fun) {
+    if (cachedSetTimeout === setTimeout) {
+        //normal enviroments in sane situations
+        return setTimeout(fun, 0);
+    }
+    // if setTimeout wasn't available but was latter defined
+    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
+        cachedSetTimeout = setTimeout;
+        return setTimeout(fun, 0);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedSetTimeout(fun, 0);
+    } catch(e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
+            return cachedSetTimeout.call(null, fun, 0);
+        } catch(e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
+            return cachedSetTimeout.call(this, fun, 0);
+        }
+    }
 
-module.exports = set;
 
+}
+function runClearTimeout(marker) {
+    if (cachedClearTimeout === clearTimeout) {
+        //normal enviroments in sane situations
+        return clearTimeout(marker);
+    }
+    // if clearTimeout wasn't available but was latter defined
+    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
+        cachedClearTimeout = clearTimeout;
+        return clearTimeout(marker);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedClearTimeout(marker);
+    } catch (e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
+            return cachedClearTimeout.call(null, marker);
+        } catch (e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
+            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
+            return cachedClearTimeout.call(this, marker);
+        }
+    }
 
-/***/ }),
 
-/***/ 113:
-/***/ (function(module, exports, __webpack_require__) {
 
-var assignValue = __webpack_require__(114),
-    castPath = __webpack_require__(69),
-    isIndex = __webpack_require__(117),
-    isObject = __webpack_require__(84),
-    toKey = __webpack_require__(111);
+}
+var queue = [];
+var draining = false;
+var currentQueue;
+var queueIndex = -1;
 
-/**
- * The base implementation of `_.set`.
- *
- * @private
- * @param {Object} object The object to modify.
- * @param {Array|string} path The path of the property to set.
- * @param {*} value The value to set.
- * @param {Function} [customizer] The function to customize path creation.
- * @returns {Object} Returns `object`.
- */
-function baseSet(object, path, value, customizer) {
-  if (!isObject(object)) {
-    return object;
-  }
-  path = castPath(path, object);
-
-  var index = -1,
-      length = path.length,
-      lastIndex = length - 1,
-      nested = object;
-
-  while (nested != null && ++index < length) {
-    var key = toKey(path[index]),
-        newValue = value;
-
-    if (index != lastIndex) {
-      var objValue = nested[key];
-      newValue = customizer ? customizer(objValue, key, nested) : undefined;
-      if (newValue === undefined) {
-        newValue = isObject(objValue)
-          ? objValue
-          : (isIndex(path[index + 1]) ? [] : {});
-      }
+function cleanUpNextTick() {
+    if (!draining || !currentQueue) {
+        return;
+    }
+    draining = false;
+    if (currentQueue.length) {
+        queue = currentQueue.concat(queue);
+    } else {
+        queueIndex = -1;
+    }
+    if (queue.length) {
+        drainQueue();
     }
-    assignValue(nested, key, newValue);
-    nested = nested[key];
-  }
-  return object;
 }
 
-module.exports = baseSet;
-
-
-/***/ }),
-
-/***/ 114:
-/***/ (function(module, exports, __webpack_require__) {
-
-var baseAssignValue = __webpack_require__(115),
-    eq = __webpack_require__(97);
-
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
+function drainQueue() {
+    if (draining) {
+        return;
+    }
+    var timeout = runTimeout(cleanUpNextTick);
+    draining = true;
 
-/**
- * Assigns `value` to `key` of `object` if the existing value is not equivalent
- * using [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
- * for equality comparisons.
- *
- * @private
- * @param {Object} object The object to modify.
- * @param {string} key The key of the property to assign.
- * @param {*} value The value to assign.
- */
-function assignValue(object, key, value) {
-  var objValue = object[key];
-  if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
-      (value === undefined && !(key in object))) {
-    baseAssignValue(object, key, value);
-  }
+    var len = queue.length;
+    while(len) {
+        currentQueue = queue;
+        queue = [];
+        while (++queueIndex < len) {
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
+        }
+        queueIndex = -1;
+        len = queue.length;
+    }
+    currentQueue = null;
+    draining = false;
+    runClearTimeout(timeout);
 }
 
-module.exports = assignValue;
-
-
-/***/ }),
-
-/***/ 115:
-/***/ (function(module, exports, __webpack_require__) {
-
-var defineProperty = __webpack_require__(116);
-
-/**
- * The base implementation of `assignValue` and `assignMergeValue` without
- * value checks.
- *
- * @private
- * @param {Object} object The object to modify.
- * @param {string} key The key of the property to assign.
- * @param {*} value The value to assign.
- */
-function baseAssignValue(object, key, value) {
-  if (key == '__proto__' && defineProperty) {
-    defineProperty(object, key, {
-      'configurable': true,
-      'enumerable': true,
-      'value': value,
-      'writable': true
-    });
-  } else {
-    object[key] = value;
-  }
-}
-
-module.exports = baseAssignValue;
+process.nextTick = function (fun) {
+    var args = new Array(arguments.length - 1);
+    if (arguments.length > 1) {
+        for (var i = 1; i < arguments.length; i++) {
+            args[i - 1] = arguments[i];
+        }
+    }
+    queue.push(new Item(fun, args));
+    if (queue.length === 1 && !draining) {
+        runTimeout(drainQueue);
+    }
+};
 
+// v8 likes predictible objects
+function Item(fun, array) {
+    this.fun = fun;
+    this.array = array;
+}
+Item.prototype.run = function () {
+    this.fun.apply(null, this.array);
+};
+process.title = 'browser';
+process.browser = true;
+process.env = {};
+process.argv = [];
+process.version = ''; // empty string to avoid regexp issues
+process.versions = {};
 
-/***/ }),
+function noop() {}
 
-/***/ 116:
-/***/ (function(module, exports, __webpack_require__) {
+process.on = noop;
+process.addListener = noop;
+process.once = noop;
+process.off = noop;
+process.removeListener = noop;
+process.removeAllListeners = noop;
+process.emit = noop;
+process.prependListener = noop;
+process.prependOnceListener = noop;
 
-var getNative = __webpack_require__(81);
+process.listeners = function (name) { return [] }
 
-var defineProperty = (function() {
-  try {
-    var func = getNative(Object, 'defineProperty');
-    func({}, '', {});
-    return func;
-  } catch (e) {}
-}());
+process.binding = function (name) {
+    throw new Error('process.binding is not supported');
+};
 
-module.exports = defineProperty;
+process.cwd = function () { return '/' };
+process.chdir = function (dir) {
+    throw new Error('process.chdir is not supported');
+};
+process.umask = function() { return 0; };
 
 
 /***/ }),
 
-/***/ 117:
-/***/ (function(module, exports) {
+/***/ 121:
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node 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.
 
-/** Used as references for various `Number` constants. */
-var MAX_SAFE_INTEGER = 9007199254740991;
 
-/** Used to detect unsigned integer values. */
-var reIsUint = /^(?:0|[1-9]\d*)$/;
 
-/**
- * Checks if `value` is a valid array-like index.
- *
- * @private
- * @param {*} value The value to check.
- * @param {number} [length=MAX_SAFE_INTEGER] The upper bounds of a valid index.
- * @returns {boolean} Returns `true` if `value` is a valid index, else `false`.
- */
-function isIndex(value, length) {
-  var type = typeof value;
-  length = length == null ? MAX_SAFE_INTEGER : length;
-
-  return !!length &&
-    (type == 'number' ||
-      (type != 'symbol' && reIsUint.test(value))) &&
-        (value > -1 && value % 1 == 0 && value < length);
+// If obj.hasOwnProperty has been overridden, then calling
+// obj.hasOwnProperty(prop) will break.
+// See: https://github.com/joyent/node/issues/1707
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
-module.exports = isIndex;
+module.exports = function(qs, sep, eq, options) {
+  sep = sep || '&';
+  eq = eq || '=';
+  var obj = {};
 
+  if (typeof qs !== 'string' || qs.length === 0) {
+    return obj;
+  }
 
-/***/ }),
+  var regexp = /\+/g;
+  qs = qs.split(sep);
 
-/***/ 1174:
-/***/ (function(module, exports) {
+  var maxKeys = 1000;
+  if (options && typeof options.maxKeys === 'number') {
+    maxKeys = options.maxKeys;
+  }
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:cc=\"http://creativecommons.org/ns#\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 400 400\" xml:space=\"preserve\" id=\"svg2\" version=\"1.1\"><metadata id=\"metadata8\"><rdf:RDF><cc:Work rdf:about><dc:format>image/svg+xml</dc:format><dc:type rdf:resource=\"http://purl.org/dc/dcmitype/StillImage\"></dc></cc:Work></rdf:RDF></metadata><defs id=\"defs6\"></defs><g transform=\"matrix(1.3333333,0,0,-1.3333333,0,400)\" id=\"g10\"><g transform=\"translate(178.0626,235.0086)\" id=\"g12\"><path id=\"path14\" style=\"fill:#41b883;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 h -75.491 L -22.669,-170.017 75.491,0 Z\"></path></g><g transform=\"translate(178.0626,235.0086)\" id=\"g16\"><path id=\"path18\" style=\"fill:#34495e;fill-opacity:1;fill-rule:nonzero;stroke:none\" d=\"M 0,0 -22.669,-39.264 -45.338,0 H -81.565 L -22.669,-102.01 36.227,0 Z\"></path></g></g></svg>"
+  var len = qs.length;
+  // maxKeys <= 0 means that we should not limit keys count
+  if (maxKeys > 0 && len > maxKeys) {
+    len = maxKeys;
+  }
 
-/***/ }),
+  for (var i = 0; i < len; ++i) {
+    var x = qs[i].replace(regexp, '%20'),
+        idx = x.indexOf(eq),
+        kstr, vstr, k, v;
 
-/***/ 118:
-/***/ (function(module, exports) {
+    if (idx >= 0) {
+      kstr = x.substr(0, idx);
+      vstr = x.substr(idx + 1);
+    } else {
+      kstr = x;
+      vstr = '';
+    }
+
+    k = decodeURIComponent(kstr);
+    v = decodeURIComponent(vstr);
+
+    if (!hasOwnProperty(obj, k)) {
+      obj[k] = v;
+    } else if (isArray(obj[k])) {
+      obj[k].push(v);
+    } else {
+      obj[k] = [obj[k], v];
+    }
+  }
+
+  return obj;
+};
 
+var isArray = Array.isArray || function (xs) {
+  return Object.prototype.toString.call(xs) === '[object Array]';
+};
 
 
 /***/ }),
 
-/***/ 119:
+/***/ 122:
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(process) {// Copyright Joyent, Inc. and other Node contributors.
+"use strict";
+// Copyright Joyent, Inc. and other Node 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,
@@ -819,943 +711,431 @@
 // 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.
 
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length - 1; i >= 0; i--) {
-    var last = parts[i];
-    if (last === '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
-  }
-
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
-    }
-  }
-
-  return parts;
-}
 
-// Split a filename into [root, dir, basename, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
-var splitPath = function(filename) {
-  return splitPathRe.exec(filename).slice(1);
-};
 
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-  var resolvedPath = '',
-      resolvedAbsolute = false;
+var stringifyPrimitive = function(v) {
+  switch (typeof v) {
+    case 'string':
+      return v;
 
-  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-    var path = (i >= 0) ? arguments[i] : process.cwd();
+    case 'boolean':
+      return v ? 'true' : 'false';
 
-    // Skip empty and invalid entries
-    if (typeof path !== 'string') {
-      throw new TypeError('Arguments to path.resolve must be strings');
-    } else if (!path) {
-      continue;
-    }
+    case 'number':
+      return isFinite(v) ? v : '';
 
-    resolvedPath = path + '/' + resolvedPath;
-    resolvedAbsolute = path.charAt(0) === '/';
+    default:
+      return '';
   }
-
-  // At this point the path should be resolved to a full absolute path, but
-  // handle relative paths to be safe (might happen when process.cwd() fails)
-
-  // Normalize the path
-  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
-
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
 };
 
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-  var isAbsolute = exports.isAbsolute(path),
-      trailingSlash = substr(path, -1) === '/';
+module.exports = function(obj, sep, eq, name) {
+  sep = sep || '&';
+  eq = eq || '=';
+  if (obj === null) {
+    obj = undefined;
+  }
 
-  // Normalize the path
-  path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
+  if (typeof obj === 'object') {
+    return map(objectKeys(obj), function(k) {
+      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
+      if (isArray(obj[k])) {
+        return map(obj[k], function(v) {
+          return ks + encodeURIComponent(stringifyPrimitive(v));
+        }).join(sep);
+      } else {
+        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+      }
+    }).join(sep);
 
-  if (!path && !isAbsolute) {
-    path = '.';
-  }
-  if (path && trailingSlash) {
-    path += '/';
   }
 
-  return (isAbsolute ? '/' : '') + path;
+  if (!name) return '';
+  return encodeURIComponent(stringifyPrimitive(name)) + eq +
+         encodeURIComponent(stringifyPrimitive(obj));
 };
 
-// posix version
-exports.isAbsolute = function(path) {
-  return path.charAt(0) === '/';
+var isArray = Array.isArray || function (xs) {
+  return Object.prototype.toString.call(xs) === '[object Array]';
 };
 
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    if (typeof p !== 'string') {
-      throw new TypeError('Arguments to path.join must be strings');
-    }
-    return p;
-  }).join('/'));
+function map (xs, f) {
+  if (xs.map) return xs.map(f);
+  var res = [];
+  for (var i = 0; i < xs.length; i++) {
+    res.push(f(xs[i], i));
+  }
+  return res;
+}
+
+var objectKeys = Object.keys || function (obj) {
+  var res = [];
+  for (var key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) res.push(key);
+  }
+  return res;
 };
 
 
-// path.relative(from, to)
-// posix version
-exports.relative = function(from, to) {
-  from = exports.resolve(from).substr(1);
-  to = exports.resolve(to).substr(1);
+/***/ }),
 
-  function trim(arr) {
-    var start = 0;
-    for (; start < arr.length; start++) {
-      if (arr[start] !== '') break;
-    }
+/***/ 1233:
+/***/ (function(module, exports) {
 
-    var end = arr.length - 1;
-    for (; end >= 0; end--) {
-      if (arr[end] !== '') break;
-    }
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 256 296\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"xMidYMid\"><g><polygon fill=\"#673AB8\" points=\"128 0 256 73.8999491 256 221.699847 128 295.599796 0 221.699847 0 73.8999491\"></polygon><path d=\"M34.8647584,220.478469 C51.8814262,242.25881 105.959701,225.662965 157.014868,185.774297 C208.070035,145.885628 237.255632,97.428608 220.238964,75.6482664 C203.222296,53.8679249 149.144022,70.4637701 98.0888543,110.352439 C47.0336869,150.241107 17.8480906,198.698127 34.8647584,220.478469 Z M42.1343351,214.798853 C36.4908625,207.575537 38.9565723,193.395881 49.7081913,175.544904 C61.0297348,156.747677 80.2490923,135.997367 103.76847,117.622015 C127.287848,99.2466634 152.071368,85.6181573 173.049166,79.1803727 C192.970945,73.066665 207.325915,74.1045667 212.969387,81.3278822 C218.61286,88.5511977 216.14715,102.730854 205.395531,120.581832 C194.073987,139.379058 174.85463,160.129368 151.335252,178.50472 C127.815874,196.880072 103.032354,210.508578 82.054556,216.946362 C62.1327769,223.06007 47.7778077,222.022168 42.1343351,214.798853 Z\" fill=\"#FFFFFF\"></path><path d=\"M220.238964,220.478469 C237.255632,198.698127 208.070035,150.241107 157.014868,110.352439 C105.959701,70.4637701 51.8814262,53.8679249 34.8647584,75.6482664 C17.8480906,97.428608 47.0336869,145.885628 98.0888543,185.774297 C149.144022,225.662965 203.222296,242.25881 220.238964,220.478469 Z M212.969387,214.798853 C207.325915,222.022168 192.970945,223.06007 173.049166,216.946362 C152.071368,210.508578 127.287848,196.880072 103.76847,178.50472 C80.2490923,160.129368 61.0297348,139.379058 49.7081913,120.581832 C38.9565723,102.730854 36.4908625,88.5511977 42.1343351,81.3278822 C47.7778077,74.1045667 62.1327769,73.066665 82.054556,79.1803727 C103.032354,85.6181573 127.815874,99.2466634 151.335252,117.622015 C174.85463,135.997367 194.073987,156.747677 205.395531,175.544904 C216.14715,193.395881 218.61286,207.575537 212.969387,214.798853 Z\" fill=\"#FFFFFF\"></path><path d=\"M127.551861,167.666971 C138.378632,167.666971 147.155465,158.890139 147.155465,148.063368 C147.155465,137.236596 138.378632,128.459764 127.551861,128.459764 C116.72509,128.459764 107.948257,137.236596 107.948257,148.063368 C107.948257,158.890139 116.72509,167.666971 127.551861,167.666971 L127.551861,167.666971 Z\" fill=\"#FFFFFF\"></path></g></svg>"
 
-    if (start > end) return [];
-    return arr.slice(start, end - start + 1);
-  }
+/***/ }),
 
-  var fromParts = trim(from.split('/'));
-  var toParts = trim(to.split('/'));
+/***/ 1290:
+/***/ (function(module, exports) {
 
-  var length = Math.min(fromParts.length, toParts.length);
-  var samePartsLength = length;
-  for (var i = 0; i < length; i++) {
-    if (fromParts[i] !== toParts[i]) {
-      samePartsLength = i;
-      break;
-    }
-  }
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 512 512\" enable-background=\"new 0 0 512 512\" xml:space=\"preserve\"><g id=\"Layer_2\"><path fill=\"#132028\" d=\"M190.475,376V203.308H81.266c-27.129,0-50.139,26-58.222,62.035c-9.877,1.302-17.62,13.541-17.62,28.455 c0,14.914,7.743,27.153,17.62,28.455c7.291,32.507,26.733,56.84,50.385,61.294v68.669h395.95V376H190.475z\"></path></g><g id=\"Layer_3\"><path fill=\"#575A5B\" d=\"M490.712,427.977c0,30.941-25.082,56.023-56.023,56.023c-25.804,0-47.519-17.451-54.023-41.19 c-6.504,23.739-28.219,41.19-54.023,41.19c-30.941,0-56.023-25.082-56.023-56.023c0-30.941,25.082-56.023,56.023-56.023 c25.804,0,47.519,17.451,54.023,41.19c6.504-23.739,28.219-41.19,54.023-41.19C465.629,371.954,490.712,397.036,490.712,427.977z M161.24,203.308l29.75-113.845H94.232l29.75,113.845h-13.668c-33.865,0-61.319,40.513-61.319,90.489 c0,49.976,27.453,90.489,61.319,90.489H294.27V203.308H161.24z M162.321,420.431c-13.164,0-24.458,8.002-29.285,19.408 c-4.826-11.405-16.121-19.408-29.284-19.408c-17.554,0-31.785,14.23-31.785,31.784c0,17.554,14.23,31.785,31.785,31.785 c13.164,0,24.458-8.002,29.284-19.408C137.863,475.998,149.157,484,162.321,484c17.554,0,31.784-14.23,31.784-31.785 C194.106,434.661,179.875,420.431,162.321,420.431z\"></path></g><g id=\"Layer_4\"><path fill=\"#FFB636\" d=\"M200.78,384.287h-16.028c-20.105,0-36.403-40.513-36.403-90.489c0-49.976,16.298-90.489,36.403-90.489 h16.028c-20.105,0-36.403,40.513-36.403,90.489C164.378,343.773,180.676,384.287,200.78,384.287z M122.236,293.797 c0-49.976,16.298-90.489,36.403-90.489H142.61c-20.105,0-36.403,40.513-36.403,90.489c0,49.976,16.298,90.489,36.403,90.489h16.028 C138.534,384.287,122.236,343.773,122.236,293.797z\"></path></g><g id=\"Layer_5\"><path fill=\"#FF473E\" d=\"M489.353,384.287H294.27V85.761h195.083V384.287z M74.21,384.103h-7.99c-2.436,0-4.707,1.48-6.035,3.934 l-43.633,80.594C13.436,474.387,16.874,482,22.587,482h52.826c4.027,0,7.271-3.968,7.199-8.806l-1.203-80.594 C81.339,387.883,78.136,384.103,74.21,384.103z\"></path></g><g id=\"Layer_6\"><path fill=\"#EF2020\" d=\"M497.28,66.397H286.342c-5.92,0-10.72,4.8-10.72,10.72v1.626c0,5.92,4.8,10.72,10.72,10.72H497.28 c5.921,0,10.72-4.8,10.72-10.72v-1.626C508,71.197,503.201,66.397,497.28,66.397z\"></path></g><g id=\"Layer_7\"><path fill=\"#76DFFF\" d=\"M371.466,257.523h-40.952c-3.976,0-7.2-3.224-7.2-7.2V124.018c0-3.976,3.224-7.2,7.2-7.2h40.952 c3.976,0,7.2,3.224,7.2,7.2v126.305C378.666,254.3,375.442,257.523,371.466,257.523z M460.474,250.323V124.018 c0-3.976-3.224-7.2-7.2-7.2h-40.952c-3.976,0-7.2,3.224-7.2,7.2v126.305c0,3.976,3.224,7.2,7.2,7.2h40.952 C457.251,257.523,460.474,254.3,460.474,250.323z\"></path></g><g id=\"Layer_8\"><path fill=\"#132028\" d=\"M489.353,339.586H294.27v-36.582h195.083V339.586z M111.17,52L94.206,89.463h96.758L174,52H111.17z M326.643,414.954c-7.192,0-13.023,5.831-13.023,13.023S319.451,441,326.643,441c7.192,0,13.023-5.831,13.023-13.023 S333.835,414.954,326.643,414.954z M434.689,414.954c-7.192,0-13.023,5.831-13.023,13.023S427.496,441,434.689,441 s13.023-5.831,13.023-13.023S441.881,414.954,434.689,414.954z M103.752,444.827c-4.081,0-7.389,3.308-7.389,7.389 s3.308,7.389,7.389,7.389c4.081,0,7.389-3.308,7.389-7.389S107.833,444.827,103.752,444.827z M162.321,444.827 c-4.081,0-7.389,3.308-7.389,7.389s3.308,7.389,7.389,7.389s7.389-3.308,7.389-7.389S166.402,444.827,162.321,444.827z\"></path></g><g id=\"Layer_9\"><path fill=\"#FFB636\" d=\"M196.709,444.208h-92.957c-4.91,0-8.891-3.98-8.891-8.891s3.98-8.891,8.891-8.891h90.449l36.759-22.53 c1.398-0.857,3.006-1.311,4.646-1.311H459.54c4.91,0,8.891,3.98,8.891,8.891s-3.98,8.891-8.891,8.891H238.114l-36.759,22.53 C199.957,443.755,198.349,444.208,196.709,444.208z\"></path></g><g id=\"Layer_10\"><path fill=\"#ADB7BC\" d=\"M69.849,393.079c-5.787,0-10.485-4.685-10.5-10.475c-0.014-5.799,4.676-10.512,10.475-10.525l413.924-1 c0.009,0,0.018,0,0.026,0c5.787,0,10.485,4.685,10.499,10.475c0.014,5.799-4.676,10.512-10.475,10.525l-413.924,1 C69.867,393.079,69.857,393.079,69.849,393.079z\"></path></g></svg>"
 
-  var outputParts = [];
-  for (var i = samePartsLength; i < fromParts.length; i++) {
-    outputParts.push('..');
-  }
+/***/ }),
 
-  outputParts = outputParts.concat(toParts.slice(samePartsLength));
+/***/ 1301:
+/***/ (function(module, exports) {
 
-  return outputParts.join('/');
-};
+// removed by extract-text-webpack-plugin
 
-exports.sep = '/';
-exports.delimiter = ':';
+/***/ }),
 
-exports.dirname = function(path) {
-  var result = splitPath(path),
-      root = result[0],
-      dir = result[1];
+/***/ 1309:
+/***/ (function(module, exports) {
 
-  if (!root && !dir) {
-    // No dirname whatsoever
-    return '.';
-  }
+// removed by extract-text-webpack-plugin
 
-  if (dir) {
-    // It has a dirname, strip trailing slash
-    dir = dir.substr(0, dir.length - 1);
-  }
+/***/ }),
 
-  return root + dir;
-};
+/***/ 1310:
+/***/ (function(module, exports) {
 
+// removed by extract-text-webpack-plugin
 
-exports.basename = function(path, ext) {
-  var f = splitPath(path)[2];
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
+/***/ }),
 
+/***/ 1347:
+/***/ (function(module, exports) {
 
-exports.extname = function(path) {
-  return splitPath(path)[3];
-};
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 16 16\" fill=\"#D92215\"><path d=\"M8 14.5c-3.6 0-6.5-2.9-6.5-6.5S4.4 1.5 8 1.5s6.5 2.9 6.5 6.5-2.9 6.5-6.5 6.5zm0-12C5 2.5 2.5 5 2.5 8S5 13.5 8 13.5 13.5 11 13.5 8 11 2.5 8 2.5z\"></path><circle cx=\"5\" cy=\"6\" r=\"1\" transform=\"translate(1 1)\"></circle><circle cx=\"9\" cy=\"6\" r=\"1\" transform=\"translate(1 1)\"></circle><path d=\"M5.5 11c-.1 0-.2 0-.3-.1-.2-.1-.3-.4-.1-.7C6 9 7 8.5 8.1 8.5c1.7.1 2.8 1.7 2.8 1.8.2.2.1.5-.1.7-.2.1-.6 0-.7-.2 0 0-.9-1.3-2-1.3-.7 0-1.4.4-2.1 1.3-.2.2-.4.2-.5.2z\"></path></svg>"
 
-function filter (xs, f) {
-    if (xs.filter) return xs.filter(f);
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (f(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
-}
+/***/ }),
 
-// String.prototype.substr - negative index don't work in IE8
-var substr = 'ab'.substr(-1) === 'b'
-    ? function (str, start, len) { return str.substr(start, len) }
-    : function (str, start, len) {
-        if (start < 0) start = str.length + start;
-        return str.substr(start, len);
-    }
-;
+/***/ 1348:
+/***/ (function(module, exports) {
 
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(120)))
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"context-fill\"><path d=\"M13.917 7C13.44 4.162 10.973 2 8 2 4.686 2 2 4.686 2 8s2.686 6 6 6c2.22 0 4.16-1.207 5.197-3H12c-.912 1.214-2.364 2-4 2-2.76 0-5-2.24-5-5s2.24-5 5-5c2.42 0 4.437 1.718 4.9 4h1.017z\"></path><path d=\"M14 1L8 7h6V1zm-1 1L9 6h4V2z\" fill-rule=\"evenodd\"></path></svg>"
 
 /***/ }),
 
-/***/ 120:
-/***/ (function(module, exports) {
+/***/ 1355:
+/***/ (function(module, exports, __webpack_require__) {
 
-// shim for using process in browser
-var process = module.exports = {};
+"use strict";
 
-// cached from whatever global is present so that test runners that stub it
-// don't break things.  But we need to wrap it in a try catch in case it is
-// wrapped in strict mode code which doesn't define any globals.  It's inside a
-// function because try/catches deoptimize in certain engines.
 
-var cachedSetTimeout;
-var cachedClearTimeout;
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 defaultSetTimout() {
-    throw new Error('setTimeout has not been defined');
-}
-function defaultClearTimeout () {
-    throw new Error('clearTimeout has not been defined');
-}
-(function () {
-    try {
-        if (typeof setTimeout === 'function') {
-            cachedSetTimeout = setTimeout;
-        } else {
-            cachedSetTimeout = defaultSetTimout;
-        }
-    } catch (e) {
-        cachedSetTimeout = defaultSetTimout;
-    }
-    try {
-        if (typeof clearTimeout === 'function') {
-            cachedClearTimeout = clearTimeout;
-        } else {
-            cachedClearTimeout = defaultClearTimeout;
-        }
-    } catch (e) {
-        cachedClearTimeout = defaultClearTimeout;
-    }
-} ())
-function runTimeout(fun) {
-    if (cachedSetTimeout === setTimeout) {
-        //normal enviroments in sane situations
-        return setTimeout(fun, 0);
-    }
-    // if setTimeout wasn't available but was latter defined
-    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
-        cachedSetTimeout = setTimeout;
-        return setTimeout(fun, 0);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedSetTimeout(fun, 0);
-    } catch(e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
-            return cachedSetTimeout.call(null, fun, 0);
-        } catch(e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
-            return cachedSetTimeout.call(this, fun, 0);
-        }
-    }
+const feature = __webpack_require__(1461);
 
+module.exports = feature;
 
-}
-function runClearTimeout(marker) {
-    if (cachedClearTimeout === clearTimeout) {
-        //normal enviroments in sane situations
-        return clearTimeout(marker);
-    }
-    // if clearTimeout wasn't available but was latter defined
-    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
-        cachedClearTimeout = clearTimeout;
-        return clearTimeout(marker);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedClearTimeout(marker);
-    } catch (e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
-            return cachedClearTimeout.call(null, marker);
-        } catch (e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
-            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
-            return cachedClearTimeout.call(this, marker);
-        }
-    }
+/***/ }),
 
+/***/ 1359:
+/***/ (function(module, exports, __webpack_require__) {
 
+"use strict";
 
-}
-var queue = [];
-var draining = false;
-var currentQueue;
-var queueIndex = -1;
 
-function cleanUpNextTick() {
-    if (!draining || !currentQueue) {
-        return;
-    }
-    draining = false;
-    if (currentQueue.length) {
-        queue = currentQueue.concat(queue);
-    } else {
-        queueIndex = -1;
-    }
-    if (queue.length) {
-        drainQueue();
-    }
-}
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 
-function drainQueue() {
-    if (draining) {
-        return;
-    }
-    var timeout = runTimeout(cleanUpNextTick);
-    draining = true;
+var _Svg = __webpack_require__(1540);
 
-    var len = queue.length;
-    while(len) {
-        currentQueue = queue;
-        queue = [];
-        while (++queueIndex < len) {
-            if (currentQueue) {
-                currentQueue[queueIndex].run();
-            }
-        }
-        queueIndex = -1;
-        len = queue.length;
-    }
-    currentQueue = null;
-    draining = false;
-    runClearTimeout(timeout);
-}
+var _Svg2 = _interopRequireDefault(_Svg);
 
-process.nextTick = function (fun) {
-    var args = new Array(arguments.length - 1);
-    if (arguments.length > 1) {
-        for (var i = 1; i < arguments.length; i++) {
-            args[i - 1] = arguments[i];
-        }
-    }
-    queue.push(new Item(fun, args));
-    if (queue.length === 1 && !draining) {
-        runTimeout(drainQueue);
-    }
-};
+__webpack_require__(1310);
 
-// v8 likes predictible objects
-function Item(fun, array) {
-    this.fun = fun;
-    this.array = array;
-}
-Item.prototype.run = function () {
-    this.fun.apply(null, this.array);
-};
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
-process.version = ''; // empty string to avoid regexp issues
-process.versions = {};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function noop() {}
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
 
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
-process.prependListener = noop;
-process.prependOnceListener = noop;
+/**
+ * This file maps the SVG React Components in the assets/images directory.
+ */
 
-process.listeners = function (name) { return [] }
+exports.default = _Svg2.default;
 
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-};
+/***/ }),
 
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
-};
-process.umask = function() { return 0; };
+/***/ 1363:
+/***/ (function(module, exports, __webpack_require__) {
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 networkRequest = __webpack_require__(1367);
+const workerUtils = __webpack_require__(1368);
 
-/***/ 121:
-/***/ (function(module, exports, __webpack_require__) {
+module.exports = {
+  networkRequest,
+  workerUtils
+};
 
-"use strict";
-// Copyright Joyent, Inc. and other Node 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.
+/***/ }),
 
+/***/ 1367:
+/***/ (function(module, exports) {
 
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 obj.hasOwnProperty has been overridden, then calling
-// obj.hasOwnProperty(prop) will break.
-// See: https://github.com/joyent/node/issues/1707
-function hasOwnProperty(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
+function networkRequest(url, opts) {
+  return fetch(url, {
+    cache: opts.loadFromCache ? "default" : "no-cache"
+  }).then(res => {
+    if (res.status >= 200 && res.status < 300) {
+      return res.text().then(text => ({ content: text }));
+    }
+    return Promise.reject(`request failed with status ${res.status}`);
+  });
 }
 
-module.exports = function(qs, sep, eq, options) {
-  sep = sep || '&';
-  eq = eq || '=';
-  var obj = {};
+module.exports = networkRequest;
 
-  if (typeof qs !== 'string' || qs.length === 0) {
-    return obj;
-  }
+/***/ }),
 
-  var regexp = /\+/g;
-  qs = qs.split(sep);
+/***/ 1368:
+/***/ (function(module, exports) {
 
-  var maxKeys = 1000;
-  if (options && typeof options.maxKeys === 'number') {
-    maxKeys = options.maxKeys;
-  }
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
 
-  var len = qs.length;
-  // maxKeys <= 0 means that we should not limit keys count
-  if (maxKeys > 0 && len > maxKeys) {
-    len = maxKeys;
-  }
+function WorkerDispatcher() {
+  this.msgId = 1;
+  this.worker = null;
+} /* This Source Code Form is subject to the terms of the Mozilla Public
+   * License, v. 2.0. If a copy of the MPL was not distributed with this
+   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-  for (var i = 0; i < len; ++i) {
-    var x = qs[i].replace(regexp, '%20'),
-        idx = x.indexOf(eq),
-        kstr, vstr, k, v;
+WorkerDispatcher.prototype = {
+  start(url) {
+    this.worker = new Worker(url);
+    this.worker.onerror = () => {
+      console.error(`Error in worker ${url}`);
+    };
+  },
 
-    if (idx >= 0) {
-      kstr = x.substr(0, idx);
-      vstr = x.substr(idx + 1);
-    } else {
-      kstr = x;
-      vstr = '';
+  stop() {
+    if (!this.worker) {
+      return;
     }
 
-    k = decodeURIComponent(kstr);
-    v = decodeURIComponent(vstr);
+    this.worker.terminate();
+    this.worker = null;
+  },
 
-    if (!hasOwnProperty(obj, k)) {
-      obj[k] = v;
-    } else if (isArray(obj[k])) {
-      obj[k].push(v);
-    } else {
-      obj[k] = [obj[k], v];
-    }
-  }
+  task(method, { queue = false } = {}) {
+    const calls = [];
+    const push = args => {
+      return new Promise((resolve, reject) => {
+        if (queue && calls.length === 0) {
+          Promise.resolve().then(flush);
+        }
 
-  return obj;
-};
+        calls.push([args, resolve, reject]);
 
-var isArray = Array.isArray || function (xs) {
-  return Object.prototype.toString.call(xs) === '[object Array]';
-};
+        if (!queue) {
+          flush();
+        }
+      });
+    };
 
+    const flush = () => {
+      const items = calls.slice();
+      calls.length = 0;
 
-/***/ }),
+      const id = this.msgId++;
+      this.worker.postMessage({ id, method, calls: items.map(item => item[0]) });
 
-/***/ 122:
-/***/ (function(module, exports, __webpack_require__) {
+      const listener = ({ data: result }) => {
+        if (result.id !== id) {
+          return;
+        }
 
-"use strict";
-// Copyright Joyent, Inc. and other Node 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.
+        if (!this.worker) {
+          return;
+        }
 
+        this.worker.removeEventListener("message", listener);
 
+        result.results.forEach((resultData, i) => {
+          const [, resolve, reject] = items[i];
 
-var stringifyPrimitive = function(v) {
-  switch (typeof v) {
-    case 'string':
-      return v;
+          if (resultData.error) {
+            reject(resultData.error);
+          } else {
+            resolve(resultData.response);
+          }
+        });
+      };
 
-    case 'boolean':
-      return v ? 'true' : 'false';
-
-    case 'number':
-      return isFinite(v) ? v : '';
+      this.worker.addEventListener("message", listener);
+    };
 
-    default:
-      return '';
+    return (...args) => push(args);
   }
 };
 
-module.exports = function(obj, sep, eq, name) {
-  sep = sep || '&';
-  eq = eq || '=';
-  if (obj === null) {
-    obj = undefined;
-  }
+function workerHandler(publicInterface) {
+  return function (msg) {
+    const { id, method, calls } = msg.data;
 
-  if (typeof obj === 'object') {
-    return map(objectKeys(obj), function(k) {
-      var ks = encodeURIComponent(stringifyPrimitive(k)) + eq;
-      if (isArray(obj[k])) {
-        return map(obj[k], function(v) {
-          return ks + encodeURIComponent(stringifyPrimitive(v));
-        }).join(sep);
-      } else {
-        return ks + encodeURIComponent(stringifyPrimitive(obj[k]));
+    Promise.all(calls.map(args => {
+      try {
+        const response = publicInterface[method].apply(undefined, args);
+        if (response instanceof Promise) {
+          return response.then(val => ({ response: val }),
+          // Error can't be sent via postMessage, so be sure to
+          // convert to string.
+          err => ({ error: err.toString() }));
+        } else {
+          return { response };
+        }
+      } catch (error) {
+        // Error can't be sent via postMessage, so be sure to convert to
+        // string.
+        return { error: error.toString() };
       }
-    }).join(sep);
-
-  }
-
-  if (!name) return '';
-  return encodeURIComponent(stringifyPrimitive(name)) + eq +
-         encodeURIComponent(stringifyPrimitive(obj));
-};
-
-var isArray = Array.isArray || function (xs) {
-  return Object.prototype.toString.call(xs) === '[object Array]';
-};
-
-function map (xs, f) {
-  if (xs.map) return xs.map(f);
-  var res = [];
-  for (var i = 0; i < xs.length; i++) {
-    res.push(f(xs[i], i));
-  }
-  return res;
+    })).then(results => {
+      self.postMessage({ id, results });
+    });
+  };
 }
 
-var objectKeys = Object.keys || function (obj) {
-  var res = [];
-  for (var key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) res.push(key);
-  }
-  return res;
-};
-
-
-/***/ }),
-
-/***/ 1233:
-/***/ (function(module, exports) {
-
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 256 296\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"xMidYMid\"><g><polygon fill=\"#673AB8\" points=\"128 0 256 73.8999491 256 221.699847 128 295.599796 0 221.699847 0 73.8999491\"></polygon><path d=\"M34.8647584,220.478469 C51.8814262,242.25881 105.959701,225.662965 157.014868,185.774297 C208.070035,145.885628 237.255632,97.428608 220.238964,75.6482664 C203.222296,53.8679249 149.144022,70.4637701 98.0888543,110.352439 C47.0336869,150.241107 17.8480906,198.698127 34.8647584,220.478469 Z M42.1343351,214.798853 C36.4908625,207.575537 38.9565723,193.395881 49.7081913,175.544904 C61.0297348,156.747677 80.2490923,135.997367 103.76847,117.622015 C127.287848,99.2466634 152.071368,85.6181573 173.049166,79.1803727 C192.970945,73.066665 207.325915,74.1045667 212.969387,81.3278822 C218.61286,88.5511977 216.14715,102.730854 205.395531,120.581832 C194.073987,139.379058 174.85463,160.129368 151.335252,178.50472 C127.815874,196.880072 103.032354,210.508578 82.054556,216.946362 C62.1327769,223.06007 47.7778077,222.022168 42.1343351,214.798853 Z\" fill=\"#FFFFFF\"></path><path d=\"M220.238964,220.478469 C237.255632,198.698127 208.070035,150.241107 157.014868,110.352439 C105.959701,70.4637701 51.8814262,53.8679249 34.8647584,75.6482664 C17.8480906,97.428608 47.0336869,145.885628 98.0888543,185.774297 C149.144022,225.662965 203.222296,242.25881 220.238964,220.478469 Z M212.969387,214.798853 C207.325915,222.022168 192.970945,223.06007 173.049166,216.946362 C152.071368,210.508578 127.287848,196.880072 103.76847,178.50472 C80.2490923,160.129368 61.0297348,139.379058 49.7081913,120.581832 C38.9565723,102.730854 36.4908625,88.5511977 42.1343351,81.3278822 C47.7778077,74.1045667 62.1327769,73.066665 82.054556,79.1803727 C103.032354,85.6181573 127.815874,99.2466634 151.335252,117.622015 C174.85463,135.997367 194.073987,156.747677 205.395531,175.544904 C216.14715,193.395881 218.61286,207.575537 212.969387,214.798853 Z\" fill=\"#FFFFFF\"></path><path d=\"M127.551861,167.666971 C138.378632,167.666971 147.155465,158.890139 147.155465,148.063368 C147.155465,137.236596 138.378632,128.459764 127.551861,128.459764 C116.72509,128.459764 107.948257,137.236596 107.948257,148.063368 C107.948257,158.890139 116.72509,167.666971 127.551861,167.666971 L127.551861,167.666971 Z\" fill=\"#FFFFFF\"></path></g></svg>"
-
-/***/ }),
-
-/***/ 1290:
-/***/ (function(module, exports) {
-
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 512 512\" enable-background=\"new 0 0 512 512\" xml:space=\"preserve\"><g id=\"Layer_2\"><path fill=\"#132028\" d=\"M190.475,376V203.308H81.266c-27.129,0-50.139,26-58.222,62.035c-9.877,1.302-17.62,13.541-17.62,28.455 c0,14.914,7.743,27.153,17.62,28.455c7.291,32.507,26.733,56.84,50.385,61.294v68.669h395.95V376H190.475z\"></path></g><g id=\"Layer_3\"><path fill=\"#575A5B\" d=\"M490.712,427.977c0,30.941-25.082,56.023-56.023,56.023c-25.804,0-47.519-17.451-54.023-41.19 c-6.504,23.739-28.219,41.19-54.023,41.19c-30.941,0-56.023-25.082-56.023-56.023c0-30.941,25.082-56.023,56.023-56.023 c25.804,0,47.519,17.451,54.023,41.19c6.504-23.739,28.219-41.19,54.023-41.19C465.629,371.954,490.712,397.036,490.712,427.977z M161.24,203.308l29.75-113.845H94.232l29.75,113.845h-13.668c-33.865,0-61.319,40.513-61.319,90.489 c0,49.976,27.453,90.489,61.319,90.489H294.27V203.308H161.24z M162.321,420.431c-13.164,0-24.458,8.002-29.285,19.408 c-4.826-11.405-16.121-19.408-29.284-19.408c-17.554,0-31.785,14.23-31.785,31.784c0,17.554,14.23,31.785,31.785,31.785 c13.164,0,24.458-8.002,29.284-19.408C137.863,475.998,149.157,484,162.321,484c17.554,0,31.784-14.23,31.784-31.785 C194.106,434.661,179.875,420.431,162.321,420.431z\"></path></g><g id=\"Layer_4\"><path fill=\"#FFB636\" d=\"M200.78,384.287h-16.028c-20.105,0-36.403-40.513-36.403-90.489c0-49.976,16.298-90.489,36.403-90.489 h16.028c-20.105,0-36.403,40.513-36.403,90.489C164.378,343.773,180.676,384.287,200.78,384.287z M122.236,293.797 c0-49.976,16.298-90.489,36.403-90.489H142.61c-20.105,0-36.403,40.513-36.403,90.489c0,49.976,16.298,90.489,36.403,90.489h16.028 C138.534,384.287,122.236,343.773,122.236,293.797z\"></path></g><g id=\"Layer_5\"><path fill=\"#FF473E\" d=\"M489.353,384.287H294.27V85.761h195.083V384.287z M74.21,384.103h-7.99c-2.436,0-4.707,1.48-6.035,3.934 l-43.633,80.594C13.436,474.387,16.874,482,22.587,482h52.826c4.027,0,7.271-3.968,7.199-8.806l-1.203-80.594 C81.339,387.883,78.136,384.103,74.21,384.103z\"></path></g><g id=\"Layer_6\"><path fill=\"#EF2020\" d=\"M497.28,66.397H286.342c-5.92,0-10.72,4.8-10.72,10.72v1.626c0,5.92,4.8,10.72,10.72,10.72H497.28 c5.921,0,10.72-4.8,10.72-10.72v-1.626C508,71.197,503.201,66.397,497.28,66.397z\"></path></g><g id=\"Layer_7\"><path fill=\"#76DFFF\" d=\"M371.466,257.523h-40.952c-3.976,0-7.2-3.224-7.2-7.2V124.018c0-3.976,3.224-7.2,7.2-7.2h40.952 c3.976,0,7.2,3.224,7.2,7.2v126.305C378.666,254.3,375.442,257.523,371.466,257.523z M460.474,250.323V124.018 c0-3.976-3.224-7.2-7.2-7.2h-40.952c-3.976,0-7.2,3.224-7.2,7.2v126.305c0,3.976,3.224,7.2,7.2,7.2h40.952 C457.251,257.523,460.474,254.3,460.474,250.323z\"></path></g><g id=\"Layer_8\"><path fill=\"#132028\" d=\"M489.353,339.586H294.27v-36.582h195.083V339.586z M111.17,52L94.206,89.463h96.758L174,52H111.17z M326.643,414.954c-7.192,0-13.023,5.831-13.023,13.023S319.451,441,326.643,441c7.192,0,13.023-5.831,13.023-13.023 S333.835,414.954,326.643,414.954z M434.689,414.954c-7.192,0-13.023,5.831-13.023,13.023S427.496,441,434.689,441 s13.023-5.831,13.023-13.023S441.881,414.954,434.689,414.954z M103.752,444.827c-4.081,0-7.389,3.308-7.389,7.389 s3.308,7.389,7.389,7.389c4.081,0,7.389-3.308,7.389-7.389S107.833,444.827,103.752,444.827z M162.321,444.827 c-4.081,0-7.389,3.308-7.389,7.389s3.308,7.389,7.389,7.389s7.389-3.308,7.389-7.389S166.402,444.827,162.321,444.827z\"></path></g><g id=\"Layer_9\"><path fill=\"#FFB636\" d=\"M196.709,444.208h-92.957c-4.91,0-8.891-3.98-8.891-8.891s3.98-8.891,8.891-8.891h90.449l36.759-22.53 c1.398-0.857,3.006-1.311,4.646-1.311H459.54c4.91,0,8.891,3.98,8.891,8.891s-3.98,8.891-8.891,8.891H238.114l-36.759,22.53 C199.957,443.755,198.349,444.208,196.709,444.208z\"></path></g><g id=\"Layer_10\"><path fill=\"#ADB7BC\" d=\"M69.849,393.079c-5.787,0-10.485-4.685-10.5-10.475c-0.014-5.799,4.676-10.512,10.475-10.525l413.924-1 c0.009,0,0.018,0,0.026,0c5.787,0,10.485,4.685,10.499,10.475c0.014,5.799-4.676,10.512-10.475,10.525l-413.924,1 C69.867,393.079,69.857,393.079,69.849,393.079z\"></path></g></svg>"
-
-/***/ }),
-
-/***/ 1301:
-/***/ (function(module, exports) {
-
-// removed by extract-text-webpack-plugin
-
-/***/ }),
-
-/***/ 1309:
-/***/ (function(module, exports) {
-
-// removed by extract-text-webpack-plugin
-
-/***/ }),
-
-/***/ 1310:
-/***/ (function(module, exports) {
-
-// removed by extract-text-webpack-plugin
-
-/***/ }),
-
-/***/ 1347:
-/***/ (function(module, exports) {
-
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 16 16\" fill=\"#D92215\"><path d=\"M8 14.5c-3.6 0-6.5-2.9-6.5-6.5S4.4 1.5 8 1.5s6.5 2.9 6.5 6.5-2.9 6.5-6.5 6.5zm0-12C5 2.5 2.5 5 2.5 8S5 13.5 8 13.5 13.5 11 13.5 8 11 2.5 8 2.5z\"></path><circle cx=\"5\" cy=\"6\" r=\"1\" transform=\"translate(1 1)\"></circle><circle cx=\"9\" cy=\"6\" r=\"1\" transform=\"translate(1 1)\"></circle><path d=\"M5.5 11c-.1 0-.2 0-.3-.1-.2-.1-.3-.4-.1-.7C6 9 7 8.5 8.1 8.5c1.7.1 2.8 1.7 2.8 1.8.2.2.1.5-.1.7-.2.1-.6 0-.7-.2 0 0-.9-1.3-2-1.3-.7 0-1.4.4-2.1 1.3-.2.2-.4.2-.5.2z\"></path></svg>"
-
-/***/ }),
+function streamingWorkerHandler(publicInterface, { timeout = 100 } = {}, worker = self) {
+  let streamingWorker = (() => {
+    var _ref = _asyncToGenerator(function* (id, tasks) {
+      let isWorking = true;
 
-/***/ 1348:
-/***/ (function(module, exports) {
+      const intervalId = setTimeout(function () {
+        isWorking = false;
+      }, timeout);
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 16 16\" xmlns=\"http://www.w3.org/2000/svg\" fill=\"context-fill\"><path d=\"M13.917 7C13.44 4.162 10.973 2 8 2 4.686 2 2 4.686 2 8s2.686 6 6 6c2.22 0 4.16-1.207 5.197-3H12c-.912 1.214-2.364 2-4 2-2.76 0-5-2.24-5-5s2.24-5 5-5c2.42 0 4.437 1.718 4.9 4h1.017z\"></path><path d=\"M14 1L8 7h6V1zm-1 1L9 6h4V2z\" fill-rule=\"evenodd\"></path></svg>"
+      const results = [];
+      while (tasks.length !== 0 && isWorking) {
+        const { callback, context, args } = tasks.shift();
+        const result = yield callback.call(context, args);
+        results.push(result);
+      }
+      worker.postMessage({ id, status: "pending", data: results });
+      clearInterval(intervalId);
 
-/***/ }),
+      if (tasks.length !== 0) {
+        yield streamingWorker(id, tasks);
+      }
+    });
 
-/***/ 1355:
-/***/ (function(module, exports, __webpack_require__) {
+    return function streamingWorker(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  })();
 
-"use strict";
+  return (() => {
+    var _ref2 = _asyncToGenerator(function* (msg) {
+      const { id, method, args } = msg.data;
+      const workerMethod = publicInterface[method];
+      if (!workerMethod) {
+        console.error(`Could not find ${method} defined in worker.`);
+      }
+      worker.postMessage({ id, status: "start" });
 
+      try {
+        const tasks = workerMethod(args);
+        yield streamingWorker(id, tasks);
+        worker.postMessage({ id, status: "done" });
+      } catch (error) {
+        worker.postMessage({ id, status: "error", error });
+      }
+    });
 
-const feature = __webpack_require__(1461);
+    return function (_x3) {
+      return _ref2.apply(this, arguments);
+    };
+  })();
+}
 
-module.exports = feature;
+module.exports = {
+  WorkerDispatcher,
+  workerHandler,
+  streamingWorkerHandler
+};
 
 /***/ }),
 
-/***/ 1359:
+/***/ 1376:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _Svg = __webpack_require__(1540);
-
-var _Svg2 = _interopRequireDefault(_Svg);
-
-__webpack_require__(1310);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 maps the SVG React Components in the assets/images directory.
- */
-
-exports.default = _Svg2.default;
-
-/***/ }),
-
-/***/ 1363:
-/***/ (function(module, exports, __webpack_require__) {
-
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.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 networkRequest = __webpack_require__(1367);
-const workerUtils = __webpack_require__(1368);
+const Menu = __webpack_require__(1464);
+const MenuItem = __webpack_require__(1466);
+const { PrefsHelper } = __webpack_require__(1467);
+const Services = __webpack_require__(22);
+const KeyShortcuts = __webpack_require__(1468);
+const { ZoomKeys } = __webpack_require__(1469);
+const EventEmitter = __webpack_require__(1382);
+const SourceUtils = __webpack_require__(3637);
+const Telemetry = __webpack_require__(3750);
+const { getUnicodeHostname, getUnicodeUrlPath, getUnicodeUrl } = __webpack_require__(3638);
 
 module.exports = {
-  networkRequest,
-  workerUtils
+  KeyShortcuts,
+  Menu,
+  MenuItem,
+  PrefsHelper,
+  Services,
+  ZoomKeys,
+  EventEmitter,
+  SourceUtils,
+  Telemetry,
+  getUnicodeHostname,
+  getUnicodeUrlPath,
+  getUnicodeUrl
 };
 
 /***/ }),
 
-/***/ 1367:
-/***/ (function(module, exports) {
+/***/ 1382:
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.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 networkRequest(url, opts) {
-  return fetch(url, {
-    cache: opts.loadFromCache ? "default" : "no-cache"
-  }).then(res => {
-    if (res.status >= 200 && res.status < 300) {
-      return res.text().then(text => ({ content: text }));
-    }
-    return Promise.reject(`request failed with status ${res.status}`);
-  });
-}
-
-module.exports = networkRequest;
-
-/***/ }),
+var EventEmitter = function EventEmitter() {};
+module.exports = EventEmitter;
 
-/***/ 1368:
-/***/ (function(module, exports) {
-
-function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
-
-function WorkerDispatcher() {
-  this.msgId = 1;
-  this.worker = null;
-} /* This Source Code Form is subject to the terms of the Mozilla Public
-   * License, v. 2.0. If a copy of the MPL was not distributed with this
-   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-WorkerDispatcher.prototype = {
-  start(url) {
-    this.worker = new Worker(url);
-    this.worker.onerror = () => {
-      console.error(`Error in worker ${url}`);
-    };
-  },
-
-  stop() {
-    if (!this.worker) {
-      return;
-    }
-
-    this.worker.terminate();
-    this.worker = null;
-  },
-
-  task(method, { queue = false } = {}) {
-    const calls = [];
-    const push = args => {
-      return new Promise((resolve, reject) => {
-        if (queue && calls.length === 0) {
-          Promise.resolve().then(flush);
-        }
-
-        calls.push([args, resolve, reject]);
-
-        if (!queue) {
-          flush();
-        }
-      });
-    };
-
-    const flush = () => {
-      const items = calls.slice();
-      calls.length = 0;
-
-      const id = this.msgId++;
-      this.worker.postMessage({ id, method, calls: items.map(item => item[0]) });
-
-      const listener = ({ data: result }) => {
-        if (result.id !== id) {
-          return;
-        }
-
-        if (!this.worker) {
-          return;
-        }
-
-        this.worker.removeEventListener("message", listener);
-
-        result.results.forEach((resultData, i) => {
-          const [, resolve, reject] = items[i];
-
-          if (resultData.error) {
-            reject(resultData.error);
-          } else {
-            resolve(resultData.response);
-          }
-        });
-      };
-
-      this.worker.addEventListener("message", listener);
-    };
-
-    return (...args) => push(args);
-  }
-};
-
-function workerHandler(publicInterface) {
-  return function (msg) {
-    const { id, method, calls } = msg.data;
-
-    Promise.all(calls.map(args => {
-      try {
-        const response = publicInterface[method].apply(undefined, args);
-        if (response instanceof Promise) {
-          return response.then(val => ({ response: val }),
-          // Error can't be sent via postMessage, so be sure to
-          // convert to string.
-          err => ({ error: err.toString() }));
-        } else {
-          return { response };
-        }
-      } catch (error) {
-        // Error can't be sent via postMessage, so be sure to convert to
-        // string.
-        return { error: error.toString() };
-      }
-    })).then(results => {
-      self.postMessage({ id, results });
-    });
-  };
-}
-
-function streamingWorkerHandler(publicInterface, { timeout = 100 } = {}, worker = self) {
-  let streamingWorker = (() => {
-    var _ref = _asyncToGenerator(function* (id, tasks) {
-      let isWorking = true;
-
-      const intervalId = setTimeout(function () {
-        isWorking = false;
-      }, timeout);
-
-      const results = [];
-      while (tasks.length !== 0 && isWorking) {
-        const { callback, context, args } = tasks.shift();
-        const result = yield callback.call(context, args);
-        results.push(result);
-      }
-      worker.postMessage({ id, status: "pending", data: results });
-      clearInterval(intervalId);
-
-      if (tasks.length !== 0) {
-        yield streamingWorker(id, tasks);
-      }
-    });
-
-    return function streamingWorker(_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  })();
-
-  return (() => {
-    var _ref2 = _asyncToGenerator(function* (msg) {
-      const { id, method, args } = msg.data;
-      const workerMethod = publicInterface[method];
-      if (!workerMethod) {
-        console.error(`Could not find ${method} defined in worker.`);
-      }
-      worker.postMessage({ id, status: "start" });
-
-      try {
-        const tasks = workerMethod(args);
-        yield streamingWorker(id, tasks);
-        worker.postMessage({ id, status: "done" });
-      } catch (error) {
-        worker.postMessage({ id, status: "error", error });
-      }
-    });
-
-    return function (_x3) {
-      return _ref2.apply(this, arguments);
-    };
-  })();
-}
-
-module.exports = {
-  WorkerDispatcher,
-  workerHandler,
-  streamingWorkerHandler
-};
-
-/***/ }),
-
-/***/ 1376:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 Menu = __webpack_require__(1464);
-const MenuItem = __webpack_require__(1466);
-const { PrefsHelper } = __webpack_require__(1467);
-const Services = __webpack_require__(22);
-const KeyShortcuts = __webpack_require__(1468);
-const { ZoomKeys } = __webpack_require__(1469);
-const EventEmitter = __webpack_require__(1382);
-const SourceUtils = __webpack_require__(3637);
-const Telemetry = __webpack_require__(3750);
-const { getUnicodeHostname, getUnicodeUrlPath, getUnicodeUrl } = __webpack_require__(3638);
-
-module.exports = {
-  KeyShortcuts,
-  Menu,
-  MenuItem,
-  PrefsHelper,
-  Services,
-  ZoomKeys,
-  EventEmitter,
-  SourceUtils,
-  Telemetry,
-  getUnicodeHostname,
-  getUnicodeUrlPath,
-  getUnicodeUrl
-};
-
-/***/ }),
-
-/***/ 1382:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 EventEmitter = function EventEmitter() {};
-module.exports = EventEmitter;
-
-const promise = __webpack_require__(1465);
+const promise = __webpack_require__(1465);
 
 /**
  * Decorate an object with event emitter functionality.
  *
  * @param Object aObjectToDecorate
@@ -1868,46 +1248,10 @@
       }
     }
   }
 };
 
-/***/ }),
-
-/***/ 14:
-/***/ (function(module, exports) {
-
-/**
- * Checks if `value` is object-like. A value is object-like if it's not `null`
- * and has a `typeof` result of "object".
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is object-like, else `false`.
- * @example
- *
- * _.isObjectLike({});
- * // => true
- *
- * _.isObjectLike([1, 2, 3]);
- * // => true
- *
- * _.isObjectLike(_.noop);
- * // => false
- *
- * _.isObjectLike(null);
- * // => false
- */
-function isObjectLike(value) {
-  return value != null && typeof value == 'object';
-}
-
-module.exports = isObjectLike;
-
-
 /***/ }),
 
 /***/ 1413:
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -2068,23 +1412,19 @@
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 
 
-const pick = __webpack_require__(67);
-const put = __webpack_require__(112);
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { get: pick, set: put } = __webpack_require__(2);
 const fs = __webpack_require__(118);
 const path = __webpack_require__(119);
 
 let config;
-
-const flag = __webpack_require__(52);
-
-function isBrowser() {
-  return typeof window == "object" && typeof module == "undefined";
-}
-
 /**
  * Gets a config value for a given key
  * e.g "chrome.webSocketPort"
  */
 function getValue(key) {
@@ -2093,71 +1433,28 @@
 
 function setValue(key, value) {
   return put(config, key, value);
 }
 
-function isEnabled(key) {
-  return config.features && typeof config.features[key] == "object" ? config.features[key].enabled : config.features[key];
+function setConfig(value) {
+  config = value;
 }
 
-function isDevelopment() {
-  if (isBrowser()) {
-    if (true) {
-      return false;
-    }
-    const href = window.location ? window.location.href : "";
-    return href.match(/^file:/) || href.match(/localhost:/);
-  }
-
-  if (isFirefoxPanel()) {
-    // Default to production if compiling for the Firefox panel
-    return "production" === "development";
-  }
-  return "production" !== "production";
-}
-
-function isTesting() {
-  return flag.testing;
-}
-
-function isFirefoxPanel() {
-  return "firefox-panel" == "firefox-panel";
-}
-
-function isApplication() {
-  return "firefox-panel" == "application";
-}
-
-function isFirefox() {
-  return (/firefox/i.test(navigator.userAgent)
-  );
-}
-
-function setConfig(value) {
-  config = value;
-}
-
-function getConfig() {
-  return config;
+function getConfig() {
+  return config;
 }
 
 function updateLocalConfig(relativePath) {
   const localConfigPath = path.resolve(relativePath, "../configs/local.json");
   const output = JSON.stringify(config, null, 2);
   fs.writeFileSync(localConfigPath, output, { flag: "w" });
   return output;
 }
 
 module.exports = {
-  isEnabled,
   getValue,
   setValue,
-  isDevelopment,
-  isTesting,
-  isFirefoxPanel,
-  isApplication,
-  isFirefox,
   getConfig,
   setConfig,
   updateLocalConfig
 };
 
@@ -5449,10 +4746,17 @@
 
 module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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 viewBox=\"0 0 256 247\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" preserveAspectRatio=\"xMidYMid\"><defs><radialGradient cx=\"78.7636112%\" cy=\"37.8476394%\" fx=\"78.7636112%\" fy=\"37.8476394%\" r=\"89.8725577%\" id=\"radialGradient-1\"><stop stop-color=\"#F80090\" offset=\"0%\"></stop><stop stop-color=\"#4D008E\" offset=\"100%\"></stop></radialGradient><radialGradient cx=\"68.7389016%\" cy=\"4.39833672%\" fx=\"68.7389016%\" fy=\"4.39833672%\" r=\"81.7284786%\" id=\"radialGradient-2\"><stop stop-color=\"#57008E\" offset=\"0%\"></stop><stop stop-color=\"#5C008E\" offset=\"29.1746283%\"></stop><stop stop-color=\"#F80090\" offset=\"100%\"></stop></radialGradient><linearGradient x1=\"18.2386532%\" y1=\"0%\" x2=\"81.1591125%\" y2=\"84.3374763%\" id=\"linearGradient-3\"><stop stop-color=\"#F70090\" offset=\"0%\"></stop><stop stop-color=\"#E50090\" offset=\"66.9712865%\"></stop><stop stop-color=\"#D6008F\" stop-opacity=\"0.2\" offset=\"82.7147533%\"></stop><stop stop-color=\"#C10090\" stop-opacity=\"0\" offset=\"100%\"></stop></linearGradient><linearGradient x1=\"64.9060589%\" y1=\"71.5585538%\" x2=\"44.2897699%\" y2=\"50%\" id=\"linearGradient-4\"><stop stop-color=\"#B2008F\" stop-opacity=\"0.151340138\" offset=\"0%\"></stop><stop stop-color=\"#F70090\" stop-opacity=\"0.4\" offset=\"40.0350765%\"></stop><stop stop-color=\"#F60090\" stop-opacity=\"0.891668\" offset=\"64.8995536%\"></stop><stop stop-color=\"#FF0090\" offset=\"100%\"></stop></linearGradient></defs><g><path d=\"M16.6852208,157.125328 C3.56690702,87.3798324 38.2363025,20.1145078 117.808706,11.1662199 C106.835616,-0.558801732 91.8452087,-0.646905628 84.9481697,0.779380087 C72.770288,4.66044372 73.1525932,12.540855 59.3390152,22.7199675 C45.6064437,30.5634307 38.7094156,24.5568182 28.7057455,32.6879515 C18.7234849,40.7583874 25.6888528,59.2851732 21.5022823,62.8870857 C17.3464381,70.0905489 4.45500952,76.5077264 2.10834286,85.6062545 C0.168948918,97.2420641 7.37241212,105.553752 7.09535584,115.527778 C7.92652468,123.839467 -1.17920693,128.539449 0.129052814,135.275796 C4.0477368,146.281025 11.600845,152.904887 15.1615723,155.958047 C15.9781085,156.533531 16.8404881,157.95083 16.6852208,157.125328 L16.6852208,157.125328 Z\" fill=\"#FF0090\"></path><path d=\"M158.275491,60.578542 C155.368486,60.578542 153.011422,58.2214776 153.011422,55.3144727 C153.011422,52.4074679 155.368486,50.0504035 158.275491,50.0504035 C161.182496,50.0504035 163.53956,52.4074679 163.53956,55.3144727 C163.53956,58.2214776 161.182496,60.578542 158.275491,60.578542 L158.275491,60.578542 Z M19.7566405,164.732808 C7.1500258,104.116773 46.1602355,53.4676156 121.704062,78.4026805 C166.031404,104.334594 221.793282,102.646102 224.307422,85.8832 C230.514061,65.7878769 196.047681,24.3767065 144.515214,13.5715117 C42.2814476,-6.37654026 -12.8335943,104.116774 19.7566405,164.732808 L19.7566405,164.732808 Z\" fill=\"url(#radialGradient-1)\"></path><path d=\"M187.458604,171.493257 C202.639072,173.137863 217.048769,169.494573 230.402327,158.61014 C210.228197,181.112651 185.002777,192.426521 156.059262,195.505171 C169.878829,207.254019 183.20579,212.546348 195.955366,210.281136 C160.528734,220.05679 130.847947,209.296529 94.7424273,173.340673 C92.8517347,183.020022 103.074741,198.100667 113.611745,207.727264 C52.4742909,181.221845 47.1143627,98.6544556 121.66531,78.3442237 C44.3844415,41.214641 0.686373501,113.357693 22.1558444,172.485931 C43.1623368,218.026693 99.1402667,253.085223 160.492163,245.3753 C190.292928,241.7251 234.79401,221.178935 252.973664,172.485931 C240.160919,183.983766 217.257941,193.997836 207.037617,194.765984 C241.628648,177.478781 260.301586,148.103896 255.060336,107.955387 C247.895106,125.013742 238.441392,138.114625 226.616076,147.112305 C251.735653,107.955387 247.425219,87.716426 228.832526,65.4732398 C242.131228,102.044668 224.928249,142.633967 187.458604,171.493257 L187.458604,171.493257 Z\" fill=\"url(#radialGradient-2)\"></path><path d=\"M169.707072,213.625541 C167.082407,213.13513 175.656929,217.098842 159.079366,212.710316 C142.501804,208.32179 125.622502,204.092744 94.7424273,173.340673 C92.8517347,183.020022 103.074741,198.100667 113.611745,207.727264 C142.056275,227.564927 122.711866,218.286797 166.051946,233.269481 C169.52976,226.346862 169.707072,220.195346 169.707072,213.625541 L169.707072,213.625541 Z\" fill=\"url(#linearGradient-3)\"></path><path d=\"M114.601372,57.8510108 C114.601372,57.8510108 118.369452,52.2893628 119.836219,49.7810251 C121.633641,46.7072319 124.393939,41.104618 124.393939,41.104618 C124.393939,41.104618 95.389611,31.6417749 88.2716448,30.4871665 C66.1450215,36.2308801 66.0645022,45.5009559 78.435065,59.690116 C79.8114806,61.2693368 114.601372,57.8510108 114.601372,57.8510108 L114.601372,57.8510108 Z\" fill=\"url(#linearGradient-4)\"></path></g></svg>"
 
 /***/ }),
 
+/***/ 2:
+/***/ (function(module, exports) {
+
+module.exports = __WEBPACK_EXTERNAL_MODULE_2__;
+
+/***/ }),
+
 /***/ 22:
 /***/ (function(module, exports) {
 
 module.exports = __WEBPACK_EXTERNAL_MODULE_22__;
 
@@ -9600,1625 +8904,461 @@
     // Example: https://foo.com:8888/file.js
     // `hostname`: "foo.com"
     // `host`: "foo.com:8888"
     let isChrome = isChromeScheme(location);
 
-    url.fileName = url.pathname ? url.pathname.slice(url.pathname.lastIndexOf("/") + 1) || "/" : "/";
-
-    if (isChrome) {
-      url.hostname = null;
-      url.host = null;
-    }
-
-    gURLStore.set(location, url);
-    return url;
-  } catch (e) {
-    gURLStore.set(location, null);
-    return null;
-  }
-}
-
-/**
-* Parse a source into a short and long name as well as a host name.
-*
-* @param {String} source
-*        The source to parse. Can be a URI or names like "(eval)" or
-*        "self-hosted".
-* @return {Object}
-*         An object with the following properties:
-*           - {String} short: A short name for the source.
-*             - "http://page.com/test.js#go?q=query" -> "test.js"
-*           - {String} long: The full, long name for the source, with
-              hash/query stripped.
-*             - "http://page.com/test.js#go?q=query" -> "http://page.com/test.js"
-*           - {String?} host: If available, the host name for the source.
-*             - "http://page.com/test.js#go?q=query" -> "page.com"
-*/
-function getSourceNames(source) {
-  let data = gSourceNamesStore.get(source);
-
-  if (data) {
-    return data;
-  }
-
-  let short, long, host;
-  const sourceStr = source ? String(source) : "";
-
-  // If `data:...` uri
-  if (isDataScheme(sourceStr)) {
-    let commaIndex = sourceStr.indexOf(",");
-    if (commaIndex > -1) {
-      // The `short` name for a data URI becomes `data:` followed by the actual
-      // encoded content, omitting the MIME type, and charset.
-      short = `data:${sourceStr.substring(commaIndex + 1)}`.slice(0, 100);
-      let result = { short, long: sourceStr };
-      gSourceNamesStore.set(source, result);
-      return result;
-    }
-  }
-
-  // If Scratchpad URI, like "Scratchpad/1"; no modifications,
-  // and short/long are the same.
-  if (isScratchpadScheme(sourceStr)) {
-    let result = { short: sourceStr, long: sourceStr };
-    gSourceNamesStore.set(source, result);
-    return result;
-  }
-
-  const parsedUrl = parseURL(sourceStr);
-
-  if (!parsedUrl) {
-    // Malformed URI.
-    long = sourceStr;
-    short = sourceStr.slice(0, 100);
-  } else {
-    host = parsedUrl.host;
-
-    long = parsedUrl.href;
-    if (parsedUrl.hash) {
-      long = long.replace(parsedUrl.hash, "");
-    }
-    if (parsedUrl.search) {
-      long = long.replace(parsedUrl.search, "");
-    }
-
-    short = parsedUrl.fileName;
-    // If `short` is just a slash, and we actually have a path,
-    // strip the slash and parse again to get a more useful short name.
-    // e.g. "http://foo.com/bar/" -> "bar", rather than "/"
-    if (short === "/" && parsedUrl.pathname !== "/") {
-      short = parseURL(long.replace(/\/$/, "")).fileName;
-    }
-  }
-
-  if (!short) {
-    if (!long) {
-      long = UNKNOWN_SOURCE_STRING;
-    }
-    short = long.slice(0, 100);
-  }
-
-  let result = { short, long, host };
-  gSourceNamesStore.set(source, result);
-  return result;
-}
-
-// For the functions below, we assume that we will never access the location
-// argument out of bounds, which is indeed the vast majority of cases.
-//
-// They are written this way because they are hot. Each frame is checked for
-// being content or chrome when processing the profile.
-
-function isColonSlashSlash(location, i = 0) {
-  return location.charCodeAt(++i) === CHAR_CODE_COLON && location.charCodeAt(++i) === CHAR_CODE_SLASH && location.charCodeAt(++i) === CHAR_CODE_SLASH;
-}
-
-/**
-* Checks for a Scratchpad URI, like "Scratchpad/1"
-*/
-function isScratchpadScheme(location, i = 0) {
-  return location.charCodeAt(i) === CHAR_CODE_CAP_S && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_H && location.charCodeAt(++i) === CHAR_CODE_P && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_D && location.charCodeAt(++i) === CHAR_CODE_SLASH;
-}
-
-function isDataScheme(location, i = 0) {
-  return location.charCodeAt(i) === CHAR_CODE_D && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_COLON;
-}
-
-function isContentScheme(location, i = 0) {
-  let firstChar = location.charCodeAt(i);
-
-  switch (firstChar) {
-    // "http://" or "https://"
-    case CHAR_CODE_H:
-      if (location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_P) {
-        if (location.charCodeAt(i + 1) === CHAR_CODE_S) {
-          ++i;
-        }
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    // "file://"
-    case CHAR_CODE_F:
-      if (location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_L && location.charCodeAt(++i) === CHAR_CODE_E) {
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    // "app://"
-    case CHAR_CODE_A:
-      if (location.charCodeAt(++i) == CHAR_CODE_P && location.charCodeAt(++i) == CHAR_CODE_P) {
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    // "blob:"
-    case CHAR_CODE_B:
-      if (location.charCodeAt(++i) == CHAR_CODE_L && location.charCodeAt(++i) == CHAR_CODE_O && location.charCodeAt(++i) == CHAR_CODE_B && location.charCodeAt(++i) == CHAR_CODE_COLON) {
-        return isContentScheme(location, i + 1);
-      }
-      return false;
-
-    default:
-      return false;
-  }
-}
-
-function isChromeScheme(location, i = 0) {
-  let firstChar = location.charCodeAt(i);
-
-  switch (firstChar) {
-    // "chrome://"
-    case CHAR_CODE_C:
-      if (location.charCodeAt(++i) === CHAR_CODE_H && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_M && location.charCodeAt(++i) === CHAR_CODE_E) {
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    // "resource://"
-    case CHAR_CODE_R:
-      if (location.charCodeAt(++i) === CHAR_CODE_E && location.charCodeAt(++i) === CHAR_CODE_S && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_U && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_E) {
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    // "jar:file://"
-    case CHAR_CODE_J:
-      if (location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_COLON && location.charCodeAt(++i) === CHAR_CODE_F && location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_L && location.charCodeAt(++i) === CHAR_CODE_E) {
-        return isColonSlashSlash(location, i);
-      }
-      return false;
-
-    default:
-      return false;
-  }
-}
-
-function isWASM(location, i = 0) {
-  return (
-    // "wasm-function["
-    location.charCodeAt(i) === CHAR_CODE_W && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_S && location.charCodeAt(++i) === CHAR_CODE_M && location.charCodeAt(++i) === CHAR_CODE_DASH && location.charCodeAt(++i) === CHAR_CODE_F && location.charCodeAt(++i) === CHAR_CODE_U && location.charCodeAt(++i) === CHAR_CODE_N && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_N && location.charCodeAt(++i) === CHAR_CODE_L_SQUARE_BRACKET
-  );
-}
-
-/**
-* A utility method to get the file name from a sourcemapped location
-* The sourcemap location can be in any form. This method returns a
-* formatted file name for different cases like Windows or OSX.
-* @param source
-* @returns String
-*/
-function getSourceMappedFile(source) {
-  // If sourcemapped source is a OSX path, return
-  // the characters after last "/".
-  // If sourcemapped source is a Windowss path, return
-  // the characters after last "\\".
-  if (source.lastIndexOf("/") >= 0) {
-    source = source.slice(source.lastIndexOf("/") + 1);
-  } else if (source.lastIndexOf("\\") >= 0) {
-    source = source.slice(source.lastIndexOf("\\") + 1);
-  }
-  return source;
-}
-
-module.exports = {
-  parseURL,
-  getSourceNames,
-  isScratchpadScheme,
-  isChromeScheme,
-  isContentScheme,
-  isWASM,
-  isDataScheme,
-  getSourceMappedFile
-};
-
-/***/ }),
-
-/***/ 3753:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 a chrome-API-free version of the module
-// devtools/client/shared/unicode-url.js in the mozilla-central repository, so
-// that it can be used in Chrome-API-free applications, such as the Launchpad.
-// But because of this, it cannot take advantage of utilizing chrome APIs and
-// should implement the similar functionalities on its own.
-//
-// Please keep in mind that if the feature in this file has changed, don't
-// forget to also change that accordingly in
-// devtools/client/shared/unicode-url.js in the mozilla-central repository.
-
-
-
-const punycode = __webpack_require__(3641);
-
-/**
- * Gets a readble Unicode hostname from a hostname.
- *
- * If the `hostname` is a readable ASCII hostname, such as example.org, then
- * this function will simply return the original `hostname`.
- *
- * If the `hostname` is a Punycode hostname representing a Unicode domain name,
- * such as xn--g6w.xn--8pv, then this function will return the readable Unicode
- * domain name by decoding the Punycode hostname.
- *
- * @param {string}  hostname
- *                  the hostname from which the Unicode hostname will be
- *                  parsed, such as example.org, xn--g6w.xn--8pv.
- * @return {string} The Unicode hostname. It may be the same as the `hostname`
- *                  passed to this function if the `hostname` itself is
- *                  a readable ASCII hostname or a Unicode hostname.
- */
-function getUnicodeHostname(hostname) {
-  try {
-    return punycode.toUnicode(hostname);
-  } catch (err) {}
-  return hostname;
-}
-
-/**
- * Gets a readble Unicode URL pathname from a URL pathname.
- *
- * If the `urlPath` is a readable ASCII URL pathname, such as /a/b/c.js, then
- * this function will simply return the original `urlPath`.
- *
- * If the `urlPath` is a URI-encoded pathname, such as %E8%A9%A6/%E6%B8%AC.js,
- * then this function will return the readable Unicode pathname.
- *
- * If the `urlPath` is a malformed URL pathname, then this function will simply
- * return the original `urlPath`.
- *
- * @param {string}  urlPath
- *                  the URL path from which the Unicode URL path will be parsed,
- *                  such as /a/b/c.js, %E8%A9%A6/%E6%B8%AC.js.
- * @return {string} The Unicode URL Path. It may be the same as the `urlPath`
- *                  passed to this function if the `urlPath` itself is a readable
- *                  ASCII url or a Unicode url.
- */
-function getUnicodeUrlPath(urlPath) {
-  try {
-    return decodeURIComponent(urlPath);
-  } catch (err) {}
-  return urlPath;
-}
-
-/**
- * Gets a readable Unicode URL from a URL.
- *
- * If the `url` is a readable ASCII URL, such as http://example.org/a/b/c.js,
- * then this function will simply return the original `url`.
- *
- * If the `url` includes either an unreadable Punycode domain name or an
- * unreadable URI-encoded pathname, such as
- * http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js, then this function will return
- * the readable URL by decoding all its unreadable URL components to Unicode
- * characters.
- *
- * If the `url` is a malformed URL, then this function will return the original
- * `url`.
- *
- * If the `url` is a data: URI, then this function will return the original
- * `url`.
- *
- * @param {string}  url
- *                  the full URL, or a data: URI. from which the readable URL
- *                  will be parsed, such as, http://example.org/a/b/c.js,
- *                  http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js
- * @return {string} The readable URL. It may be the same as the `url` passed to
- *                  this function if the `url` itself is readable.
- */
-function getUnicodeUrl(url) {
-  try {
-    const { protocol, hostname } = new URL(url);
-    if (protocol === "data:") {
-      // Never convert a data: URI.
-      return url;
-    }
-    const readableHostname = getUnicodeHostname(hostname);
-    url = decodeURIComponent(url);
-    return url.replace(hostname, readableHostname);
-  } catch (err) {}
-  return url;
-}
-
-module.exports = {
-  getUnicodeHostname,
-  getUnicodeUrlPath,
-  getUnicodeUrl
-};
-
-/***/ }),
-
-/***/ 4:
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_4__;
-
-/***/ }),
-
-/***/ 52:
-/***/ (function(module, exports) {
-
-module.exports = __WEBPACK_EXTERNAL_MODULE_52__;
-
-/***/ }),
-
-/***/ 6:
-/***/ (function(module, exports, __webpack_require__) {
-
-var Symbol = __webpack_require__(7),
-    getRawTag = __webpack_require__(10),
-    objectToString = __webpack_require__(11);
-
-/** `Object#toString` result references. */
-var nullTag = '[object Null]',
-    undefinedTag = '[object Undefined]';
-
-/** Built-in value references. */
-var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
-
-/**
- * The base implementation of `getTag` without fallbacks for buggy environments.
- *
- * @private
- * @param {*} value The value to query.
- * @returns {string} Returns the `toStringTag`.
- */
-function baseGetTag(value) {
-  if (value == null) {
-    return value === undefined ? undefinedTag : nullTag;
-  }
-  return (symToStringTag && symToStringTag in Object(value))
-    ? getRawTag(value)
-    : objectToString(value);
-}
-
-module.exports = baseGetTag;
-
-
-/***/ }),
-
-/***/ 66:
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-
-exports.decode = exports.parse = __webpack_require__(121);
-exports.encode = exports.stringify = __webpack_require__(122);
-
-
-/***/ }),
-
-/***/ 67:
-/***/ (function(module, exports, __webpack_require__) {
-
-var baseGet = __webpack_require__(68);
-
-/**
- * Gets the value at `path` of `object`. If the resolved value is
- * `undefined`, the `defaultValue` is returned in its place.
- *
- * @static
- * @memberOf _
- * @since 3.7.0
- * @category Object
- * @param {Object} object The object to query.
- * @param {Array|string} path The path of the property to get.
- * @param {*} [defaultValue] The value returned for `undefined` resolved values.
- * @returns {*} Returns the resolved value.
- * @example
- *
- * var object = { 'a': [{ 'b': { 'c': 3 } }] };
- *
- * _.get(object, 'a[0].b.c');
- * // => 3
- *
- * _.get(object, ['a', '0', 'b', 'c']);
- * // => 3
- *
- * _.get(object, 'a.b.c', 'default');
- * // => 'default'
- */
-function get(object, path, defaultValue) {
-  var result = object == null ? undefined : baseGet(object, path);
-  return result === undefined ? defaultValue : result;
-}
-
-module.exports = get;
-
-
-/***/ }),
-
-/***/ 68:
-/***/ (function(module, exports, __webpack_require__) {
-
-var castPath = __webpack_require__(69),
-    toKey = __webpack_require__(111);
-
-/**
- * The base implementation of `_.get` without support for default values.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {Array|string} path The path of the property to get.
- * @returns {*} Returns the resolved value.
- */
-function baseGet(object, path) {
-  path = castPath(path, object);
-
-  var index = 0,
-      length = path.length;
-
-  while (object != null && index < length) {
-    object = object[toKey(path[index++])];
-  }
-  return (index && index == length) ? object : undefined;
-}
-
-module.exports = baseGet;
-
-
-/***/ }),
-
-/***/ 69:
-/***/ (function(module, exports, __webpack_require__) {
-
-var isArray = __webpack_require__(70),
-    isKey = __webpack_require__(71),
-    stringToPath = __webpack_require__(73),
-    toString = __webpack_require__(108);
-
-/**
- * Casts `value` to a path array if it's not one.
- *
- * @private
- * @param {*} value The value to inspect.
- * @param {Object} [object] The object to query keys on.
- * @returns {Array} Returns the cast property path array.
- */
-function castPath(value, object) {
-  if (isArray(value)) {
-    return value;
-  }
-  return isKey(value, object) ? [value] : stringToPath(toString(value));
-}
-
-module.exports = castPath;
-
-
-/***/ }),
-
-/***/ 7:
-/***/ (function(module, exports, __webpack_require__) {
-
-var root = __webpack_require__(8);
-
-/** Built-in value references. */
-var Symbol = root.Symbol;
-
-module.exports = Symbol;
-
-
-/***/ }),
-
-/***/ 70:
-/***/ (function(module, exports) {
-
-/**
- * Checks if `value` is classified as an `Array` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an array, else `false`.
- * @example
- *
- * _.isArray([1, 2, 3]);
- * // => true
- *
- * _.isArray(document.body.children);
- * // => false
- *
- * _.isArray('abc');
- * // => false
- *
- * _.isArray(_.noop);
- * // => false
- */
-var isArray = Array.isArray;
-
-module.exports = isArray;
-
-
-/***/ }),
-
-/***/ 71:
-/***/ (function(module, exports, __webpack_require__) {
-
-var isArray = __webpack_require__(70),
-    isSymbol = __webpack_require__(72);
-
-/** Used to match property names within property paths. */
-var reIsDeepProp = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,
-    reIsPlainProp = /^\w*$/;
-
-/**
- * Checks if `value` is a property name and not a property path.
- *
- * @private
- * @param {*} value The value to check.
- * @param {Object} [object] The object to query keys on.
- * @returns {boolean} Returns `true` if `value` is a property name, else `false`.
- */
-function isKey(value, object) {
-  if (isArray(value)) {
-    return false;
-  }
-  var type = typeof value;
-  if (type == 'number' || type == 'symbol' || type == 'boolean' ||
-      value == null || isSymbol(value)) {
-    return true;
-  }
-  return reIsPlainProp.test(value) || !reIsDeepProp.test(value) ||
-    (object != null && value in Object(object));
-}
-
-module.exports = isKey;
-
-
-/***/ }),
-
-/***/ 72:
-/***/ (function(module, exports, __webpack_require__) {
-
-var baseGetTag = __webpack_require__(6),
-    isObjectLike = __webpack_require__(14);
-
-/** `Object#toString` result references. */
-var symbolTag = '[object Symbol]';
-
-/**
- * Checks if `value` is classified as a `Symbol` primitive or object.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a symbol, else `false`.
- * @example
- *
- * _.isSymbol(Symbol.iterator);
- * // => true
- *
- * _.isSymbol('abc');
- * // => false
- */
-function isSymbol(value) {
-  return typeof value == 'symbol' ||
-    (isObjectLike(value) && baseGetTag(value) == symbolTag);
-}
-
-module.exports = isSymbol;
-
-
-/***/ }),
-
-/***/ 73:
-/***/ (function(module, exports, __webpack_require__) {
-
-var memoizeCapped = __webpack_require__(74);
-
-/** Used to match property names within property paths. */
-var rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g;
-
-/** Used to match backslashes in property paths. */
-var reEscapeChar = /\\(\\)?/g;
-
-/**
- * Converts `string` to a property path array.
- *
- * @private
- * @param {string} string The string to convert.
- * @returns {Array} Returns the property path array.
- */
-var stringToPath = memoizeCapped(function(string) {
-  var result = [];
-  if (string.charCodeAt(0) === 46 /* . */) {
-    result.push('');
-  }
-  string.replace(rePropName, function(match, number, quote, subString) {
-    result.push(quote ? subString.replace(reEscapeChar, '$1') : (number || match));
-  });
-  return result;
-});
-
-module.exports = stringToPath;
-
-
-/***/ }),
-
-/***/ 74:
-/***/ (function(module, exports, __webpack_require__) {
-
-var memoize = __webpack_require__(75);
-
-/** Used as the maximum memoize cache size. */
-var MAX_MEMOIZE_SIZE = 500;
-
-/**
- * A specialized version of `_.memoize` which clears the memoized function's
- * cache when it exceeds `MAX_MEMOIZE_SIZE`.
- *
- * @private
- * @param {Function} func The function to have its output memoized.
- * @returns {Function} Returns the new memoized function.
- */
-function memoizeCapped(func) {
-  var result = memoize(func, function(key) {
-    if (cache.size === MAX_MEMOIZE_SIZE) {
-      cache.clear();
-    }
-    return key;
-  });
-
-  var cache = result.cache;
-  return result;
-}
-
-module.exports = memoizeCapped;
-
-
-/***/ }),
-
-/***/ 75:
-/***/ (function(module, exports, __webpack_require__) {
-
-var MapCache = __webpack_require__(76);
-
-/** Error message constants. */
-var FUNC_ERROR_TEXT = 'Expected a function';
-
-/**
- * Creates a function that memoizes the result of `func`. If `resolver` is
- * provided, it determines the cache key for storing the result based on the
- * arguments provided to the memoized function. By default, the first argument
- * provided to the memoized function is used as the map cache key. The `func`
- * is invoked with the `this` binding of the memoized function.
- *
- * **Note:** The cache is exposed as the `cache` property on the memoized
- * function. Its creation may be customized by replacing the `_.memoize.Cache`
- * constructor with one whose instances implement the
- * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
- * method interface of `clear`, `delete`, `get`, `has`, and `set`.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Function
- * @param {Function} func The function to have its output memoized.
- * @param {Function} [resolver] The function to resolve the cache key.
- * @returns {Function} Returns the new memoized function.
- * @example
- *
- * var object = { 'a': 1, 'b': 2 };
- * var other = { 'c': 3, 'd': 4 };
- *
- * var values = _.memoize(_.values);
- * values(object);
- * // => [1, 2]
- *
- * values(other);
- * // => [3, 4]
- *
- * object.a = 2;
- * values(object);
- * // => [1, 2]
- *
- * // Modify the result cache.
- * values.cache.set(object, ['a', 'b']);
- * values(object);
- * // => ['a', 'b']
- *
- * // Replace `_.memoize.Cache`.
- * _.memoize.Cache = WeakMap;
- */
-function memoize(func, resolver) {
-  if (typeof func != 'function' || (resolver != null && typeof resolver != 'function')) {
-    throw new TypeError(FUNC_ERROR_TEXT);
-  }
-  var memoized = function() {
-    var args = arguments,
-        key = resolver ? resolver.apply(this, args) : args[0],
-        cache = memoized.cache;
-
-    if (cache.has(key)) {
-      return cache.get(key);
-    }
-    var result = func.apply(this, args);
-    memoized.cache = cache.set(key, result) || cache;
-    return result;
-  };
-  memoized.cache = new (memoize.Cache || MapCache);
-  return memoized;
-}
-
-// Expose `MapCache`.
-memoize.Cache = MapCache;
-
-module.exports = memoize;
-
-
-/***/ }),
-
-/***/ 76:
-/***/ (function(module, exports, __webpack_require__) {
-
-var mapCacheClear = __webpack_require__(77),
-    mapCacheDelete = __webpack_require__(102),
-    mapCacheGet = __webpack_require__(105),
-    mapCacheHas = __webpack_require__(106),
-    mapCacheSet = __webpack_require__(107);
-
-/**
- * Creates a map cache object to store key-value pairs.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function MapCache(entries) {
-  var index = -1,
-      length = entries == null ? 0 : entries.length;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-// Add methods to `MapCache`.
-MapCache.prototype.clear = mapCacheClear;
-MapCache.prototype['delete'] = mapCacheDelete;
-MapCache.prototype.get = mapCacheGet;
-MapCache.prototype.has = mapCacheHas;
-MapCache.prototype.set = mapCacheSet;
-
-module.exports = MapCache;
-
-
-/***/ }),
-
-/***/ 77:
-/***/ (function(module, exports, __webpack_require__) {
-
-var Hash = __webpack_require__(78),
-    ListCache = __webpack_require__(93),
-    Map = __webpack_require__(101);
-
-/**
- * Removes all key-value entries from the map.
- *
- * @private
- * @name clear
- * @memberOf MapCache
- */
-function mapCacheClear() {
-  this.size = 0;
-  this.__data__ = {
-    'hash': new Hash,
-    'map': new (Map || ListCache),
-    'string': new Hash
-  };
-}
-
-module.exports = mapCacheClear;
-
-
-/***/ }),
-
-/***/ 78:
-/***/ (function(module, exports, __webpack_require__) {
-
-var hashClear = __webpack_require__(79),
-    hashDelete = __webpack_require__(89),
-    hashGet = __webpack_require__(90),
-    hashHas = __webpack_require__(91),
-    hashSet = __webpack_require__(92);
-
-/**
- * Creates a hash object.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function Hash(entries) {
-  var index = -1,
-      length = entries == null ? 0 : entries.length;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-// Add methods to `Hash`.
-Hash.prototype.clear = hashClear;
-Hash.prototype['delete'] = hashDelete;
-Hash.prototype.get = hashGet;
-Hash.prototype.has = hashHas;
-Hash.prototype.set = hashSet;
-
-module.exports = Hash;
-
-
-/***/ }),
-
-/***/ 79:
-/***/ (function(module, exports, __webpack_require__) {
-
-var nativeCreate = __webpack_require__(80);
-
-/**
- * Removes all key-value entries from the hash.
- *
- * @private
- * @name clear
- * @memberOf Hash
- */
-function hashClear() {
-  this.__data__ = nativeCreate ? nativeCreate(null) : {};
-  this.size = 0;
-}
-
-module.exports = hashClear;
-
-
-/***/ }),
-
-/***/ 792:
-/***/ (function(module, exports) {
-
-var g;
-
-// This works in non-strict mode
-g = (function() {
-	return this;
-})();
-
-try {
-	// This works if eval is allowed (see CSP)
-	g = g || Function("return this")() || (1,eval)("this");
-} catch(e) {
-	// This works if the window reference is available
-	if(typeof window === "object")
-		g = window;
-}
-
-// g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-module.exports = g;
-
-
-/***/ }),
-
-/***/ 793:
-/***/ (function(module, exports) {
-
-module.exports = function(module) {
-	if(!module.webpackPolyfill) {
-		module.deprecate = function() {};
-		module.paths = [];
-		// module.parent = undefined by default
-		if(!module.children) module.children = [];
-		Object.defineProperty(module, "loaded", {
-			enumerable: true,
-			get: function() {
-				return module.l;
-			}
-		});
-		Object.defineProperty(module, "id", {
-			enumerable: true,
-			get: function() {
-				return module.i;
-			}
-		});
-		module.webpackPolyfill = 1;
-	}
-	return module;
-};
-
-
-/***/ }),
-
-/***/ 8:
-/***/ (function(module, exports, __webpack_require__) {
-
-var freeGlobal = __webpack_require__(9);
-
-/** Detect free variable `self`. */
-var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
-
-/** Used as a reference to the global object. */
-var root = freeGlobal || freeSelf || Function('return this')();
-
-module.exports = root;
-
-
-/***/ }),
-
-/***/ 80:
-/***/ (function(module, exports, __webpack_require__) {
-
-var getNative = __webpack_require__(81);
-
-/* Built-in method references that are verified to be native. */
-var nativeCreate = getNative(Object, 'create');
-
-module.exports = nativeCreate;
-
-
-/***/ }),
-
-/***/ 806:
-/***/ (function(module, exports) {
-
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 256 256\"><defs><style>.cls-1{isolation:isolate;}.cls-17,.cls-2,.cls-25{fill:none;}.cls-17,.cls-2{stroke-miterlimit:10;}.cls-2{stroke-width:0.75px;stroke:url(#linear-gradient);}.cls-3{fill:url(#linear-gradient-2);}.cls-4{fill:#f15a24;}.cls-5{fill:#ed1c24;}.cls-6{fill:#c1272d;}.cls-7{fill:url(#linear-gradient-3);}.cls-8{fill:url(#linear-gradient-4);}.cls-9{fill:url(#linear-gradient-5);}.cls-10{fill:url(#linear-gradient-6);}.cls-11{opacity:0.49;fill:url(#linear-gradient-7);}.cls-12{fill:url(#linear-gradient-8);}.cls-13{fill:#2db5f9;}.cls-13,.cls-14{mix-blend-mode:screen;}.cls-14{fill:#5fd2ff;}.cls-15{fill:#219058;}.cls-16{fill:url(#linear-gradient-9);}.cls-17{stroke:#fff;stroke-width:1.87px;}.cls-18{fill:#f7b852;}.cls-19{fill:#ff8431;}.cls-20{fill:#fffb69;}.cls-21{fill:#44c688;}.cls-22{fill:#29b36e;}.cls-23{fill:#6fd191;}.cls-24{fill:#c83ad7;}.cls-26{fill:#fba9ff;}.cls-27{fill:#ff737d;}.cls-28{fill:#fdc666;}</style><linearGradient id=\"linear-gradient\" x1=\"67.45\" y1=\"154.72\" x2=\"67.29\" y2=\"155.43\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#ff1d25\" stop-opacity=\"0.5\"></stop><stop offset=\"0.06\" stop-color=\"#ff1d25\" stop-opacity=\"0.54\"></stop><stop offset=\"0.37\" stop-color=\"#ff1d25\" stop-opacity=\"0.74\"></stop><stop offset=\"0.64\" stop-color=\"#ff1d25\" stop-opacity=\"0.88\"></stop><stop offset=\"0.86\" stop-color=\"#ff1d25\" stop-opacity=\"0.97\"></stop><stop offset=\"1\" stop-color=\"#ff1d25\"></stop></linearGradient><linearGradient id=\"linear-gradient-2\" x1=\"73.09\" y1=\"170.74\" x2=\"73.09\" y2=\"153.5\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#ffdd42\"></stop><stop offset=\"1\" stop-color=\"#fb784b\"></stop></linearGradient><linearGradient id=\"linear-gradient-3\" x1=\"201.52\" y1=\"95.13\" x2=\"207.88\" y2=\"89.89\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#5bcb99\"></stop><stop offset=\"1\" stop-color=\"#85a8e8\"></stop></linearGradient><linearGradient id=\"linear-gradient-4\" x1=\"81.17\" y1=\"158.3\" x2=\"279.32\" y2=\"55.49\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#34e28b\"></stop><stop offset=\"1\"></stop></linearGradient><linearGradient id=\"linear-gradient-5\" x1=\"117.57\" y1=\"178.22\" x2=\"133.15\" y2=\"178.22\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#c297ff\"></stop><stop offset=\"1\" stop-color=\"#ae31bb\"></stop></linearGradient><linearGradient id=\"linear-gradient-6\" x1=\"54.05\" y1=\"253.29\" x2=\"251.08\" y2=\"99.63\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"1\" stop-color=\"#d23de2\"></stop></linearGradient><linearGradient id=\"linear-gradient-7\" x1=\"199.8\" y1=\"86.45\" x2=\"191.83\" y2=\"113.37\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"1\" stop-opacity=\"0\"></stop></linearGradient><linearGradient id=\"linear-gradient-8\" x1=\"126.87\" y1=\"190.63\" x2=\"182.9\" y2=\"204.2\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#2db5f9\"></stop><stop offset=\"1\" stop-color=\"#092432\"></stop></linearGradient><linearGradient id=\"linear-gradient-9\" x1=\"83.08\" y1=\"49.55\" x2=\"46.06\" y2=\"151.24\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"0.21\" stop-color=\"#48080a\"></stop><stop offset=\"0.42\" stop-color=\"#891014\"></stop><stop offset=\"0.61\" stop-color=\"#bc151b\"></stop><stop offset=\"0.78\" stop-color=\"#e01a21\"></stop><stop offset=\"0.91\" stop-color=\"#f71c24\"></stop><stop offset=\"1\" stop-color=\"#ff1d25\"></stop></linearGradient></defs><title>dojo_square</title><g class=\"cls-1\"><g id=\"Layer_1\" data-name=\"Layer 1\"><line class=\"cls-2\" x1=\"67.37\" y1=\"155.08\" x2=\"67.37\" y2=\"155.08\"></line><path class=\"cls-3\" d=\"M42.28,150.4l.52.82A58,58,0,0,0,52,161.49a45.23,45.23,0,0,0,28.74,10.25c.65,0,1.31,0,2,0a67.32,67.32,0,0,0,21.13-5.26,67.38,67.38,0,0,1-9.09.83,36.92,36.92,0,0,1-27.44-12.17A66.82,66.82,0,0,1,42.28,150.4Z\"></path><path class=\"cls-4\" d=\"M80.79,80.88a45.4,45.4,0,0,1,38.89,21.94A37,37,0,0,0,84.43,94.7c8.29,4,19.66,7.08,35.28,8.15,0,0-.77-14.87-19.8-22.64-26.57-10.84-30.33-8.69-37.06-19.9a30.09,30.09,0,0,0,6,22.15A45.45,45.45,0,0,1,80.79,80.88Z\"></path><path class=\"cls-5\" d=\"M99.92,80.21c-9.1-3.71-15.52-5.9-20.3-7.62A33.4,33.4,0,0,0,84.54,81a45.42,45.42,0,0,1,35.13,21.78,36.87,36.87,0,0,0-20.54-9.34,109,109,0,0,0,20,9.32l.59,0S118.94,88,99.92,80.21Z\"></path><path class=\"cls-6\" d=\"M119.69,102.85h.1c.29-1.62,2.07-14.46-12.4-25.7C85.78,60.37,81.56,58.82,80.53,49.94a27.8,27.8,0,0,0-.91,22.65c4.78,1.72,11.21,3.91,20.3,7.62,19,7.77,19.8,22.64,19.8,22.64Z\"></path><path class=\"cls-7\" d=\"M185.28,88.22a33.64,33.64,0,0,1,22.08,8.23,29.8,29.8,0,0,1,19,8S208.22,78,176.19,89a41.72,41.72,0,0,0-8.2,4A33.64,33.64,0,0,1,185.28,88.22Z\"></path><path class=\"cls-8\" d=\"M185.28,88.22A33.62,33.62,0,0,0,168,93l.93-.56c-25.88,15.24-57.6,62.06-101.56,62.65h0a36.92,36.92,0,0,0,27.44,12.17,67.38,67.38,0,0,0,9.09-.83c28.6-11.79,56.09-40,68.55-53.64,11.56-12.67,24.22-17,34.91-16.34A33.64,33.64,0,0,0,185.28,88.22Z\"></path><path class=\"cls-9\" d=\"M118.48,179a20.94,20.94,0,0,0-.92,5.86,22.25,22.25,0,0,0,1,6.74,16.56,16.56,0,0,1,5.5-14.74c0-.17.09-.34.14-.51a20.37,20.37,0,0,1,8.91-11.47l-.08,0a37.84,37.84,0,0,0-4,1.53A20.87,20.87,0,0,0,118.48,179Z\"></path><path class=\"cls-10\" d=\"M234.26,129.11a42.41,42.41,0,0,0-7.94-24.76,29.82,29.82,0,0,0-19-7.9A33.69,33.69,0,0,1,219.06,122c0,11.34-4.12,24.3-17.45,31.28-19.42,10.16-49.21,5.33-68.54,11.6l.08,0a20.37,20.37,0,0,0-8.91,11.47c-.05.17-.09.34-.14.51h0c5.67-5,16.84-8.54,38.63-5.73,15.56,2,27.93,2.55,38.54-.5a41.2,41.2,0,0,0,25.23-17h0A42.41,42.41,0,0,0,234.26,129.11Z\"></path><path class=\"cls-11\" d=\"M234.26,129.11a42.41,42.41,0,0,0-7.94-24.76,29.82,29.82,0,0,0-19-7.9A33.69,33.69,0,0,1,219.06,122c0,11.34-4.12,24.3-17.45,31.28-19.42,10.16-49.21,5.33-68.54,11.6l.08,0a20.37,20.37,0,0,0-8.91,11.47c-.05.17-.09.34-.14.51h0c5.67-5,16.84-8.54,38.63-5.73,15.56,2,27.93,2.55,38.54-.5a41.2,41.2,0,0,0,25.23-17h0A42.41,42.41,0,0,0,234.26,129.11Z\"></path><path class=\"cls-12\" d=\"M137.8,201.88a20.44,20.44,0,0,1-13.68-25.12h0l0,.08a16.56,16.56,0,0,0-5.5,14.73,20.94,20.94,0,0,0,33.63,9.38A20.37,20.37,0,0,1,137.8,201.88Z\"></path><path class=\"cls-13\" d=\"M144.91,200.4c2.12-6.17,9-15.7,16.33-11.34,0,0,6,3.36,7.23-6.11,0,0,4.49,22.28-17.1,21.53,0,0,4.86-3.55,4.81-7.2A24.73,24.73,0,0,1,144.91,200.4Z\"></path><path class=\"cls-14\" d=\"M153.52,186.75c2.14-1.09,4.16-2.18,8.08-.44,3,1.35,6.88-3.94,3.56-8.66,0,0,.21,4.88-3.72,4.84A8.81,8.81,0,0,0,153.52,186.75Z\"></path><path class=\"cls-15\" d=\"M175.21,115.88c-5.17,7-12.75,12.95-13.64,14.39s1.5,6.11,5,6.45.82-1.36.52-3,1.06,1,5.27.42-1.53-2.2-1.14-4.33,4.74-6.17,6.47-10.25,4.7,0,3.18,3.18c-.6,1.26,4.81-3.54,2.08-7.21S178.22,111.77,175.21,115.88Z\"></path><path class=\"cls-15\" d=\"M160.47,131.28c-.76.73-3,2.37-3,2.37s2.19,3.05,5,3c0,0,.61-.29-.27-1.18S160.27,131.82,160.47,131.28Z\"></path><path class=\"cls-16\" d=\"M84.43,94.7c-7.35-3.56-12.27-7.88-15.54-12.24A45.42,45.42,0,0,0,42.28,150.4a66.82,66.82,0,0,0,25.09,4.67h0A37,37,0,0,1,84.43,94.7Z\"></path><line class=\"cls-17\" x1=\"67.37\" y1=\"155.08\" x2=\"67.37\" y2=\"155.08\"></line><path class=\"cls-18\" d=\"M84.52,81c2,2.91,7.81,7.94,14.63,12.44a36.87,36.87,0,0,1,20.52,9.33A45.42,45.42,0,0,0,84.52,81Z\"></path><path class=\"cls-19\" d=\"M84.52,81c-1.23-.1-2.48-.16-3.74-.16a45.45,45.45,0,0,0-11.89,1.58c3.27,4.36,8.19,8.67,15.54,12.24a36.72,36.72,0,0,1,14.72-1.22C92.33,89,86.54,83.95,84.52,81Z\"></path><path class=\"cls-20\" d=\"M109.73,91.38a33.29,33.29,0,0,0-12.21-7.29C100.46,89.66,103,91.38,109.73,91.38Z\"></path><path class=\"cls-6\" d=\"M96.89,67.66a63.16,63.16,0,0,1,6.54,4.58c.52.39-.93-3.55-2.62-4.3A7.5,7.5,0,0,0,96.89,67.66Z\"></path><path class=\"cls-6\" d=\"M105,73.37a70.75,70.75,0,0,1,6.5,4.64c.53.38-.9-3.56-2.57-4.33A7.5,7.5,0,0,0,105,73.37Z\"></path><path class=\"cls-6\" d=\"M112.55,79a19.59,19.59,0,0,1,3.52,4.39c.26.38.07-2.58-.92-3.42A5.28,5.28,0,0,0,112.55,79Z\"></path><path class=\"cls-21\" d=\"M77.55,151c-.2-.65,2.35-1.48,3-1.51a11.91,11.91,0,0,1,3.57,1.19,16.34,16.34,0,0,1-4.89,1A4.46,4.46,0,0,1,77.55,151Z\"></path><path class=\"cls-21\" d=\"M86.73,148.78c-.22-.51,1.75-1.38,2.29-1.46a9.58,9.58,0,0,1,3,.65,13.15,13.15,0,0,1-3.83,1.23A3.59,3.59,0,0,1,86.73,148.78Z\"></path><path class=\"cls-21\" d=\"M94.41,146c-.22-.4,1.32-1.29,1.76-1.41a7.92,7.92,0,0,1,2.48.27,10.87,10.87,0,0,1-3,1.35A3,3,0,0,1,94.41,146Z\"></path><path class=\"cls-21\" d=\"M100.52,143.19c-.23-.35,1.11-1.27,1.5-1.41a7.25,7.25,0,0,1,2.29.07,10,10,0,0,1-2.67,1.45A2.72,2.72,0,0,1,100.52,143.19Z\"></path><path class=\"cls-21\" d=\"M106.23,140.07c-.22-.29.9-1.16,1.24-1.3a6.31,6.31,0,0,1,2,0,8.66,8.66,0,0,1-2.25,1.39A2.36,2.36,0,0,1,106.23,140.07Z\"></path><path class=\"cls-21\" d=\"M68.34,151.69c-.11-.73,2.73-1.16,3.46-1.09a12.76,12.76,0,0,1,3.57,1.86,17.51,17.51,0,0,1-5.35.26A4.78,4.78,0,0,1,68.34,151.69Z\"></path><path class=\"cls-6\" d=\"M70.08,65.82c2,2.27,6.68,3.74,6.68,3.74A19,19,0,0,1,75.83,62c0-.18-5.75-.09-6.73-4.81C68.91,56.23,68.1,63.55,70.08,65.82Z\"></path><path class=\"cls-4\" d=\"M50.54,174.68a5.49,5.49,0,0,1,2.24-3.88l.19-.11a14,14,0,0,0-1.43-.25c-6.85-1-8.59,3.06-8.95,7.64,0,.26,0,.53,0,.78a8.31,8.31,0,0,1,7.89-4.2Z\"></path><path class=\"cls-4\" d=\"M58.88,173.19c-6.81-4.13-10.63-4.43-12.15,7.14,0,0,7.17-5.67,10.55-1.92,3.68,4.07,8.68.32,6.05-2.06A18.77,18.77,0,0,0,58.88,173.19Z\"></path><path class=\"cls-4\" d=\"M56.06,174.53c-3.86,2.57-3.86,8.62-3.86,8.62s7-3.81,6.5-6.19A2.93,2.93,0,0,0,56.06,174.53Z\"></path><path class=\"cls-4\" d=\"M24,127a5.49,5.49,0,0,1,4.43-.68l.2.08a14,14,0,0,0-.7-1.27c-3.49-6-7.76-4.79-11.56-2.21-.22.15-.43.31-.63.47a8.31,8.31,0,0,1,8.21,3.53Z\"></path><path class=\"cls-4\" d=\"M31.29,134.08c-2.48-9.82-4.47-13.62-14-6.83,0,0,8.13-2.34,9.06,9.22.44,5.47,5.69,6.57,5.63,3A18.77,18.77,0,0,0,31.29,134.08Z\"></path><path class=\"cls-4\" d=\"M27.83,128.82c-4.52-1.07-8.94,3.06-8.94,3.06s6.94-.24,7.78,4C27.14,138.23,27.83,128.82,27.83,128.82Z\"></path><path class=\"cls-22\" d=\"M172.45,112.79a55.39,55.39,0,0,1,15.49-12.5c5.64-3,13.66-4.84,18.5-4.61l1.85,1.59-1-.08a37.75,37.75,0,0,0-19,3.76A55,55,0,0,0,172.45,112.79Z\"></path><path class=\"cls-23\" d=\"M207.12,95.74a34.5,34.5,0,0,1,10.45,2.68,27.42,27.42,0,0,1,8.81,6,27.05,27.05,0,0,0-9.09-5.29,43.65,43.65,0,0,0-9-1.84l-1.84-1.59Z\"></path><path class=\"cls-24\" d=\"M124.52,175.47a27.43,27.43,0,0,1,3.11-1.9,25.35,25.35,0,0,1,2.31-1c.78-.34,1.58-.58,2.38-.84a45.63,45.63,0,0,1,9.84-1.81,95.67,95.67,0,0,1,19.84.78,194.33,194.33,0,0,0,19.66,1.89,66.25,66.25,0,0,0,19.6-1.93,66.44,66.44,0,0,1-19.6,2.3,194.82,194.82,0,0,1-19.75-1.52,94.77,94.77,0,0,0-19.65-.41,44.43,44.43,0,0,0-9.55,1.94c-.76.27-1.53.52-2.27.85a24,24,0,0,0-2.18,1,21.38,21.38,0,0,0-3.93,2.7l-.53.47A18.42,18.42,0,0,1,124.52,175.47Z\"></path><line class=\"cls-25\" x1=\"124.09\" y1=\"176.84\" x2=\"124.09\" y2=\"176.84\"></line><path class=\"cls-6\" d=\"M85.66,97.64c-6.36,1.4-5.37,6.45-5.37,6.45s2-2.43,13.09-3.74A52.36,52.36,0,0,1,85.66,97.64Z\"></path><path class=\"cls-26\" d=\"M118.59,191.58a16.4,16.4,0,0,1-.08-4.24,18.64,18.64,0,0,1,.91-4.18,18.86,18.86,0,0,1,1.87-3.9,19.81,19.81,0,0,1,2.78-3.38l.46-.42s-.63,2-.7,2.51a19.27,19.27,0,0,0-1.61,1.93,17.84,17.84,0,0,0-3.33,7.5A16.22,16.22,0,0,0,118.59,191.58Z\"></path><path class=\"cls-27\" d=\"M65.89,155.08c-3.61-4-6.65-10.29-7.95-16.2a36.79,36.79,0,0,1-.82-9.49l.14-2.38.33-2.36a23,23,0,0,1,.47-2.33,19.65,19.65,0,0,1,.6-2.3,35.6,35.6,0,0,1,3.83-8.64,39.45,39.45,0,0,1,2.68-3.89l1.53-1.8c.51-.6,1.1-1.13,1.64-1.69a37.2,37.2,0,0,1,7.47-5.68,39.82,39.82,0,0,1,8.62-3.62A39.67,39.67,0,0,0,76,98.56a36.78,36.78,0,0,0-7.22,5.83c-.52.57-1.08,1.11-1.56,1.71l-1.45,1.81a38.67,38.67,0,0,0-2.51,3.89,34.62,34.62,0,0,0-3.48,8.52,18.77,18.77,0,0,0-.52,2.24,21.9,21.9,0,0,0-.38,2.27l-.25,2.28-.06,2.3a35.25,35.25,0,0,0,1.06,9.07,36.17,36.17,0,0,0,8.62,15.83l.66.71S66.44,155.12,65.89,155.08Z\"></path><path class=\"cls-28\" d=\"M103.89,166.42A47.14,47.14,0,0,1,94,167.55,37.09,37.09,0,0,1,84,165.91,46.7,46.7,0,0,1,74.71,162a34.57,34.57,0,0,1-8.12-6.17l-.69-.74s2.38,0,3-.06a33.57,33.57,0,0,0,6.72,5.5,45.26,45.26,0,0,0,8.82,4.27A36.2,36.2,0,0,0,94,166.91,47.78,47.78,0,0,0,103.89,166.42Z\"></path></g></g></svg>"
-
-/***/ }),
-
-/***/ 81:
-/***/ (function(module, exports, __webpack_require__) {
-
-var baseIsNative = __webpack_require__(82),
-    getValue = __webpack_require__(88);
-
-/**
- * Gets the native function at `key` of `object`.
- *
- * @private
- * @param {Object} object The object to query.
- * @param {string} key The key of the method to get.
- * @returns {*} Returns the function if it's native, else `undefined`.
- */
-function getNative(object, key) {
-  var value = getValue(object, key);
-  return baseIsNative(value) ? value : undefined;
-}
-
-module.exports = getNative;
-
-
-/***/ }),
-
-/***/ 82:
-/***/ (function(module, exports, __webpack_require__) {
-
-var isFunction = __webpack_require__(83),
-    isMasked = __webpack_require__(85),
-    isObject = __webpack_require__(84),
-    toSource = __webpack_require__(87);
-
-/**
- * Used to match `RegExp`
- * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
- */
-var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
-
-/** Used to detect host constructors (Safari). */
-var reIsHostCtor = /^\[object .+?Constructor\]$/;
-
-/** Used for built-in method references. */
-var funcProto = Function.prototype,
-    objectProto = Object.prototype;
-
-/** Used to resolve the decompiled source of functions. */
-var funcToString = funcProto.toString;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
+    url.fileName = url.pathname ? url.pathname.slice(url.pathname.lastIndexOf("/") + 1) || "/" : "/";
 
-/** Used to detect if a method is native. */
-var reIsNative = RegExp('^' +
-  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
-  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-);
+    if (isChrome) {
+      url.hostname = null;
+      url.host = null;
+    }
 
-/**
- * The base implementation of `_.isNative` without bad shim checks.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a native function,
- *  else `false`.
- */
-function baseIsNative(value) {
-  if (!isObject(value) || isMasked(value)) {
-    return false;
+    gURLStore.set(location, url);
+    return url;
+  } catch (e) {
+    gURLStore.set(location, null);
+    return null;
   }
-  var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
-  return pattern.test(toSource(value));
 }
 
-module.exports = baseIsNative;
-
-
-/***/ }),
-
-/***/ 83:
-/***/ (function(module, exports, __webpack_require__) {
-
-var baseGetTag = __webpack_require__(6),
-    isObject = __webpack_require__(84);
-
-/** `Object#toString` result references. */
-var asyncTag = '[object AsyncFunction]',
-    funcTag = '[object Function]',
-    genTag = '[object GeneratorFunction]',
-    proxyTag = '[object Proxy]';
-
 /**
- * Checks if `value` is classified as a `Function` object.
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is a function, else `false`.
- * @example
- *
- * _.isFunction(_);
- * // => true
- *
- * _.isFunction(/abc/);
- * // => false
- */
-function isFunction(value) {
-  if (!isObject(value)) {
-    return false;
+* Parse a source into a short and long name as well as a host name.
+*
+* @param {String} source
+*        The source to parse. Can be a URI or names like "(eval)" or
+*        "self-hosted".
+* @return {Object}
+*         An object with the following properties:
+*           - {String} short: A short name for the source.
+*             - "http://page.com/test.js#go?q=query" -> "test.js"
+*           - {String} long: The full, long name for the source, with
+              hash/query stripped.
+*             - "http://page.com/test.js#go?q=query" -> "http://page.com/test.js"
+*           - {String?} host: If available, the host name for the source.
+*             - "http://page.com/test.js#go?q=query" -> "page.com"
+*/
+function getSourceNames(source) {
+  let data = gSourceNamesStore.get(source);
+
+  if (data) {
+    return data;
   }
-  // The use of `Object#toString` avoids issues with the `typeof` operator
-  // in Safari 9 which returns 'object' for typed arrays and other constructors.
-  var tag = baseGetTag(value);
-  return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
-}
 
-module.exports = isFunction;
+  let short, long, host;
+  const sourceStr = source ? String(source) : "";
 
+  // If `data:...` uri
+  if (isDataScheme(sourceStr)) {
+    let commaIndex = sourceStr.indexOf(",");
+    if (commaIndex > -1) {
+      // The `short` name for a data URI becomes `data:` followed by the actual
+      // encoded content, omitting the MIME type, and charset.
+      short = `data:${sourceStr.substring(commaIndex + 1)}`.slice(0, 100);
+      let result = { short, long: sourceStr };
+      gSourceNamesStore.set(source, result);
+      return result;
+    }
+  }
 
-/***/ }),
+  // If Scratchpad URI, like "Scratchpad/1"; no modifications,
+  // and short/long are the same.
+  if (isScratchpadScheme(sourceStr)) {
+    let result = { short: sourceStr, long: sourceStr };
+    gSourceNamesStore.set(source, result);
+    return result;
+  }
 
-/***/ 84:
-/***/ (function(module, exports) {
+  const parsedUrl = parseURL(sourceStr);
 
-/**
- * Checks if `value` is the
- * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
- * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
- *
- * @static
- * @memberOf _
- * @since 0.1.0
- * @category Lang
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if `value` is an object, else `false`.
- * @example
- *
- * _.isObject({});
- * // => true
- *
- * _.isObject([1, 2, 3]);
- * // => true
- *
- * _.isObject(_.noop);
- * // => true
- *
- * _.isObject(null);
- * // => false
- */
-function isObject(value) {
-  var type = typeof value;
-  return value != null && (type == 'object' || type == 'function');
-}
+  if (!parsedUrl) {
+    // Malformed URI.
+    long = sourceStr;
+    short = sourceStr.slice(0, 100);
+  } else {
+    host = parsedUrl.host;
 
-module.exports = isObject;
+    long = parsedUrl.href;
+    if (parsedUrl.hash) {
+      long = long.replace(parsedUrl.hash, "");
+    }
+    if (parsedUrl.search) {
+      long = long.replace(parsedUrl.search, "");
+    }
 
+    short = parsedUrl.fileName;
+    // If `short` is just a slash, and we actually have a path,
+    // strip the slash and parse again to get a more useful short name.
+    // e.g. "http://foo.com/bar/" -> "bar", rather than "/"
+    if (short === "/" && parsedUrl.pathname !== "/") {
+      short = parseURL(long.replace(/\/$/, "")).fileName;
+    }
+  }
 
-/***/ }),
+  if (!short) {
+    if (!long) {
+      long = UNKNOWN_SOURCE_STRING;
+    }
+    short = long.slice(0, 100);
+  }
 
-/***/ 85:
-/***/ (function(module, exports, __webpack_require__) {
+  let result = { short, long, host };
+  gSourceNamesStore.set(source, result);
+  return result;
+}
 
-var coreJsData = __webpack_require__(86);
+// For the functions below, we assume that we will never access the location
+// argument out of bounds, which is indeed the vast majority of cases.
+//
+// They are written this way because they are hot. Each frame is checked for
+// being content or chrome when processing the profile.
 
-/** Used to detect methods masquerading as native. */
-var maskSrcKey = (function() {
-  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
-  return uid ? ('Symbol(src)_1.' + uid) : '';
-}());
+function isColonSlashSlash(location, i = 0) {
+  return location.charCodeAt(++i) === CHAR_CODE_COLON && location.charCodeAt(++i) === CHAR_CODE_SLASH && location.charCodeAt(++i) === CHAR_CODE_SLASH;
+}
 
 /**
- * Checks if `func` has its source masked.
- *
- * @private
- * @param {Function} func The function to check.
- * @returns {boolean} Returns `true` if `func` is masked, else `false`.
- */
-function isMasked(func) {
-  return !!maskSrcKey && (maskSrcKey in func);
+* Checks for a Scratchpad URI, like "Scratchpad/1"
+*/
+function isScratchpadScheme(location, i = 0) {
+  return location.charCodeAt(i) === CHAR_CODE_CAP_S && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_H && location.charCodeAt(++i) === CHAR_CODE_P && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_D && location.charCodeAt(++i) === CHAR_CODE_SLASH;
 }
 
-module.exports = isMasked;
-
-
-/***/ }),
-
-/***/ 86:
-/***/ (function(module, exports, __webpack_require__) {
-
-var root = __webpack_require__(8);
-
-/** Used to detect overreaching core-js shims. */
-var coreJsData = root['__core-js_shared__'];
-
-module.exports = coreJsData;
+function isDataScheme(location, i = 0) {
+  return location.charCodeAt(i) === CHAR_CODE_D && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_COLON;
+}
 
+function isContentScheme(location, i = 0) {
+  let firstChar = location.charCodeAt(i);
 
-/***/ }),
+  switch (firstChar) {
+    // "http://" or "https://"
+    case CHAR_CODE_H:
+      if (location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_P) {
+        if (location.charCodeAt(i + 1) === CHAR_CODE_S) {
+          ++i;
+        }
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/***/ 87:
-/***/ (function(module, exports) {
+    // "file://"
+    case CHAR_CODE_F:
+      if (location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_L && location.charCodeAt(++i) === CHAR_CODE_E) {
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/** Used for built-in method references. */
-var funcProto = Function.prototype;
+    // "app://"
+    case CHAR_CODE_A:
+      if (location.charCodeAt(++i) == CHAR_CODE_P && location.charCodeAt(++i) == CHAR_CODE_P) {
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/** Used to resolve the decompiled source of functions. */
-var funcToString = funcProto.toString;
+    // "blob:"
+    case CHAR_CODE_B:
+      if (location.charCodeAt(++i) == CHAR_CODE_L && location.charCodeAt(++i) == CHAR_CODE_O && location.charCodeAt(++i) == CHAR_CODE_B && location.charCodeAt(++i) == CHAR_CODE_COLON) {
+        return isContentScheme(location, i + 1);
+      }
+      return false;
 
-/**
- * Converts `func` to its source code.
- *
- * @private
- * @param {Function} func The function to convert.
- * @returns {string} Returns the source code.
- */
-function toSource(func) {
-  if (func != null) {
-    try {
-      return funcToString.call(func);
-    } catch (e) {}
-    try {
-      return (func + '');
-    } catch (e) {}
+    default:
+      return false;
   }
-  return '';
 }
 
-module.exports = toSource;
+function isChromeScheme(location, i = 0) {
+  let firstChar = location.charCodeAt(i);
 
+  switch (firstChar) {
+    // "chrome://"
+    case CHAR_CODE_C:
+      if (location.charCodeAt(++i) === CHAR_CODE_H && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_M && location.charCodeAt(++i) === CHAR_CODE_E) {
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/***/ }),
+    // "resource://"
+    case CHAR_CODE_R:
+      if (location.charCodeAt(++i) === CHAR_CODE_E && location.charCodeAt(++i) === CHAR_CODE_S && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_U && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_E) {
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/***/ 88:
-/***/ (function(module, exports) {
+    // "jar:file://"
+    case CHAR_CODE_J:
+      if (location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_R && location.charCodeAt(++i) === CHAR_CODE_COLON && location.charCodeAt(++i) === CHAR_CODE_F && location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_L && location.charCodeAt(++i) === CHAR_CODE_E) {
+        return isColonSlashSlash(location, i);
+      }
+      return false;
 
-/**
- * Gets the value at `key` of `object`.
- *
- * @private
- * @param {Object} [object] The object to query.
- * @param {string} key The key of the property to get.
- * @returns {*} Returns the property value.
- */
-function getValue(object, key) {
-  return object == null ? undefined : object[key];
+    default:
+      return false;
+  }
 }
 
-module.exports = getValue;
-
-
-/***/ }),
-
-/***/ 89:
-/***/ (function(module, exports) {
+function isWASM(location, i = 0) {
+  return (
+    // "wasm-function["
+    location.charCodeAt(i) === CHAR_CODE_W && location.charCodeAt(++i) === CHAR_CODE_A && location.charCodeAt(++i) === CHAR_CODE_S && location.charCodeAt(++i) === CHAR_CODE_M && location.charCodeAt(++i) === CHAR_CODE_DASH && location.charCodeAt(++i) === CHAR_CODE_F && location.charCodeAt(++i) === CHAR_CODE_U && location.charCodeAt(++i) === CHAR_CODE_N && location.charCodeAt(++i) === CHAR_CODE_C && location.charCodeAt(++i) === CHAR_CODE_T && location.charCodeAt(++i) === CHAR_CODE_I && location.charCodeAt(++i) === CHAR_CODE_O && location.charCodeAt(++i) === CHAR_CODE_N && location.charCodeAt(++i) === CHAR_CODE_L_SQUARE_BRACKET
+  );
+}
 
 /**
- * Removes `key` and its value from the hash.
- *
- * @private
- * @name delete
- * @memberOf Hash
- * @param {Object} hash The hash to modify.
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function hashDelete(key) {
-  var result = this.has(key) && delete this.__data__[key];
-  this.size -= result ? 1 : 0;
-  return result;
+* A utility method to get the file name from a sourcemapped location
+* The sourcemap location can be in any form. This method returns a
+* formatted file name for different cases like Windows or OSX.
+* @param source
+* @returns String
+*/
+function getSourceMappedFile(source) {
+  // If sourcemapped source is a OSX path, return
+  // the characters after last "/".
+  // If sourcemapped source is a Windowss path, return
+  // the characters after last "\\".
+  if (source.lastIndexOf("/") >= 0) {
+    source = source.slice(source.lastIndexOf("/") + 1);
+  } else if (source.lastIndexOf("\\") >= 0) {
+    source = source.slice(source.lastIndexOf("\\") + 1);
+  }
+  return source;
 }
 
-module.exports = hashDelete;
-
-
-/***/ }),
-
-/***/ 9:
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(global) {/** Detect free variable `global` from Node.js. */
-var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
-
-module.exports = freeGlobal;
-
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(792)))
+module.exports = {
+  parseURL,
+  getSourceNames,
+  isScratchpadScheme,
+  isChromeScheme,
+  isContentScheme,
+  isWASM,
+  isDataScheme,
+  getSourceMappedFile
+};
 
 /***/ }),
 
-/***/ 90:
+/***/ 3753:
 /***/ (function(module, exports, __webpack_require__) {
 
-var nativeCreate = __webpack_require__(80);
+"use strict";
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 a chrome-API-free version of the module
+// devtools/client/shared/unicode-url.js in the mozilla-central repository, so
+// that it can be used in Chrome-API-free applications, such as the Launchpad.
+// But because of this, it cannot take advantage of utilizing chrome APIs and
+// should implement the similar functionalities on its own.
+//
+// Please keep in mind that if the feature in this file has changed, don't
+// forget to also change that accordingly in
+// devtools/client/shared/unicode-url.js in the mozilla-central repository.
 
-/** Used to stand-in for `undefined` hash values. */
-var HASH_UNDEFINED = '__lodash_hash_undefined__';
 
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
 
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
+const punycode = __webpack_require__(3641);
 
 /**
- * Gets the hash value for `key`.
+ * Gets a readble Unicode hostname from a hostname.
+ *
+ * If the `hostname` is a readable ASCII hostname, such as example.org, then
+ * this function will simply return the original `hostname`.
+ *
+ * If the `hostname` is a Punycode hostname representing a Unicode domain name,
+ * such as xn--g6w.xn--8pv, then this function will return the readable Unicode
+ * domain name by decoding the Punycode hostname.
  *
- * @private
- * @name get
- * @memberOf Hash
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
+ * @param {string}  hostname
+ *                  the hostname from which the Unicode hostname will be
+ *                  parsed, such as example.org, xn--g6w.xn--8pv.
+ * @return {string} The Unicode hostname. It may be the same as the `hostname`
+ *                  passed to this function if the `hostname` itself is
+ *                  a readable ASCII hostname or a Unicode hostname.
  */
-function hashGet(key) {
-  var data = this.__data__;
-  if (nativeCreate) {
-    var result = data[key];
-    return result === HASH_UNDEFINED ? undefined : result;
-  }
-  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+function getUnicodeHostname(hostname) {
+  try {
+    return punycode.toUnicode(hostname);
+  } catch (err) {}
+  return hostname;
 }
 
-module.exports = hashGet;
-
-
-/***/ }),
-
-/***/ 91:
-/***/ (function(module, exports, __webpack_require__) {
-
-var nativeCreate = __webpack_require__(80);
-
-/** Used for built-in method references. */
-var objectProto = Object.prototype;
-
-/** Used to check objects for own properties. */
-var hasOwnProperty = objectProto.hasOwnProperty;
-
 /**
- * Checks if a hash value for `key` exists.
+ * Gets a readble Unicode URL pathname from a URL pathname.
+ *
+ * If the `urlPath` is a readable ASCII URL pathname, such as /a/b/c.js, then
+ * this function will simply return the original `urlPath`.
+ *
+ * If the `urlPath` is a URI-encoded pathname, such as %E8%A9%A6/%E6%B8%AC.js,
+ * then this function will return the readable Unicode pathname.
  *
- * @private
- * @name has
- * @memberOf Hash
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ * If the `urlPath` is a malformed URL pathname, then this function will simply
+ * return the original `urlPath`.
+ *
+ * @param {string}  urlPath
+ *                  the URL path from which the Unicode URL path will be parsed,
+ *                  such as /a/b/c.js, %E8%A9%A6/%E6%B8%AC.js.
+ * @return {string} The Unicode URL Path. It may be the same as the `urlPath`
+ *                  passed to this function if the `urlPath` itself is a readable
+ *                  ASCII url or a Unicode url.
  */
-function hashHas(key) {
-  var data = this.__data__;
-  return nativeCreate ? (data[key] !== undefined) : hasOwnProperty.call(data, key);
+function getUnicodeUrlPath(urlPath) {
+  try {
+    return decodeURIComponent(urlPath);
+  } catch (err) {}
+  return urlPath;
 }
 
-module.exports = hashHas;
-
-
-/***/ }),
-
-/***/ 919:
-/***/ (function(module, exports) {
-
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 1792 1792\"><path d=\"M1395 1184q0 13-10 23l-50 50q-10 10-23 10t-23-10l-393-393-393 393q-10 10-23 10t-23-10l-50-50q-10-10-10-23t10-23l466-466q10-10 23-10t23 10l466 466q10 10 10 23z\" fill=\"#696969\"></path></svg>"
-
-/***/ }),
-
-/***/ 92:
-/***/ (function(module, exports, __webpack_require__) {
-
-var nativeCreate = __webpack_require__(80);
-
-/** Used to stand-in for `undefined` hash values. */
-var HASH_UNDEFINED = '__lodash_hash_undefined__';
-
 /**
- * Sets the hash `key` to `value`.
+ * Gets a readable Unicode URL from a URL.
+ *
+ * If the `url` is a readable ASCII URL, such as http://example.org/a/b/c.js,
+ * then this function will simply return the original `url`.
+ *
+ * If the `url` includes either an unreadable Punycode domain name or an
+ * unreadable URI-encoded pathname, such as
+ * http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js, then this function will return
+ * the readable URL by decoding all its unreadable URL components to Unicode
+ * characters.
+ *
+ * If the `url` is a malformed URL, then this function will return the original
+ * `url`.
+ *
+ * If the `url` is a data: URI, then this function will return the original
+ * `url`.
  *
- * @private
- * @name set
- * @memberOf Hash
- * @param {string} key The key of the value to set.
- * @param {*} value The value to set.
- * @returns {Object} Returns the hash instance.
+ * @param {string}  url
+ *                  the full URL, or a data: URI. from which the readable URL
+ *                  will be parsed, such as, http://example.org/a/b/c.js,
+ *                  http://xn--g6w.xn--8pv/%E8%A9%A6/%E6%B8%AC.js
+ * @return {string} The readable URL. It may be the same as the `url` passed to
+ *                  this function if the `url` itself is readable.
  */
-function hashSet(key, value) {
-  var data = this.__data__;
-  this.size += this.has(key) ? 0 : 1;
-  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
-  return this;
+function getUnicodeUrl(url) {
+  try {
+    const { protocol, hostname } = new URL(url);
+    if (protocol === "data:") {
+      // Never convert a data: URI.
+      return url;
+    }
+    const readableHostname = getUnicodeHostname(hostname);
+    url = decodeURIComponent(url);
+    return url.replace(hostname, readableHostname);
+  } catch (err) {}
+  return url;
 }
 
-module.exports = hashSet;
-
+module.exports = {
+  getUnicodeHostname,
+  getUnicodeUrlPath,
+  getUnicodeUrl
+};
 
 /***/ }),
 
-/***/ 920:
+/***/ 4:
 /***/ (function(module, exports) {
 
-module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 1792 1792\"><path d=\"M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z\" fill=\"#696969\"></path></svg>"
-
-/***/ }),
-
-/***/ 93:
-/***/ (function(module, exports, __webpack_require__) {
-
-var listCacheClear = __webpack_require__(94),
-    listCacheDelete = __webpack_require__(95),
-    listCacheGet = __webpack_require__(98),
-    listCacheHas = __webpack_require__(99),
-    listCacheSet = __webpack_require__(100);
-
-/**
- * Creates an list cache object.
- *
- * @private
- * @constructor
- * @param {Array} [entries] The key-value pairs to cache.
- */
-function ListCache(entries) {
-  var index = -1,
-      length = entries == null ? 0 : entries.length;
-
-  this.clear();
-  while (++index < length) {
-    var entry = entries[index];
-    this.set(entry[0], entry[1]);
-  }
-}
-
-// Add methods to `ListCache`.
-ListCache.prototype.clear = listCacheClear;
-ListCache.prototype['delete'] = listCacheDelete;
-ListCache.prototype.get = listCacheGet;
-ListCache.prototype.has = listCacheHas;
-ListCache.prototype.set = listCacheSet;
-
-module.exports = ListCache;
-
+module.exports = __WEBPACK_EXTERNAL_MODULE_4__;
 
 /***/ }),
 
-/***/ 94:
+/***/ 52:
 /***/ (function(module, exports) {
 
-/**
- * Removes all key-value entries from the list cache.
- *
- * @private
- * @name clear
- * @memberOf ListCache
- */
-function listCacheClear() {
-  this.__data__ = [];
-  this.size = 0;
-}
-
-module.exports = listCacheClear;
-
+module.exports = __WEBPACK_EXTERNAL_MODULE_52__;
 
 /***/ }),
 
-/***/ 95:
+/***/ 66:
 /***/ (function(module, exports, __webpack_require__) {
 
-var assocIndexOf = __webpack_require__(96);
-
-/** Used for built-in method references. */
-var arrayProto = Array.prototype;
-
-/** Built-in value references. */
-var splice = arrayProto.splice;
-
-/**
- * Removes `key` and its value from the list cache.
- *
- * @private
- * @name delete
- * @memberOf ListCache
- * @param {string} key The key of the value to remove.
- * @returns {boolean} Returns `true` if the entry was removed, else `false`.
- */
-function listCacheDelete(key) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
+"use strict";
 
-  if (index < 0) {
-    return false;
-  }
-  var lastIndex = data.length - 1;
-  if (index == lastIndex) {
-    data.pop();
-  } else {
-    splice.call(data, index, 1);
-  }
-  --this.size;
-  return true;
-}
 
-module.exports = listCacheDelete;
+exports.decode = exports.parse = __webpack_require__(121);
+exports.encode = exports.stringify = __webpack_require__(122);
 
 
 /***/ }),
 
-/***/ 96:
-/***/ (function(module, exports, __webpack_require__) {
-
-var eq = __webpack_require__(97);
-
-/**
- * Gets the index at which the `key` is found in `array` of key-value pairs.
- *
- * @private
- * @param {Array} array The array to inspect.
- * @param {*} key The key to search for.
- * @returns {number} Returns the index of the matched value, else `-1`.
- */
-function assocIndexOf(array, key) {
-  var length = array.length;
-  while (length--) {
-    if (eq(array[length][0], key)) {
-      return length;
-    }
-  }
-  return -1;
-}
+/***/ 792:
+/***/ (function(module, exports) {
 
-module.exports = assocIndexOf;
+var g;
+
+// This works in non-strict mode
+g = (function() {
+	return this;
+})();
+
+try {
+	// This works if eval is allowed (see CSP)
+	g = g || Function("return this")() || (1,eval)("this");
+} catch(e) {
+	// This works if the window reference is available
+	if(typeof window === "object")
+		g = window;
+}
+
+// g can still be undefined, but nothing to do about it...
+// We return undefined, instead of nothing here, so it's
+// easier to handle this case. if(!global) { ...}
+
+module.exports = g;
 
 
 /***/ }),
 
-/***/ 97:
+/***/ 793:
 /***/ (function(module, exports) {
 
-/**
- * Performs a
- * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
- * comparison between two values to determine if they are equivalent.
- *
- * @static
- * @memberOf _
- * @since 4.0.0
- * @category Lang
- * @param {*} value The value to compare.
- * @param {*} other The other value to compare.
- * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
- * @example
- *
- * var object = { 'a': 1 };
- * var other = { 'a': 1 };
- *
- * _.eq(object, object);
- * // => true
- *
- * _.eq(object, other);
- * // => false
- *
- * _.eq('a', 'a');
- * // => true
- *
- * _.eq('a', Object('a'));
- * // => false
- *
- * _.eq(NaN, NaN);
- * // => true
- */
-function eq(value, other) {
-  return value === other || (value !== value && other !== other);
-}
-
-module.exports = eq;
+module.exports = function(module) {
+	if(!module.webpackPolyfill) {
+		module.deprecate = function() {};
+		module.paths = [];
+		// module.parent = undefined by default
+		if(!module.children) module.children = [];
+		Object.defineProperty(module, "loaded", {
+			enumerable: true,
+			get: function() {
+				return module.l;
+			}
+		});
+		Object.defineProperty(module, "id", {
+			enumerable: true,
+			get: function() {
+				return module.i;
+			}
+		});
+		module.webpackPolyfill = 1;
+	}
+	return module;
+};
 
 
 /***/ }),
 
-/***/ 98:
-/***/ (function(module, exports, __webpack_require__) {
-
-var assocIndexOf = __webpack_require__(96);
-
-/**
- * Gets the list cache value for `key`.
- *
- * @private
- * @name get
- * @memberOf ListCache
- * @param {string} key The key of the value to get.
- * @returns {*} Returns the entry value.
- */
-function listCacheGet(key) {
-  var data = this.__data__,
-      index = assocIndexOf(data, key);
-
-  return index < 0 ? undefined : data[index][1];
-}
-
-module.exports = listCacheGet;
+/***/ 806:
+/***/ (function(module, exports) {
 
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" viewBox=\"0 0 256 256\"><defs><style>.cls-1{isolation:isolate;}.cls-17,.cls-2,.cls-25{fill:none;}.cls-17,.cls-2{stroke-miterlimit:10;}.cls-2{stroke-width:0.75px;stroke:url(#linear-gradient);}.cls-3{fill:url(#linear-gradient-2);}.cls-4{fill:#f15a24;}.cls-5{fill:#ed1c24;}.cls-6{fill:#c1272d;}.cls-7{fill:url(#linear-gradient-3);}.cls-8{fill:url(#linear-gradient-4);}.cls-9{fill:url(#linear-gradient-5);}.cls-10{fill:url(#linear-gradient-6);}.cls-11{opacity:0.49;fill:url(#linear-gradient-7);}.cls-12{fill:url(#linear-gradient-8);}.cls-13{fill:#2db5f9;}.cls-13,.cls-14{mix-blend-mode:screen;}.cls-14{fill:#5fd2ff;}.cls-15{fill:#219058;}.cls-16{fill:url(#linear-gradient-9);}.cls-17{stroke:#fff;stroke-width:1.87px;}.cls-18{fill:#f7b852;}.cls-19{fill:#ff8431;}.cls-20{fill:#fffb69;}.cls-21{fill:#44c688;}.cls-22{fill:#29b36e;}.cls-23{fill:#6fd191;}.cls-24{fill:#c83ad7;}.cls-26{fill:#fba9ff;}.cls-27{fill:#ff737d;}.cls-28{fill:#fdc666;}</style><linearGradient id=\"linear-gradient\" x1=\"67.45\" y1=\"154.72\" x2=\"67.29\" y2=\"155.43\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#ff1d25\" stop-opacity=\"0.5\"></stop><stop offset=\"0.06\" stop-color=\"#ff1d25\" stop-opacity=\"0.54\"></stop><stop offset=\"0.37\" stop-color=\"#ff1d25\" stop-opacity=\"0.74\"></stop><stop offset=\"0.64\" stop-color=\"#ff1d25\" stop-opacity=\"0.88\"></stop><stop offset=\"0.86\" stop-color=\"#ff1d25\" stop-opacity=\"0.97\"></stop><stop offset=\"1\" stop-color=\"#ff1d25\"></stop></linearGradient><linearGradient id=\"linear-gradient-2\" x1=\"73.09\" y1=\"170.74\" x2=\"73.09\" y2=\"153.5\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#ffdd42\"></stop><stop offset=\"1\" stop-color=\"#fb784b\"></stop></linearGradient><linearGradient id=\"linear-gradient-3\" x1=\"201.52\" y1=\"95.13\" x2=\"207.88\" y2=\"89.89\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#5bcb99\"></stop><stop offset=\"1\" stop-color=\"#85a8e8\"></stop></linearGradient><linearGradient id=\"linear-gradient-4\" x1=\"81.17\" y1=\"158.3\" x2=\"279.32\" y2=\"55.49\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#34e28b\"></stop><stop offset=\"1\"></stop></linearGradient><linearGradient id=\"linear-gradient-5\" x1=\"117.57\" y1=\"178.22\" x2=\"133.15\" y2=\"178.22\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#c297ff\"></stop><stop offset=\"1\" stop-color=\"#ae31bb\"></stop></linearGradient><linearGradient id=\"linear-gradient-6\" x1=\"54.05\" y1=\"253.29\" x2=\"251.08\" y2=\"99.63\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"1\" stop-color=\"#d23de2\"></stop></linearGradient><linearGradient id=\"linear-gradient-7\" x1=\"199.8\" y1=\"86.45\" x2=\"191.83\" y2=\"113.37\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"1\" stop-opacity=\"0\"></stop></linearGradient><linearGradient id=\"linear-gradient-8\" x1=\"126.87\" y1=\"190.63\" x2=\"182.9\" y2=\"204.2\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\" stop-color=\"#2db5f9\"></stop><stop offset=\"1\" stop-color=\"#092432\"></stop></linearGradient><linearGradient id=\"linear-gradient-9\" x1=\"83.08\" y1=\"49.55\" x2=\"46.06\" y2=\"151.24\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0\"></stop><stop offset=\"0.21\" stop-color=\"#48080a\"></stop><stop offset=\"0.42\" stop-color=\"#891014\"></stop><stop offset=\"0.61\" stop-color=\"#bc151b\"></stop><stop offset=\"0.78\" stop-color=\"#e01a21\"></stop><stop offset=\"0.91\" stop-color=\"#f71c24\"></stop><stop offset=\"1\" stop-color=\"#ff1d25\"></stop></linearGradient></defs><title>dojo_square</title><g class=\"cls-1\"><g id=\"Layer_1\" data-name=\"Layer 1\"><line class=\"cls-2\" x1=\"67.37\" y1=\"155.08\" x2=\"67.37\" y2=\"155.08\"></line><path class=\"cls-3\" d=\"M42.28,150.4l.52.82A58,58,0,0,0,52,161.49a45.23,45.23,0,0,0,28.74,10.25c.65,0,1.31,0,2,0a67.32,67.32,0,0,0,21.13-5.26,67.38,67.38,0,0,1-9.09.83,36.92,36.92,0,0,1-27.44-12.17A66.82,66.82,0,0,1,42.28,150.4Z\"></path><path class=\"cls-4\" d=\"M80.79,80.88a45.4,45.4,0,0,1,38.89,21.94A37,37,0,0,0,84.43,94.7c8.29,4,19.66,7.08,35.28,8.15,0,0-.77-14.87-19.8-22.64-26.57-10.84-30.33-8.69-37.06-19.9a30.09,30.09,0,0,0,6,22.15A45.45,45.45,0,0,1,80.79,80.88Z\"></path><path class=\"cls-5\" d=\"M99.92,80.21c-9.1-3.71-15.52-5.9-20.3-7.62A33.4,33.4,0,0,0,84.54,81a45.42,45.42,0,0,1,35.13,21.78,36.87,36.87,0,0,0-20.54-9.34,109,109,0,0,0,20,9.32l.59,0S118.94,88,99.92,80.21Z\"></path><path class=\"cls-6\" d=\"M119.69,102.85h.1c.29-1.62,2.07-14.46-12.4-25.7C85.78,60.37,81.56,58.82,80.53,49.94a27.8,27.8,0,0,0-.91,22.65c4.78,1.72,11.21,3.91,20.3,7.62,19,7.77,19.8,22.64,19.8,22.64Z\"></path><path class=\"cls-7\" d=\"M185.28,88.22a33.64,33.64,0,0,1,22.08,8.23,29.8,29.8,0,0,1,19,8S208.22,78,176.19,89a41.72,41.72,0,0,0-8.2,4A33.64,33.64,0,0,1,185.28,88.22Z\"></path><path class=\"cls-8\" d=\"M185.28,88.22A33.62,33.62,0,0,0,168,93l.93-.56c-25.88,15.24-57.6,62.06-101.56,62.65h0a36.92,36.92,0,0,0,27.44,12.17,67.38,67.38,0,0,0,9.09-.83c28.6-11.79,56.09-40,68.55-53.64,11.56-12.67,24.22-17,34.91-16.34A33.64,33.64,0,0,0,185.28,88.22Z\"></path><path class=\"cls-9\" d=\"M118.48,179a20.94,20.94,0,0,0-.92,5.86,22.25,22.25,0,0,0,1,6.74,16.56,16.56,0,0,1,5.5-14.74c0-.17.09-.34.14-.51a20.37,20.37,0,0,1,8.91-11.47l-.08,0a37.84,37.84,0,0,0-4,1.53A20.87,20.87,0,0,0,118.48,179Z\"></path><path class=\"cls-10\" d=\"M234.26,129.11a42.41,42.41,0,0,0-7.94-24.76,29.82,29.82,0,0,0-19-7.9A33.69,33.69,0,0,1,219.06,122c0,11.34-4.12,24.3-17.45,31.28-19.42,10.16-49.21,5.33-68.54,11.6l.08,0a20.37,20.37,0,0,0-8.91,11.47c-.05.17-.09.34-.14.51h0c5.67-5,16.84-8.54,38.63-5.73,15.56,2,27.93,2.55,38.54-.5a41.2,41.2,0,0,0,25.23-17h0A42.41,42.41,0,0,0,234.26,129.11Z\"></path><path class=\"cls-11\" d=\"M234.26,129.11a42.41,42.41,0,0,0-7.94-24.76,29.82,29.82,0,0,0-19-7.9A33.69,33.69,0,0,1,219.06,122c0,11.34-4.12,24.3-17.45,31.28-19.42,10.16-49.21,5.33-68.54,11.6l.08,0a20.37,20.37,0,0,0-8.91,11.47c-.05.17-.09.34-.14.51h0c5.67-5,16.84-8.54,38.63-5.73,15.56,2,27.93,2.55,38.54-.5a41.2,41.2,0,0,0,25.23-17h0A42.41,42.41,0,0,0,234.26,129.11Z\"></path><path class=\"cls-12\" d=\"M137.8,201.88a20.44,20.44,0,0,1-13.68-25.12h0l0,.08a16.56,16.56,0,0,0-5.5,14.73,20.94,20.94,0,0,0,33.63,9.38A20.37,20.37,0,0,1,137.8,201.88Z\"></path><path class=\"cls-13\" d=\"M144.91,200.4c2.12-6.17,9-15.7,16.33-11.34,0,0,6,3.36,7.23-6.11,0,0,4.49,22.28-17.1,21.53,0,0,4.86-3.55,4.81-7.2A24.73,24.73,0,0,1,144.91,200.4Z\"></path><path class=\"cls-14\" d=\"M153.52,186.75c2.14-1.09,4.16-2.18,8.08-.44,3,1.35,6.88-3.94,3.56-8.66,0,0,.21,4.88-3.72,4.84A8.81,8.81,0,0,0,153.52,186.75Z\"></path><path class=\"cls-15\" d=\"M175.21,115.88c-5.17,7-12.75,12.95-13.64,14.39s1.5,6.11,5,6.45.82-1.36.52-3,1.06,1,5.27.42-1.53-2.2-1.14-4.33,4.74-6.17,6.47-10.25,4.7,0,3.18,3.18c-.6,1.26,4.81-3.54,2.08-7.21S178.22,111.77,175.21,115.88Z\"></path><path class=\"cls-15\" d=\"M160.47,131.28c-.76.73-3,2.37-3,2.37s2.19,3.05,5,3c0,0,.61-.29-.27-1.18S160.27,131.82,160.47,131.28Z\"></path><path class=\"cls-16\" d=\"M84.43,94.7c-7.35-3.56-12.27-7.88-15.54-12.24A45.42,45.42,0,0,0,42.28,150.4a66.82,66.82,0,0,0,25.09,4.67h0A37,37,0,0,1,84.43,94.7Z\"></path><line class=\"cls-17\" x1=\"67.37\" y1=\"155.08\" x2=\"67.37\" y2=\"155.08\"></line><path class=\"cls-18\" d=\"M84.52,81c2,2.91,7.81,7.94,14.63,12.44a36.87,36.87,0,0,1,20.52,9.33A45.42,45.42,0,0,0,84.52,81Z\"></path><path class=\"cls-19\" d=\"M84.52,81c-1.23-.1-2.48-.16-3.74-.16a45.45,45.45,0,0,0-11.89,1.58c3.27,4.36,8.19,8.67,15.54,12.24a36.72,36.72,0,0,1,14.72-1.22C92.33,89,86.54,83.95,84.52,81Z\"></path><path class=\"cls-20\" d=\"M109.73,91.38a33.29,33.29,0,0,0-12.21-7.29C100.46,89.66,103,91.38,109.73,91.38Z\"></path><path class=\"cls-6\" d=\"M96.89,67.66a63.16,63.16,0,0,1,6.54,4.58c.52.39-.93-3.55-2.62-4.3A7.5,7.5,0,0,0,96.89,67.66Z\"></path><path class=\"cls-6\" d=\"M105,73.37a70.75,70.75,0,0,1,6.5,4.64c.53.38-.9-3.56-2.57-4.33A7.5,7.5,0,0,0,105,73.37Z\"></path><path class=\"cls-6\" d=\"M112.55,79a19.59,19.59,0,0,1,3.52,4.39c.26.38.07-2.58-.92-3.42A5.28,5.28,0,0,0,112.55,79Z\"></path><path class=\"cls-21\" d=\"M77.55,151c-.2-.65,2.35-1.48,3-1.51a11.91,11.91,0,0,1,3.57,1.19,16.34,16.34,0,0,1-4.89,1A4.46,4.46,0,0,1,77.55,151Z\"></path><path class=\"cls-21\" d=\"M86.73,148.78c-.22-.51,1.75-1.38,2.29-1.46a9.58,9.58,0,0,1,3,.65,13.15,13.15,0,0,1-3.83,1.23A3.59,3.59,0,0,1,86.73,148.78Z\"></path><path class=\"cls-21\" d=\"M94.41,146c-.22-.4,1.32-1.29,1.76-1.41a7.92,7.92,0,0,1,2.48.27,10.87,10.87,0,0,1-3,1.35A3,3,0,0,1,94.41,146Z\"></path><path class=\"cls-21\" d=\"M100.52,143.19c-.23-.35,1.11-1.27,1.5-1.41a7.25,7.25,0,0,1,2.29.07,10,10,0,0,1-2.67,1.45A2.72,2.72,0,0,1,100.52,143.19Z\"></path><path class=\"cls-21\" d=\"M106.23,140.07c-.22-.29.9-1.16,1.24-1.3a6.31,6.31,0,0,1,2,0,8.66,8.66,0,0,1-2.25,1.39A2.36,2.36,0,0,1,106.23,140.07Z\"></path><path class=\"cls-21\" d=\"M68.34,151.69c-.11-.73,2.73-1.16,3.46-1.09a12.76,12.76,0,0,1,3.57,1.86,17.51,17.51,0,0,1-5.35.26A4.78,4.78,0,0,1,68.34,151.69Z\"></path><path class=\"cls-6\" d=\"M70.08,65.82c2,2.27,6.68,3.74,6.68,3.74A19,19,0,0,1,75.83,62c0-.18-5.75-.09-6.73-4.81C68.91,56.23,68.1,63.55,70.08,65.82Z\"></path><path class=\"cls-4\" d=\"M50.54,174.68a5.49,5.49,0,0,1,2.24-3.88l.19-.11a14,14,0,0,0-1.43-.25c-6.85-1-8.59,3.06-8.95,7.64,0,.26,0,.53,0,.78a8.31,8.31,0,0,1,7.89-4.2Z\"></path><path class=\"cls-4\" d=\"M58.88,173.19c-6.81-4.13-10.63-4.43-12.15,7.14,0,0,7.17-5.67,10.55-1.92,3.68,4.07,8.68.32,6.05-2.06A18.77,18.77,0,0,0,58.88,173.19Z\"></path><path class=\"cls-4\" d=\"M56.06,174.53c-3.86,2.57-3.86,8.62-3.86,8.62s7-3.81,6.5-6.19A2.93,2.93,0,0,0,56.06,174.53Z\"></path><path class=\"cls-4\" d=\"M24,127a5.49,5.49,0,0,1,4.43-.68l.2.08a14,14,0,0,0-.7-1.27c-3.49-6-7.76-4.79-11.56-2.21-.22.15-.43.31-.63.47a8.31,8.31,0,0,1,8.21,3.53Z\"></path><path class=\"cls-4\" d=\"M31.29,134.08c-2.48-9.82-4.47-13.62-14-6.83,0,0,8.13-2.34,9.06,9.22.44,5.47,5.69,6.57,5.63,3A18.77,18.77,0,0,0,31.29,134.08Z\"></path><path class=\"cls-4\" d=\"M27.83,128.82c-4.52-1.07-8.94,3.06-8.94,3.06s6.94-.24,7.78,4C27.14,138.23,27.83,128.82,27.83,128.82Z\"></path><path class=\"cls-22\" d=\"M172.45,112.79a55.39,55.39,0,0,1,15.49-12.5c5.64-3,13.66-4.84,18.5-4.61l1.85,1.59-1-.08a37.75,37.75,0,0,0-19,3.76A55,55,0,0,0,172.45,112.79Z\"></path><path class=\"cls-23\" d=\"M207.12,95.74a34.5,34.5,0,0,1,10.45,2.68,27.42,27.42,0,0,1,8.81,6,27.05,27.05,0,0,0-9.09-5.29,43.65,43.65,0,0,0-9-1.84l-1.84-1.59Z\"></path><path class=\"cls-24\" d=\"M124.52,175.47a27.43,27.43,0,0,1,3.11-1.9,25.35,25.35,0,0,1,2.31-1c.78-.34,1.58-.58,2.38-.84a45.63,45.63,0,0,1,9.84-1.81,95.67,95.67,0,0,1,19.84.78,194.33,194.33,0,0,0,19.66,1.89,66.25,66.25,0,0,0,19.6-1.93,66.44,66.44,0,0,1-19.6,2.3,194.82,194.82,0,0,1-19.75-1.52,94.77,94.77,0,0,0-19.65-.41,44.43,44.43,0,0,0-9.55,1.94c-.76.27-1.53.52-2.27.85a24,24,0,0,0-2.18,1,21.38,21.38,0,0,0-3.93,2.7l-.53.47A18.42,18.42,0,0,1,124.52,175.47Z\"></path><line class=\"cls-25\" x1=\"124.09\" y1=\"176.84\" x2=\"124.09\" y2=\"176.84\"></line><path class=\"cls-6\" d=\"M85.66,97.64c-6.36,1.4-5.37,6.45-5.37,6.45s2-2.43,13.09-3.74A52.36,52.36,0,0,1,85.66,97.64Z\"></path><path class=\"cls-26\" d=\"M118.59,191.58a16.4,16.4,0,0,1-.08-4.24,18.64,18.64,0,0,1,.91-4.18,18.86,18.86,0,0,1,1.87-3.9,19.81,19.81,0,0,1,2.78-3.38l.46-.42s-.63,2-.7,2.51a19.27,19.27,0,0,0-1.61,1.93,17.84,17.84,0,0,0-3.33,7.5A16.22,16.22,0,0,0,118.59,191.58Z\"></path><path class=\"cls-27\" d=\"M65.89,155.08c-3.61-4-6.65-10.29-7.95-16.2a36.79,36.79,0,0,1-.82-9.49l.14-2.38.33-2.36a23,23,0,0,1,.47-2.33,19.65,19.65,0,0,1,.6-2.3,35.6,35.6,0,0,1,3.83-8.64,39.45,39.45,0,0,1,2.68-3.89l1.53-1.8c.51-.6,1.1-1.13,1.64-1.69a37.2,37.2,0,0,1,7.47-5.68,39.82,39.82,0,0,1,8.62-3.62A39.67,39.67,0,0,0,76,98.56a36.78,36.78,0,0,0-7.22,5.83c-.52.57-1.08,1.11-1.56,1.71l-1.45,1.81a38.67,38.67,0,0,0-2.51,3.89,34.62,34.62,0,0,0-3.48,8.52,18.77,18.77,0,0,0-.52,2.24,21.9,21.9,0,0,0-.38,2.27l-.25,2.28-.06,2.3a35.25,35.25,0,0,0,1.06,9.07,36.17,36.17,0,0,0,8.62,15.83l.66.71S66.44,155.12,65.89,155.08Z\"></path><path class=\"cls-28\" d=\"M103.89,166.42A47.14,47.14,0,0,1,94,167.55,37.09,37.09,0,0,1,84,165.91,46.7,46.7,0,0,1,74.71,162a34.57,34.57,0,0,1-8.12-6.17l-.69-.74s2.38,0,3-.06a33.57,33.57,0,0,0,6.72,5.5,45.26,45.26,0,0,0,8.82,4.27A36.2,36.2,0,0,0,94,166.91,47.78,47.78,0,0,0,103.89,166.42Z\"></path></g></g></svg>"
 
 /***/ }),
 
-/***/ 99:
-/***/ (function(module, exports, __webpack_require__) {
+/***/ 919:
+/***/ (function(module, exports) {
 
-var assocIndexOf = __webpack_require__(96);
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 1792 1792\"><path d=\"M1395 1184q0 13-10 23l-50 50q-10 10-23 10t-23-10l-393-393-393 393q-10 10-23 10t-23-10l-50-50q-10-10-10-23t10-23l466-466q10-10 23-10t23 10l466 466q10 10 10 23z\" fill=\"#696969\"></path></svg>"
 
-/**
- * Checks if a list cache value for `key` exists.
- *
- * @private
- * @name has
- * @memberOf ListCache
- * @param {string} key The key of the entry to check.
- * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
- */
-function listCacheHas(key) {
-  return assocIndexOf(this.__data__, key) > -1;
-}
+/***/ }),
 
-module.exports = listCacheHas;
+/***/ 920:
+/***/ (function(module, exports) {
 
+module.exports = "<!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.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\" viewBox=\"0 0 1792 1792\"><path d=\"M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z\" fill=\"#696969\"></path></svg>"
 
 /***/ }),
 
 /***/ 993:
 /***/ (function(module, exports, __webpack_require__) {
diff --git a/devtools/client/debugger/new/src/actions/breakpoints.js b/devtools/client/debugger/new/src/actions/breakpoints.js
--- a/devtools/client/debugger/new/src/actions/breakpoints.js
+++ b/devtools/client/debugger/new/src/actions/breakpoints.js
@@ -57,14 +57,20 @@
     dispatch,
     getState,
     client,
     sourceMaps
   }) => {
+    const response = await (0, _syncBreakpoint.syncClientBreakpoint)(getState, client, sourceMaps, sourceId, pendingBreakpoint);
+
+    if (!response) {
+      return;
+    }
+
     const {
       breakpoint,
       previousLocation
-    } = await (0, _syncBreakpoint.syncClientBreakpoint)(getState, client, sourceMaps, sourceId, pendingBreakpoint);
+    } = response;
     return dispatch({
       type: "SYNC_BREAKPOINT",
       breakpoint,
       previousLocation
     });
@@ -283,17 +289,12 @@
 
 function toggleBreakpoints(shouldDisableBreakpoints, breakpoints) {
   return async ({
     dispatch
   }) => {
-    for (const [, breakpoint] of breakpoints) {
-      if (shouldDisableBreakpoints) {
-        await dispatch(disableBreakpoint(breakpoint.location));
-      } else {
-        await dispatch(enableBreakpoint(breakpoint.location));
-      }
-    }
+    const promises = breakpoints.valueSeq().toJS().map(([, breakpoint]) => shouldDisableBreakpoints ? dispatch(disableBreakpoint(breakpoint.location)) : dispatch(enableBreakpoint(breakpoint.location)));
+    await Promise.all(promises);
   };
 }
 /**
  * Removes all breakpoints
  *
@@ -305,15 +306,12 @@
 function removeAllBreakpoints() {
   return async ({
     dispatch,
     getState
   }) => {
-    const breakpoints = (0, _selectors.getBreakpoints)(getState());
-
-    for (const [, breakpoint] of breakpoints) {
-      await dispatch(removeBreakpoint(breakpoint.location));
-    }
+    const breakpointList = (0, _selectors.getBreakpoints)(getState()).valueSeq().toJS();
+    return Promise.all(breakpointList.map(bp => dispatch(removeBreakpoint(bp.location))));
   };
 }
 /**
  * Removes breakpoints
  *
@@ -324,13 +322,12 @@
 
 function removeBreakpoints(breakpoints) {
   return async ({
     dispatch
   }) => {
-    for (const [, breakpoint] of breakpoints) {
-      await dispatch(removeBreakpoint(breakpoint.location));
-    }
+    const breakpointList = breakpoints.valueSeq().toJS();
+    return Promise.all(breakpointList.map(bp => dispatch(removeBreakpoint(bp.location))));
   };
 }
 
 function remapBreakpoints(sourceId) {
   return async ({
diff --git a/devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js b/devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js
--- a/devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js
+++ b/devtools/client/debugger/new/src/actions/breakpoints/syncBreakpoint.js
@@ -54,13 +54,18 @@
 // and adding a new breakpoint
 
 
 async function syncClientBreakpoint(getState, client, sourceMaps, sourceId, pendingBreakpoint) {
   (0, _breakpoint.assertPendingBreakpoint)(pendingBreakpoint);
-  const source = (0, _selectors.getSourceFromId)(getState(), sourceId);
+  const source = (0, _selectors.getSource)(getState(), sourceId);
   const generatedSourceId = sourceMaps.isOriginalId(sourceId) ? (0, _devtoolsSourceMap.originalToGeneratedId)(sourceId) : sourceId;
-  const generatedSource = (0, _selectors.getSourceFromId)(getState(), generatedSourceId);
+  const generatedSource = (0, _selectors.getSource)(getState(), generatedSourceId);
+
+  if (!source) {
+    return null;
+  }
+
   const {
     location,
     astLocation
   } = pendingBreakpoint;
 
diff --git a/devtools/client/debugger/new/src/actions/sources/newSources.js b/devtools/client/debugger/new/src/actions/sources/newSources.js
--- a/devtools/client/debugger/new/src/actions/sources/newSources.js
+++ b/devtools/client/debugger/new/src/actions/sources/newSources.js
@@ -135,15 +135,12 @@
       return;
     } // load the source text if there is a pending breakpoint for it
 
 
     await dispatch((0, _loadSourceText.loadSourceText)(source));
-    const pendingBreakpointsArray = pendingBreakpoints.valueSeq().toJS();
-
-    for (const pendingBreakpoint of pendingBreakpointsArray) {
-      await dispatch((0, _breakpoints.syncBreakpoint)(sourceId, pendingBreakpoint));
-    }
+    const breakpoints = pendingBreakpoints.valueSeq().toJS();
+    await Promise.all(breakpoints.map(bp => dispatch((0, _breakpoints.syncBreakpoint)(sourceId, bp))));
   };
 }
 
 function restoreBlackBoxedSources(sources) {
   return async ({
diff --git a/devtools/client/debugger/new/src/components/App.js b/devtools/client/debugger/new/src/components/App.js
--- a/devtools/client/debugger/new/src/components/App.js
+++ b/devtools/client/debugger/new/src/components/App.js
@@ -292,6 +292,13 @@
   activeSearch: (0, _selectors.getActiveSearch)(state),
   quickOpenEnabled: (0, _selectors.getQuickOpenEnabled)(state),
   orientation: (0, _selectors.getOrientation)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(App);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  setActiveSearch: _actions2.default.setActiveSearch,
+  closeActiveSearch: _actions2.default.closeActiveSearch,
+  closeProjectSearch: _actions2.default.closeProjectSearch,
+  openQuickOpen: _actions2.default.openQuickOpen,
+  closeQuickOpen: _actions2.default.closeQuickOpen,
+  setOrientation: _actions2.default.setOrientation
+})(App);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/Footer.js b/devtools/client/debugger/new/src/components/Editor/Footer.js
--- a/devtools/client/debugger/new/src/components/Editor/Footer.js
+++ b/devtools/client/debugger/new/src/components/Editor/Footer.js
@@ -68,11 +68,11 @@
       selectedSource,
       toggleBlackBox
     } = this.props;
     const sourceLoaded = selectedSource && (0, _source.isLoaded)(selectedSource);
 
-    if (!sourceLoaded) {
+    if (!sourceLoaded || selectedSource.isPrettyPrinted) {
       return;
     }
 
     const blackboxed = selectedSource.isBlackBoxed;
     const tooltip = L10N.getStr("sourceFooter.blackbox");
@@ -193,6 +193,12 @@
     prettySource: (0, _selectors.getPrettySource)(state, selectedId),
     endPanelCollapsed: (0, _selectors.getPaneCollapse)(state, "end")
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(SourceFooter);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  togglePrettyPrint: _actions2.default.togglePrettyPrint,
+  toggleBlackBox: _actions2.default.toggleBlackBox,
+  jumpToMappedLocation: _actions2.default.jumpToMappedLocation,
+  recordCoverage: _actions2.default.recordCoverage,
+  togglePaneCollapse: _actions2.default.togglePaneCollapse
+})(SourceFooter);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/Preview/index.js b/devtools/client/debugger/new/src/components/Editor/Preview/index.js
--- a/devtools/client/debugger/new/src/components/Editor/Preview/index.js
+++ b/devtools/client/debugger/new/src/components/Editor/Preview/index.js
@@ -188,18 +188,11 @@
   preview: (0, _selectors.getPreview)(state),
   isPaused: (0, _selectors.getIsPaused)(state),
   selectedSource: (0, _selectors.getSelectedSource)(state)
 });
 
-const {
-  addExpression,
-  setPopupObjectProperties,
-  updatePreview,
-  clearPreview
-} = _actions2.default;
-const mapDispatchToProps = {
-  addExpression,
-  setPopupObjectProperties,
-  updatePreview,
-  clearPreview
-};
-exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(Preview);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  clearPreview: _actions2.default.clearPreview,
+  setPopupObjectProperties: _actions2.default.setPopupObjectProperties,
+  addExpression: _actions2.default.addExpression,
+  updatePreview: _actions2.default.updatePreview
+})(Preview);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/SearchBar.js b/devtools/client/debugger/new/src/components/Editor/SearchBar.js
--- a/devtools/client/debugger/new/src/components/Editor/SearchBar.js
+++ b/devtools/client/debugger/new/src/components/Editor/SearchBar.js
@@ -364,6 +364,14 @@
   modifiers: (0, _selectors.getFileSearchModifiers)(state),
   highlightedLineRange: (0, _selectors.getHighlightedLineRange)(state),
   searchResults: (0, _selectors.getFileSearchResults)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(SearchBar);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  toggleFileSearchModifier: _actions2.default.toggleFileSearchModifier,
+  setFileSearchQuery: _actions2.default.setFileSearchQuery,
+  setActiveSearch: _actions2.default.setActiveSearch,
+  closeFileSearch: _actions2.default.closeFileSearch,
+  doSearch: _actions2.default.doSearch,
+  traverseResults: _actions2.default.traverseResults,
+  updateSearchResults: _actions2.default.updateSearchResults
+})(SearchBar);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/Tab.js b/devtools/client/debugger/new/src/components/Editor/Tab.js
--- a/devtools/client/debugger/new/src/components/Editor/Tab.js
+++ b/devtools/client/debugger/new/src/components/Editor/Tab.js
@@ -16,20 +16,16 @@
 
 var _SourceIcon2 = _interopRequireDefault(_SourceIcon);
 
 var _Button = require("../shared/Button/index");
 
-var _text = require("../../utils/text");
-
 var _actions = require("../../actions/index");
 
 var _actions2 = _interopRequireDefault(_actions);
 
 var _source = require("../../utils/source");
 
-var _devtoolsModules = require("devtools/client/debugger/new/dist/vendors").vendored["devtools-modules"];
-
 var _clipboard = require("../../utils/clipboard");
 
 var _tabs = require("../../utils/tabs");
 
 var _selectors = require("../../selectors/index");
@@ -139,11 +135,10 @@
       selectedSource,
       selectSpecificSource,
       closeTab,
       source
     } = this.props;
-    const filename = (0, _source.getFilename)(source);
     const sourceId = source.id;
     const active = selectedSource && sourceId == selectedSource.id && !this.isProjectSearchEnabled() && !this.isSourceSearchEnabled();
     const isPrettyCode = (0, _source.isPretty)(source);
 
     function onClickClose(e) {
@@ -175,11 +170,11 @@
     }, _react2.default.createElement(_SourceIcon2.default, {
       source: source,
       shouldHide: icon => ["file", "javascript"].includes(icon)
     }), _react2.default.createElement("div", {
       className: "filename"
-    }, (0, _text.truncateMiddleText)((0, _devtoolsModules.getUnicodeUrlPath)(filename), 30)), _react2.default.createElement(_Button.CloseButton, {
+    }, (0, _source.getTruncatedFileName)(source)), _react2.default.createElement(_Button.CloseButton, {
       handleClick: onClickClose,
       tooltip: L10N.getStr("sourceTabs.closeTabButtonTooltip")
     }));
   }
 
@@ -194,6 +189,12 @@
     selectedSource: selectedSource,
     activeSearch: (0, _selectors.getActiveSearch)(state)
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Tab);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectSpecificSource: _actions2.default.selectSpecificSource,
+  closeTab: _actions2.default.closeTab,
+  closeTabs: _actions2.default.closeTabs,
+  togglePrettyPrint: _actions2.default.togglePrettyPrint,
+  showSource: _actions2.default.showSource
+})(Tab);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/Tabs.js b/devtools/client/debugger/new/src/components/Editor/Tabs.js
--- a/devtools/client/debugger/new/src/components/Editor/Tabs.js
+++ b/devtools/client/debugger/new/src/components/Editor/Tabs.js
@@ -54,11 +54,11 @@
         moveTab
       } = this.props;
       const sourceTabEls = this.refs.sourceTabs.children;
       const hiddenTabs = (0, _tabs.getHiddenTabs)(tabSources, sourceTabEls);
 
-      if ((0, _ui.isVisible)() && hiddenTabs.find(tab => tab.id == selectedSource.id)) {
+      if (selectedSource && (0, _ui.isVisible)() && hiddenTabs.find(tab => tab.id == selectedSource.id)) {
         return moveTab(selectedSource.url, 0);
       }
 
       this.setState({
         hiddenTabs
@@ -203,6 +203,12 @@
 const mapStateToProps = state => ({
   selectedSource: (0, _selectors.getSelectedSource)(state),
   tabSources: (0, _selectors.getSourcesForTabs)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Tabs);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectSpecificSource: _actions2.default.selectSpecificSource,
+  moveTab: _actions2.default.moveTab,
+  closeTab: _actions2.default.closeTab,
+  togglePaneCollapse: _actions2.default.togglePaneCollapse,
+  showSource: _actions2.default.showSource
+})(Tabs);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/Editor/index.js b/devtools/client/debugger/new/src/components/Editor/index.js
--- a/devtools/client/debugger/new/src/components/Editor/index.js
+++ b/devtools/client/debugger/new/src/components/Editor/index.js
@@ -633,6 +633,15 @@
     conditionalPanelLine: (0, _selectors.getConditionalPanelLine)(state),
     symbols: (0, _selectors.getSymbols)(state, selectedSource)
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Editor);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  openConditionalPanel: _actions2.default.openConditionalPanel,
+  closeConditionalPanel: _actions2.default.closeConditionalPanel,
+  setContextMenu: _actions2.default.setContextMenu,
+  continueToHere: _actions2.default.continueToHere,
+  toggleBreakpoint: _actions2.default.toggleBreakpoint,
+  addOrToggleDisabledBreakpoint: _actions2.default.addOrToggleDisabledBreakpoint,
+  jumpToMappedLocation: _actions2.default.jumpToMappedLocation,
+  traverseResults: _actions2.default.traverseResults
+})(Editor);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js b/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js
--- a/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js
+++ b/devtools/client/debugger/new/src/components/PrimaryPanes/Outline.js
@@ -200,6 +200,10 @@
     selectedLocation: (0, _selectors.getSelectedLocation)(state),
     getFunctionText: line => (0, _function.findFunctionText)(line, selectedSource, symbols)
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Outline);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectLocation: _actions2.default.selectLocation,
+  getFunctionText: _actions2.default.getFunctionText,
+  flashLineRange: _actions2.default.flashLineRange
+})(Outline);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js b/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js
--- a/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js
+++ b/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTree.js
@@ -10,25 +10,23 @@
 
 var _classnames = require("devtools/client/debugger/new/dist/vendors").vendored["classnames"];
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _devtoolsContextmenu = require("devtools/client/debugger/new/dist/vendors").vendored["devtools-contextmenu"];
-
 var _reactRedux = require("devtools/client/shared/vendor/react-redux");
 
-var _SourceIcon = require("../shared/SourceIcon");
+var _selectors = require("../../selectors/index");
 
-var _SourceIcon2 = _interopRequireDefault(_SourceIcon);
+var _actions = require("../../actions/index");
 
-var _selectors = require("../../selectors/index");
+var _actions2 = _interopRequireDefault(_actions);
 
-var _sourceTree = require("../../actions/source-tree");
+var _source = require("../../utils/source");
 
-var _sources = require("../../actions/sources/index");
+var _SourcesTreeItem = require("./SourcesTreeItem");
 
-var _ui = require("../../actions/ui");
+var _SourcesTreeItem2 = _interopRequireDefault(_SourcesTreeItem);
 
 var _ManagedTree = require("../shared/ManagedTree");
 
 var _ManagedTree2 = _interopRequireDefault(_ManagedTree);
 
@@ -36,16 +34,10 @@
 
 var _Svg2 = _interopRequireDefault(_Svg);
 
 var _sourcesTree = require("../../utils/sources-tree/index");
 
-var _source = require("../../utils/source");
-
-var _clipboard = require("../../utils/clipboard");
-
-var _prefs = require("../../utils/prefs");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at <http://mozilla.org/MPL/2.0/>. */
@@ -94,23 +86,29 @@
         projectRoot: nextProps.projectRoot
       }));
     }
 
     if (nextProps.shownSource && nextProps.shownSource != shownSource) {
-      const listItems = (0, _sourcesTree.getDirectories)(nextProps.shownSource, sourceTree);
+      const matchingSources = Object.keys(sources).filter(sourceId => {
+        return (0, _source.getRawSourceURL)(sources[sourceId].url) === nextProps.shownSource;
+      });
 
-      if (listItems && listItems[0]) {
-        this.selectItem(listItems[0]);
-      }
+      if (matchingSources.length) {
+        const listItems = (0, _sourcesTree.getDirectories)(sources[matchingSources[0]], sourceTree);
 
-      return this.setState({
-        listItems
-      });
+        if (listItems && listItems.length) {
+          this.selectItem(listItems[0]);
+        }
+
+        return this.setState({
+          listItems
+        });
+      }
     }
 
     if (nextProps.selectedSource && nextProps.selectedSource != selectedSource) {
-      const highlightItems = (0, _sourcesTree.getDirectories)((0, _source.getRawSourceURL)(nextProps.selectedSource.url), sourceTree);
+      const highlightItems = (0, _sourcesTree.getDirectories)(nextProps.selectedSource, sourceTree);
       this.setState({
         highlightItems
       });
     } // NOTE: do not run this every time a source is clicked,
     // only when a new source is added
@@ -144,26 +142,10 @@
       sourceTree
     } = this.state;
     return sourceTree.contents.length === 0;
   }
 
-  renderItemName(name) {
-    switch (name) {
-      case "ng://":
-        return "Angular";
-
-      case "webpack://":
-        return "Webpack";
-
-      case "moz-extension://":
-        return L10N.getStr("extensionsText");
-
-      default:
-        return name;
-    }
-  }
-
   renderEmptyElement(message) {
     return _react2.default.createElement("div", {
       key: "empty",
       className: "no-sources-message"
     }, message);
@@ -281,114 +263,15 @@
     if ((0, _sourcesTree.isDirectory)(item)) {
       return path;
     }
 
     const source = this.getSource(item);
-    const blackBoxedPart = source && source.isBlackBoxed ? ":blackboxed" : "";
-    return `${path}${blackBoxedPart}`;
-  };
-
-  this.getIcon = (sources, item, depth) => {
-    const {
-      debuggeeUrl,
-      projectRoot
-    } = this.props;
-
-    if (item.path === "webpack://") {
-      return _react2.default.createElement(_Svg2.default, {
-        name: "webpack"
-      });
-    } else if (item.path === "ng://") {
-      return _react2.default.createElement(_Svg2.default, {
-        name: "angular"
-      });
-    } else if (item.path === "moz-extension://") {
-      return _react2.default.createElement("img", {
-        className: "extension"
-      });
-    }
-
-    if (depth === 0 && projectRoot === "") {
-      return _react2.default.createElement("img", {
-        className: (0, _classnames2.default)("domain", {
-          debuggee: debuggeeUrl && debuggeeUrl.includes(item.name)
-        })
-      });
-    }
+    const blackBoxedPart = source && source.isBlackBoxed ? ":blackboxed" : ""; // Original and generated sources can point to the same path
+    // therefore necessary to distinguish as path is used as keys.
 
-    if ((0, _sourcesTree.isDirectory)(item)) {
-      return _react2.default.createElement("img", {
-        className: "folder"
-      });
-    }
-
-    const source = this.getSource(item);
-
-    if (source) {
-      return _react2.default.createElement(_SourceIcon2.default, {
-        source: source
-      });
-    }
-
-    return null;
-  };
-
-  this.onContextMenu = (event, item) => {
-    const copySourceUri2Label = L10N.getStr("copySourceUri2");
-    const copySourceUri2Key = L10N.getStr("copySourceUri2.accesskey");
-    const setDirectoryRootLabel = L10N.getStr("setDirectoryRoot.label");
-    const setDirectoryRootKey = L10N.getStr("setDirectoryRoot.accesskey");
-    const removeDirectoryRootLabel = L10N.getStr("removeDirectoryRoot.label");
-    event.stopPropagation();
-    event.preventDefault();
-    const menuOptions = [];
-
-    if (!(0, _sourcesTree.isDirectory)(item)) {
-      // Flow requires some extra handling to ensure the value of contents.
-      const {
-        contents
-      } = item;
-
-      if (!Array.isArray(contents)) {
-        const copySourceUri2 = {
-          id: "node-menu-copy-source",
-          label: copySourceUri2Label,
-          accesskey: copySourceUri2Key,
-          disabled: false,
-          click: () => (0, _clipboard.copyToTheClipboard)(contents.url)
-        };
-        menuOptions.push(copySourceUri2);
-      }
-    }
-
-    if ((0, _sourcesTree.isDirectory)(item) && _prefs.features.root) {
-      const {
-        path
-      } = item;
-      const {
-        projectRoot
-      } = this.props;
-
-      if (projectRoot.endsWith(path)) {
-        menuOptions.push({
-          id: "node-remove-directory-root",
-          label: removeDirectoryRootLabel,
-          disabled: false,
-          click: () => this.props.clearProjectDirectoryRoot()
-        });
-      } else {
-        menuOptions.push({
-          id: "node-set-directory-root",
-          label: setDirectoryRootLabel,
-          accesskey: setDirectoryRootKey,
-          disabled: false,
-          click: () => this.props.setProjectDirectoryRoot(path)
-        });
-      }
-    }
-
-    (0, _devtoolsContextmenu.showMenu)(event, menuOptions);
+    const generatedPart = source && source.sourceMapURL ? ":generated" : "";
+    return `${path}${blackBoxedPart}${generatedPart}`;
   };
 
   this.onExpand = (item, expandedState) => {
     this.props.setExpandedState(expandedState);
   };
@@ -405,44 +288,10 @@
     if (e.keyCode === 13 && focusedItem) {
       this.selectItem(focusedItem);
     }
   };
 
-  this.renderItem = (item, depth, focused, _, expanded, {
-    setExpanded
-  }) => {
-    const arrow = (0, _sourcesTree.isDirectory)(item) ? _react2.default.createElement("img", {
-      className: (0, _classnames2.default)("arrow", {
-        expanded: expanded
-      })
-    }) : _react2.default.createElement("i", {
-      className: "no-arrow"
-    });
-    const {
-      sources
-    } = this.props;
-    const icon = this.getIcon(sources, item, depth);
-    return _react2.default.createElement("div", {
-      className: (0, _classnames2.default)("node", {
-        focused
-      }),
-      key: item.path,
-      onClick: e => {
-        this.focusItem(item);
-
-        if ((0, _sourcesTree.isDirectory)(item)) {
-          setExpanded(item, !!expanded, e.altKey);
-        } else {
-          this.selectItem(item);
-        }
-      },
-      onContextMenu: e => this.onContextMenu(e, item)
-    }, arrow, icon, _react2.default.createElement("span", {
-      className: "label"
-    }, " ", this.renderItemName(item.name), " "));
-  };
-
   this.getRoots = () => {
     const {
       projectRoot
     } = this.props;
     const {
@@ -460,10 +309,33 @@
       return sourceContents.contents;
     }
 
     return sourceTree.contents;
   };
+
+  this.renderItem = (item, depth, focused, _, expanded, {
+    setExpanded
+  }) => {
+    const {
+      debuggeeUrl,
+      projectRoot
+    } = this.props;
+    return _react2.default.createElement(_SourcesTreeItem2.default, {
+      item: item,
+      depth: depth,
+      focused: focused,
+      expanded: expanded,
+      setExpanded: setExpanded,
+      focusItem: this.focusItem,
+      selectItem: this.selectItem,
+      source: this.getSource(item),
+      debuggeeUrl: debuggeeUrl,
+      projectRoot: projectRoot,
+      clearProjectDirectoryRoot: this.props.clearProjectDirectoryRoot,
+      setProjectDirectoryRoot: this.props.setProjectDirectoryRoot
+    });
+  };
 };
 
 const mapStateToProps = state => {
   return {
     shownSource: (0, _selectors.getShownSource)(state),
@@ -474,12 +346,11 @@
     sources: (0, _selectors.getRelativeSources)(state),
     sourceCount: (0, _selectors.getSourceCount)(state)
   };
 };
 
-const actionCreators = {
-  setExpandedState: _sourceTree.setExpandedState,
-  selectSource: _sources.selectSource,
-  setProjectDirectoryRoot: _ui.setProjectDirectoryRoot,
-  clearProjectDirectoryRoot: _ui.clearProjectDirectoryRoot
-};
-exports.default = (0, _reactRedux.connect)(mapStateToProps, actionCreators)(SourcesTree);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectSource: _actions2.default.selectSource,
+  setExpandedState: _actions2.default.setExpandedState,
+  setProjectDirectoryRoot: _actions2.default.setProjectDirectoryRoot,
+  clearProjectDirectoryRoot: _actions2.default.clearProjectDirectoryRoot
+})(SourcesTree);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTreeItem.js b/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTreeItem.js
new file mode 100644
--- /dev/null
+++ b/devtools/client/debugger/new/src/components/PrimaryPanes/SourcesTreeItem.js
@@ -0,0 +1,207 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _react = require("devtools/client/shared/vendor/react");
+
+var _react2 = _interopRequireDefault(_react);
+
+var _classnames = require("devtools/client/debugger/new/dist/vendors").vendored["classnames"];
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
+var _devtoolsContextmenu = require("devtools/client/debugger/new/dist/vendors").vendored["devtools-contextmenu"];
+
+var _SourceIcon = require("../shared/SourceIcon");
+
+var _SourceIcon2 = _interopRequireDefault(_SourceIcon);
+
+var _Svg = require("devtools/client/debugger/new/dist/vendors").vendored["Svg"];
+
+var _Svg2 = _interopRequireDefault(_Svg);
+
+var _sourcesTree = require("../../utils/sources-tree/index");
+
+var _clipboard = require("../../utils/clipboard");
+
+var _prefs = require("../../utils/prefs");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 SourceTreeItem extends _react.Component {
+  constructor(...args) {
+    var _temp;
+
+    return _temp = super(...args), this.onClick = e => {
+      const {
+        expanded,
+        item,
+        focusItem,
+        setExpanded,
+        selectItem
+      } = this.props;
+      focusItem(item);
+
+      if ((0, _sourcesTree.isDirectory)(item)) {
+        setExpanded(item, !!expanded, e.altKey);
+      } else {
+        selectItem(item);
+      }
+    }, this.onContextMenu = (event, item) => {
+      const copySourceUri2Label = L10N.getStr("copySourceUri2");
+      const copySourceUri2Key = L10N.getStr("copySourceUri2.accesskey");
+      const setDirectoryRootLabel = L10N.getStr("setDirectoryRoot.label");
+      const setDirectoryRootKey = L10N.getStr("setDirectoryRoot.accesskey");
+      const removeDirectoryRootLabel = L10N.getStr("removeDirectoryRoot.label");
+      event.stopPropagation();
+      event.preventDefault();
+      const menuOptions = [];
+
+      if (!(0, _sourcesTree.isDirectory)(item)) {
+        // Flow requires some extra handling to ensure the value of contents.
+        const {
+          contents
+        } = item;
+
+        if (!Array.isArray(contents)) {
+          const copySourceUri2 = {
+            id: "node-menu-copy-source",
+            label: copySourceUri2Label,
+            accesskey: copySourceUri2Key,
+            disabled: false,
+            click: () => (0, _clipboard.copyToTheClipboard)(contents.url)
+          };
+          menuOptions.push(copySourceUri2);
+        }
+      }
+
+      if ((0, _sourcesTree.isDirectory)(item) && _prefs.features.root) {
+        const {
+          path
+        } = item;
+        const {
+          projectRoot
+        } = this.props;
+
+        if (projectRoot.endsWith(path)) {
+          menuOptions.push({
+            id: "node-remove-directory-root",
+            label: removeDirectoryRootLabel,
+            disabled: false,
+            click: () => this.props.clearProjectDirectoryRoot()
+          });
+        } else {
+          menuOptions.push({
+            id: "node-set-directory-root",
+            label: setDirectoryRootLabel,
+            accesskey: setDirectoryRootKey,
+            disabled: false,
+            click: () => this.props.setProjectDirectoryRoot(path)
+          });
+        }
+      }
+
+      (0, _devtoolsContextmenu.showMenu)(event, menuOptions);
+    }, _temp;
+  }
+
+  getIcon(item, depth) {
+    const {
+      debuggeeUrl,
+      projectRoot,
+      source
+    } = this.props;
+
+    if (item.path === "webpack://") {
+      return _react2.default.createElement(_Svg2.default, {
+        name: "webpack"
+      });
+    } else if (item.path === "ng://") {
+      return _react2.default.createElement(_Svg2.default, {
+        name: "angular"
+      });
+    } else if (item.path === "moz-extension://") {
+      return _react2.default.createElement("img", {
+        className: "extension"
+      });
+    }
+
+    if (depth === 0 && projectRoot === "") {
+      return _react2.default.createElement("img", {
+        className: (0, _classnames2.default)("domain", {
+          debuggee: debuggeeUrl && debuggeeUrl.includes(item.name)
+        })
+      });
+    }
+
+    if ((0, _sourcesTree.isDirectory)(item)) {
+      return _react2.default.createElement("img", {
+        className: "folder"
+      });
+    }
+
+    if (source) {
+      return _react2.default.createElement(_SourceIcon2.default, {
+        source: source
+      });
+    }
+
+    return null;
+  }
+
+  renderItemArrow() {
+    const {
+      item,
+      expanded
+    } = this.props;
+    return (0, _sourcesTree.isDirectory)(item) ? _react2.default.createElement("img", {
+      className: (0, _classnames2.default)("arrow", {
+        expanded
+      })
+    }) : _react2.default.createElement("i", {
+      className: "no-arrow"
+    });
+  }
+
+  renderItemName(name) {
+    switch (name) {
+      case "ng://":
+        return "Angular";
+
+      case "webpack://":
+        return "Webpack";
+
+      case "moz-extension://":
+        return L10N.getStr("extensionsText");
+
+      default:
+        return name;
+    }
+  }
+
+  render() {
+    const {
+      item,
+      depth,
+      focused
+    } = this.props;
+    return _react2.default.createElement("div", {
+      className: (0, _classnames2.default)("node", {
+        focused
+      }),
+      key: item.path,
+      onClick: this.onClick,
+      onContextMenu: e => this.onContextMenu(e, item)
+    }, this.renderItemArrow(), this.getIcon(item, depth), _react2.default.createElement("span", {
+      className: "label"
+    }, " ", this.renderItemName(item.name), " "));
+  }
+
+}
+
+exports.default = SourceTreeItem;
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/index.js b/devtools/client/debugger/new/src/components/PrimaryPanes/index.js
--- a/devtools/client/debugger/new/src/components/PrimaryPanes/index.js
+++ b/devtools/client/debugger/new/src/components/PrimaryPanes/index.js
@@ -122,6 +122,11 @@
   selectedTab: (0, _selectors.getSelectedPrimaryPaneTab)(state),
   sources: (0, _selectors.getSources)(state),
   sourceSearchOn: (0, _selectors.getActiveSearch)(state) === "source"
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(PrimaryPanes);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  setPrimaryPaneTab: _actions2.default.setPrimaryPaneTab,
+  selectLocation: _actions2.default.selectLocation,
+  setActiveSearch: _actions2.default.setActiveSearch,
+  closeActiveSearch: _actions2.default.closeActiveSearch
+})(PrimaryPanes);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build b/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
--- a/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
+++ b/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
@@ -9,6 +9,7 @@
 
 DevToolsModules(
     'index.js',
     'Outline.js',
     'SourcesTree.js',
+    'SourcesTreeItem.js',
 )
diff --git a/devtools/client/debugger/new/src/components/ProjectSearch.js b/devtools/client/debugger/new/src/components/ProjectSearch.js
--- a/devtools/client/debugger/new/src/components/ProjectSearch.js
+++ b/devtools/client/debugger/new/src/components/ProjectSearch.js
@@ -319,6 +319,13 @@
   results: (0, _selectors.getTextSearchResults)(state),
   query: (0, _selectors.getTextSearchQuery)(state),
   status: (0, _selectors.getTextSearchStatus)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(ProjectSearch);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  closeProjectSearch: _actions2.default.closeProjectSearch,
+  searchSources: _actions2.default.searchSources,
+  clearSearch: _actions2.default.clearSearch,
+  selectLocation: _actions2.default.selectLocation,
+  setActiveSearch: _actions2.default.setActiveSearch,
+  doSearchForHighlight: _actions2.default.doSearchForHighlight
+})(ProjectSearch);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/QuickOpenModal.js b/devtools/client/debugger/new/src/components/QuickOpenModal.js
--- a/devtools/client/debugger/new/src/components/QuickOpenModal.js
+++ b/devtools/client/debugger/new/src/components/QuickOpenModal.js
@@ -482,6 +482,13 @@
   };
 }
 /* istanbul ignore next: ignoring testing of redux connection stuff */
 
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(QuickOpenModal);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  shortcutsModalEnabled: _actions2.default.shortcutsModalEnabled,
+  selectLocation: _actions2.default.selectLocation,
+  setQuickOpenQuery: _actions2.default.setQuickOpenQuery,
+  highlightLineRange: _actions2.default.highlightLineRange,
+  closeQuickOpen: _actions2.default.closeQuickOpen,
+  toggleShortcutsModal: _actions2.default.toggleShortcutsModal
+})(QuickOpenModal);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/Breakpoint.js
@@ -194,6 +194,17 @@
   breakpoints: (0, _selectors.getBreakpoints)(state),
   frame: (0, _selectors.getTopFrame)(state),
   selectedSource: (0, _selectors.getSelectedSource)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Breakpoint);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  enableBreakpoint: _actions2.default.enableBreakpoint,
+  removeBreakpoint: _actions2.default.removeBreakpoint,
+  removeBreakpoints: _actions2.default.removeBreakpoints,
+  removeAllBreakpoints: _actions2.default.removeAllBreakpoints,
+  disableBreakpoint: _actions2.default.disableBreakpoint,
+  selectSpecificLocation: _actions2.default.selectSpecificLocation,
+  selectLocation: _actions2.default.selectLocation,
+  toggleAllBreakpoints: _actions2.default.toggleAllBreakpoints,
+  toggleBreakpoints: _actions2.default.toggleBreakpoints,
+  openConditionalPanel: _actions2.default.openConditionalPanel
+})(Breakpoint);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/BreakpointsContextMenu.js
@@ -16,11 +16,11 @@
     removeBreakpoints,
     removeAllBreakpoints,
     toggleBreakpoints,
     toggleAllBreakpoints,
     toggleDisabledBreakpoint,
-    selectLocation,
+    selectSpecificLocation,
     setBreakpointCondition,
     openConditionalPanel,
     breakpoints,
     breakpoint,
     contextMenuEvent
@@ -127,20 +127,20 @@
   const addConditionItem = {
     id: "node-menu-add-condition",
     label: addConditionLabel,
     accesskey: addConditionKey,
     click: () => {
-      selectLocation(breakpoint.location);
+      selectSpecificLocation(breakpoint.location);
       openConditionalPanel(breakpoint.location.line);
     }
   };
   const editConditionItem = {
     id: "node-menu-edit-condition",
     label: editConditionLabel,
     accesskey: editConditionKey,
     click: () => {
-      selectLocation(breakpoint.location);
+      selectSpecificLocation(breakpoint.location);
       openConditionalPanel(breakpoint.location.line);
     }
   };
   const hideEnableSelfItem = !breakpoint.disabled;
   const hideEnableAllItem = disabledBreakpoints.size === 0;
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Breakpoints/index.js
@@ -81,11 +81,11 @@
       key: source.url,
       onClick: () => this.props.selectSource(source.id)
     }, _react2.default.createElement(_SourceIcon2.default, {
       source: source,
       shouldHide: icon => ["file", "javascript"].includes(icon)
-    }), (0, _source.getFilename)(source)), ...breakpoints.map(breakpoint => _react2.default.createElement(_Breakpoint2.default, {
+    }), (0, _source.getTruncatedFileName)(source)), ...breakpoints.map(breakpoint => _react2.default.createElement(_Breakpoint2.default, {
       breakpoint: breakpoint,
       source: source,
       key: (0, _breakpoint.makeLocationId)(breakpoint.location)
     }))])];
   }
@@ -101,6 +101,9 @@
 const mapStateToProps = state => ({
   breakpointSources: (0, _selectors.getBreakpointSources)(state),
   selectedSource: (0, _selectors.getSelectedSource)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Breakpoints);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  pauseOnExceptions: _actions2.default.pauseOnExceptions,
+  selectSource: _actions2.default.selectSource
+})(Breakpoints);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js b/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/CommandBar.js
@@ -291,6 +291,20 @@
   isWaitingOnBreak: (0, _selectors.getIsWaitingOnBreak)(state),
   canRewind: (0, _selectors.getCanRewind)(state),
   skipPausing: (0, _selectors.getSkipPausing)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(CommandBar);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  timeTravelTo: _actions2.default.timeTravelTo,
+  clearHistory: _actions2.default.clearHistory,
+  resume: _actions2.default.resume,
+  stepIn: _actions2.default.stepIn,
+  stepOut: _actions2.default.stepOut,
+  stepOver: _actions2.default.stepOver,
+  breakOnNext: _actions2.default.breakOnNext,
+  rewind: _actions2.default.rewind,
+  reverseStepIn: _actions2.default.reverseStepIn,
+  reverseStepOut: _actions2.default.reverseStepOut,
+  reverseStepOver: _actions2.default.reverseStepOver,
+  pauseOnExceptions: _actions2.default.pauseOnExceptions,
+  toggleSkipPausing: _actions2.default.toggleSkipPausing
+})(CommandBar);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js b/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/EventListeners.js
@@ -109,6 +109,12 @@
   return {
     listeners
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(EventListeners);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectLocation: _actions2.default.selectLocation,
+  addBreakpoint: _actions2.default.addBreakpoint,
+  enableBreakpoint: _actions2.default.enableBreakpoint,
+  disableBreakpoint: _actions2.default.disableBreakpoint,
+  removeBreakpoint: _actions2.default.removeBreakpoint
+})(EventListeners);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Expressions.js
@@ -371,6 +371,16 @@
     expressions: (0, _selectors.getExpressions)(state),
     expressionError: (0, _selectors.getExpressionError)(state)
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Expressions);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  autocomplete: _actions2.default.autocomplete,
+  clearAutocomplete: _actions2.default.clearAutocomplete,
+  onExpressionAdded: _actions2.default.onExpressionAdded,
+  addExpression: _actions2.default.addExpression,
+  clearExpressionError: _actions2.default.clearExpressionError,
+  evaluateExpressions: _actions2.default.evaluateExpressions,
+  updateExpression: _actions2.default.updateExpression,
+  deleteExpression: _actions2.default.deleteExpression,
+  openLink: _actions2.default.openLink
+})(Expressions);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Frames/index.js
@@ -172,6 +172,11 @@
   frameworkGroupingOn: (0, _selectors.getFrameworkGroupingState)(state),
   selectedFrame: (0, _selectors.getSelectedFrame)(state),
   pause: (0, _selectors.isPaused)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Frames);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  selectFrame: _actions2.default.selectFrame,
+  toggleBlackBox: _actions2.default.toggleBlackBox,
+  toggleFrameworkGrouping: _actions2.default.toggleFrameworkGrouping,
+  disableFrameTruncate: _actions2.default.disableFrameTruncate
+})(Frames);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/FrameworkComponent.js b/devtools/client/debugger/new/src/components/SecondaryPanes/FrameworkComponent.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/FrameworkComponent.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/FrameworkComponent.js
@@ -111,6 +111,8 @@
 const mapStateToProps = state => ({
   selectedFrame: (0, _selectors.getSelectedFrame)(state),
   popupObjectProperties: (0, _selectors.getAllPopupObjectProperties)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(FrameworkComponent);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  setPopupObjectProperties: _actions2.default.setPopupObjectProperties
+})(FrameworkComponent);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js b/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/Scopes.js
@@ -145,6 +145,8 @@
     originalFrameScopes,
     generatedFrameScopes
   };
 };
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(Scopes);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  openLink: _actions2.default.openLink
+})(Scopes);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/SecondaryPanes/index.js b/devtools/client/debugger/new/src/components/SecondaryPanes/index.js
--- a/devtools/client/debugger/new/src/components/SecondaryPanes/index.js
+++ b/devtools/client/debugger/new/src/components/SecondaryPanes/index.js
@@ -406,6 +406,12 @@
   shouldPauseOnExceptions: (0, _selectors.getShouldPauseOnExceptions)(state),
   shouldPauseOnCaughtExceptions: (0, _selectors.getShouldPauseOnCaughtExceptions)(state),
   workers: (0, _selectors.getWorkers)(state)
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(SecondaryPanes);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  toggleAllBreakpoints: _actions2.default.toggleAllBreakpoints,
+  toggleShortcutsModal: _actions2.default.toggleShortcutsModal,
+  evaluateExpressions: _actions2.default.evaluateExpressions,
+  pauseOnExceptions: _actions2.default.pauseOnExceptions,
+  breakOnNext: _actions2.default.breakOnNext
+})(SecondaryPanes);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/components/WelcomeBox.js b/devtools/client/debugger/new/src/components/WelcomeBox.js
--- a/devtools/client/debugger/new/src/components/WelcomeBox.js
+++ b/devtools/client/debugger/new/src/components/WelcomeBox.js
@@ -88,6 +88,10 @@
 
 const mapStateToProps = state => ({
   endPanelCollapsed: (0, _selectors.getPaneCollapse)(state, "end")
 });
 
-exports.default = (0, _reactRedux.connect)(mapStateToProps, _actions2.default)(WelcomeBox);
\ No newline at end of file
+exports.default = (0, _reactRedux.connect)(mapStateToProps, {
+  togglePaneCollapse: _actions2.default.togglePaneCollapse,
+  setActiveSearch: _actions2.default.setActiveSearch,
+  openQuickOpen: _actions2.default.openQuickOpen
+})(WelcomeBox);
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/selectors/breakpointSources.js b/devtools/client/debugger/new/src/selectors/breakpointSources.js
--- a/devtools/client/debugger/new/src/selectors/breakpointSources.js
+++ b/devtools/client/debugger/new/src/selectors/breakpointSources.js
@@ -22,11 +22,11 @@
 }
 
 function findBreakpointSources(sources, breakpoints) {
   const sourceIds = (0, _lodash.uniq)(breakpoints.valueSeq().filter(bp => !bp.hidden).map(bp => bp.location.sourceId).toJS());
   const breakpointSources = sourceIds.map(id => sources[id]).filter(source => source && !source.isBlackBoxed);
-  return (0, _lodash.sortBy)(breakpointSources, source => (0, _source.getFilenameFromURL)(source.url));
+  return (0, _lodash.sortBy)(breakpointSources, source => (0, _source.getFilename)(source));
 }
 
 function _getBreakpointSources(breakpoints, sources) {
   const breakpointSources = findBreakpointSources(sources, breakpoints);
   return breakpointSources.map(source => ({
diff --git a/devtools/client/debugger/new/src/utils/editor/source-documents.js b/devtools/client/debugger/new/src/utils/editor/source-documents.js
--- a/devtools/client/debugger/new/src/utils/editor/source-documents.js
+++ b/devtools/client/debugger/new/src/utils/editor/source-documents.js
@@ -156,12 +156,13 @@
   if (hasDocument(source.id)) {
     const doc = getDocument(source.id);
 
     if (editor.codeMirror.doc === doc) {
       const mode = (0, _source.getMode)(source, symbols);
+      const currentMode = editor.codeMirror.getOption("mode");
 
-      if (doc.mode.name !== mode.name) {
+      if (currentMode.name !== mode.name) {
         editor.setMode(mode);
       }
 
       return;
     }
diff --git a/devtools/client/debugger/new/src/utils/source.js b/devtools/client/debugger/new/src/utils/source.js
--- a/devtools/client/debugger/new/src/utils/source.js
+++ b/devtools/client/debugger/new/src/utils/source.js
@@ -18,13 +18,13 @@
 exports.isPretty = isPretty;
 exports.isPrettyURL = isPrettyURL;
 exports.isThirdParty = isThirdParty;
 exports.getPrettySourceURL = getPrettySourceURL;
 exports.getRawSourceURL = getRawSourceURL;
-exports.getFilenameFromURL = getFilenameFromURL;
 exports.getFormattedSourceId = getFormattedSourceId;
 exports.getFilename = getFilename;
+exports.getTruncatedFileName = getTruncatedFileName;
 exports.getFileURL = getFileURL;
 exports.getSourcePath = getSourcePath;
 exports.getSourceLineCount = getSourceLineCount;
 exports.getMode = getMode;
 exports.isLoaded = isLoaded;
@@ -34,11 +34,11 @@
 
 var _devtoolsSourceMap = require("devtools/client/shared/source-map/index.js");
 
 var _utils = require("./utils");
 
-var _path = require("./path");
+var _text = require("../utils/text");
 
 var _url = require("devtools/client/debugger/new/dist/vendors").vendored["url"];
 
 var _devtoolsModules = require("devtools/client/debugger/new/dist/vendors").vendored["devtools-modules"];
 
@@ -151,21 +151,10 @@
 function resolveFileURL(url, transformUrl = initialUrl => initialUrl) {
   url = getRawSourceURL(url || "");
   const name = transformUrl(url);
   return (0, _utils.endTruncateStr)(name, 50);
 }
-/**
- * Gets a readable filename from a URL for display purposes.
- *
- * @memberof utils/source
- * @static
- */
-
-
-function getFilenameFromURL(url) {
-  return resolveFileURL(url, initialUrl => (0, _devtoolsModules.getUnicodeUrlPath)((0, _path.basename)(initialUrl)) || "(index)");
-}
 
 function getFormattedSourceId(id) {
   const sourceId = id.split("/")[1];
   return `SOURCE${sourceId}`;
 }
@@ -186,18 +175,25 @@
 
   if (!url) {
     return getFormattedSourceId(id);
   }
 
-  let filename = getFilenameFromURL(url);
-  const qMarkIdx = filename.indexOf("?");
+  const {
+    filename
+  } = (0, _sourcesTree.getURL)(source);
+  return filename;
+}
+/**
+ * Provides a middle-trunated filename
+ *
+ * @memberof utils/source
+ * @static
+ */
 
-  if (qMarkIdx > 0) {
-    filename = filename.slice(0, qMarkIdx);
-  }
 
-  return filename;
+function getTruncatedFileName(source, length = 30) {
+  return (0, _text.truncateMiddleText)(getFilename(source), length);
 }
 /**
  * Gets a readable source URL for display purposes.
  * If the source does not have a URL, the source ID will be returned instead.
  *
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/addToTree.js b/devtools/client/debugger/new/src/utils/sources-tree/addToTree.js
--- a/devtools/client/debugger/new/src/utils/sources-tree/addToTree.js
+++ b/devtools/client/debugger/new/src/utils/sources-tree/addToTree.js
@@ -119,16 +119,16 @@
  * @static
  */
 
 
 function addToTree(tree, source, debuggeeUrl, projectRoot) {
-  const url = (0, _getURL.getURL)(source.url, debuggeeUrl);
+  const url = (0, _getURL.getURL)(source, debuggeeUrl);
   const debuggeeHost = (0, _treeOrder.getDomain)(debuggeeUrl);
 
   if ((0, _utils.isInvalidUrl)(url, source)) {
     return;
   }
 
   const finalNode = traverseTree(url, tree, debuggeeHost); // $FlowIgnore
 
   finalNode.contents = addSourceToNode(finalNode, url, source);
 }
\ No newline at end of file
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js b/devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js
--- a/devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js
+++ b/devtools/client/debugger/new/src/utils/sources-tree/getDirectories.js
@@ -35,23 +35,23 @@
   }
 
   return returnTarget;
 }
 
-function getDirectories(sourceUrl, sourceTree) {
-  const url = (0, _getURL.getURL)(sourceUrl);
+function getDirectories(source, sourceTree) {
+  const url = (0, _getURL.getURL)(source);
   const fullUrl = `${url.group}${url.path}`;
   const parentMap = (0, _utils.createParentMap)(sourceTree);
-  const source = findSource(sourceTree, fullUrl);
+  const subtreeSource = findSource(sourceTree, fullUrl);
 
-  if (!source) {
+  if (!subtreeSource) {
     return [];
   }
 
-  let node = source;
+  let node = subtreeSource;
   const directories = [];
-  directories.push(source);
+  directories.push(subtreeSource);
 
   while (true) {
     node = parentMap.get(node);
 
     if (!node) {
diff --git a/devtools/client/debugger/new/src/utils/sources-tree/getURL.js b/devtools/client/debugger/new/src/utils/sources-tree/getURL.js
--- a/devtools/client/debugger/new/src/utils/sources-tree/getURL.js
+++ b/devtools/client/debugger/new/src/utils/sources-tree/getURL.js
@@ -6,17 +6,18 @@
 exports.getFilenameFromPath = getFilenameFromPath;
 exports.getURL = getURL;
 
 var _url = require("devtools/client/debugger/new/dist/vendors").vendored["url"];
 
-var _lodash = require("devtools/client/shared/vendor/lodash");
-
 var _devtoolsModules = require("devtools/client/debugger/new/dist/vendors").vendored["devtools-modules"];
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; var ownKeys = Object.keys(source); if (typeof Object.getOwnPropertySymbols === 'function') { ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function (sym) { return Object.getOwnPropertyDescriptor(source, sym).enumerable; })); } ownKeys.forEach(function (key) { _defineProperty(target, key, source[key]); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const urlMap = new WeakMap();
+
 function getFilenameFromPath(pathname) {
   let filename = "";
 
   if (pathname) {
     filename = pathname.substring(pathname.lastIndexOf("/") + 1); // This file does not have a name. Default should be (index).
@@ -28,18 +29,20 @@
 
   return filename;
 }
 
 const NoDomain = "(no domain)";
+const def = {
+  path: "",
+  group: "",
+  filename: ""
+};
 
-function getURL(sourceUrl, debuggeeUrl = "") {
-  const url = sourceUrl;
-  const def = {
-    path: "",
-    group: "",
-    filename: ""
-  };
+function _getURL(source, debuggeeUrl) {
+  const {
+    url
+  } = source;
 
   if (!url) {
     return def;
   }
 
@@ -47,78 +50,89 @@
     pathname,
     protocol,
     host,
     path
   } = (0, _url.parse)(url);
-  const defaultDomain = (0, _url.parse)(debuggeeUrl).host;
-  const filename = getFilenameFromPath(pathname);
+  const filename = (0, _devtoolsModules.getUnicodeUrlPath)(getFilenameFromPath(pathname));
 
   switch (protocol) {
     case "javascript:":
       // Ignore `javascript:` URLs for now
       return def;
 
     case "moz-extension:":
     case "resource:":
-      return (0, _lodash.merge)(def, {
+      return _objectSpread({}, def, {
         path,
-        group: `${protocol}//${host || ""}`,
-        filename
+        filename,
+        group: `${protocol}//${host || ""}`
       });
 
     case "webpack:":
     case "ng:":
-      return (0, _lodash.merge)(def, {
+      return _objectSpread({}, def, {
         path: path,
-        group: `${protocol}//`,
-        filename: filename
+        filename,
+        group: `${protocol}//`
       });
 
     case "about:":
       // An about page is a special case
-      return (0, _lodash.merge)(def, {
+      return _objectSpread({}, def, {
         path: "/",
-        group: url,
-        filename: filename
+        filename,
+        group: url
       });
 
     case "data:":
-      return (0, _lodash.merge)(def, {
+      return _objectSpread({}, def, {
         path: "/",
         group: NoDomain,
         filename: url
       });
 
     case null:
       if (pathname && pathname.startsWith("/")) {
         // use file protocol for a URL like "/foo/bar.js"
-        return (0, _lodash.merge)(def, {
+        return _objectSpread({}, def, {
           path: path,
-          group: "file://",
-          filename: filename
+          filename,
+          group: "file://"
         });
       } else if (host === null) {
         // use anonymous group for weird URLs
-        return (0, _lodash.merge)(def, {
+        const defaultDomain = (0, _url.parse)(debuggeeUrl).host;
+        return _objectSpread({}, def, {
           path: url,
           group: defaultDomain,
-          filename: filename
+          filename
         });
       }
 
       break;
 
     case "http:":
     case "https:":
-      return (0, _lodash.merge)(def, {
+      return _objectSpread({}, def, {
         path: pathname,
-        group: (0, _devtoolsModules.getUnicodeHostname)(host),
-        filename: filename
+        filename,
+        group: (0, _devtoolsModules.getUnicodeHostname)(host)
       });
   }
 
-  return (0, _lodash.merge)(def, {
+  return _objectSpread({}, def, {
     path: path,
     group: protocol ? `${protocol}//` : "",
-    filename: filename
+    filename
   });
+}
+
+function getURL(source, debuggeeUrl = "") {
+  if (urlMap.has(source)) {
+    return urlMap.get(source) || def;
+  }
+
+  const url = _getURL(source, debuggeeUrl);
+
+  urlMap.set(source, url);
+  return url;
 }
\ No newline at end of file
diff --git a/devtools/client/debugger/new/test/mochitest/browser.ini b/devtools/client/debugger/new/test/mochitest/browser.ini
--- a/devtools/client/debugger/new/test/mochitest/browser.ini
+++ b/devtools/client/debugger/new/test/mochitest/browser.ini
@@ -227,11 +227,11 @@
 [browser_dbg-sourcemaps-bogus.js]
 skip-if = os == 'linux' && !asan # bug 1447118
 [browser_dbg-sources.js]
 [browser_dbg-sources-named-eval.js]
 [browser_dbg-stepping.js]
-skip-if = debug || (verify && (os == 'win'))
+skip-if = debug || (verify && (os == 'win')) || (os == "win" && os_version == "6.1")
 [browser_dbg-tabs.js]
 [browser_dbg-tabs-pretty-print.js]
 [browser_dbg-toggling-tools.js]
 [browser_dbg-wasm-sourcemaps.js]
 skip-if = true
diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -2,11 +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/. */
 
 "use strict";
 
-const Services = require("Services");
+const Services=require("Services"); // space-infix-ops (eslint)
 const osString = Services.appinfo.OS;
 const { Cu } = require("chrome");
 
 // Panels
 loader.lazyGetter(this, "OptionsPanel", () => require("devtools/client/framework/toolbox-options").OptionsPanel);
diff --git a/devtools/client/framework/components/ToolboxTabs.js b/devtools/client/framework/components/ToolboxTabs.js
--- a/devtools/client/framework/components/ToolboxTabs.js
+++ b/devtools/client/framework/components/ToolboxTabs.js
@@ -73,10 +73,12 @@
       this.updateOverflowedTabs();
     }
   }
 
   componentWillUnmount() {
+    window.removeEventListener("resize", this.resizeHandler);
+    window.cancelIdleCallback(this._resizeTimerId);
     this._tabsOrderManager.destroy();
   }
 
   /**
    * Check if two array of ids are the same or not.
diff --git a/devtools/client/inspector/animation/animation.js b/devtools/client/inspector/animation/animation.js
--- a/devtools/client/inspector/animation/animation.js
+++ b/devtools/client/inspector/animation/animation.js
@@ -515,11 +515,12 @@
    */
   async setHighlightedNode(nodeFront) {
     await this.inspector.highlighters.hideBoxModelHighlighter();
 
     if (nodeFront) {
-      await this.inspector.highlighters.showBoxModelHighlighter(nodeFront);
+      await this.inspector.highlighters.showBoxModelHighlighter(
+        nodeFront, { hideInfoBar: true, hideGuides: true });
     }
 
     this.inspector.store.dispatch(updateHighlightedNode(nodeFront));
   }
 
diff --git a/devtools/client/inspector/animation/components/AnimationTarget.js b/devtools/client/inspector/animation/components/AnimationTarget.js
--- a/devtools/client/inspector/animation/components/AnimationTarget.js
+++ b/devtools/client/inspector/animation/components/AnimationTarget.js
@@ -86,11 +86,12 @@
 
   async highlight() {
     await this.ensureNodeFront();
 
     if (this.state.nodeFront) {
-      this.props.onShowBoxModelHighlighterForNode(this.state.nodeFront);
+      this.props.onShowBoxModelHighlighterForNode(
+        this.state.nodeFront, { hideInfoBar: true, hideGuides: true });
     }
   }
 
   async select() {
     await this.ensureNodeFront();
diff --git a/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js b/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js
--- a/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js
+++ b/devtools/client/inspector/animation/components/keyframes-graph/ColorPath.js
@@ -31,11 +31,11 @@
   getPropertyValue(keyframe) {
     return keyframe.value;
   }
 
   propToState({ keyframes }) {
-    const maxObject = { distance: 0 };
+    const maxObject = { distance: -Number.MAX_VALUE };
 
     for (let i = 0; i < keyframes.length - 1; i++) {
       const value1 = getRGBA(keyframes[i].value);
       for (let j = i + 1; j < keyframes.length; j++) {
         const value2 = getRGBA(keyframes[j].value);
diff --git a/devtools/client/inspector/animation/test/doc_multi_keyframes.html b/devtools/client/inspector/animation/test/doc_multi_keyframes.html
--- a/devtools/client/inspector/animation/test/doc_multi_keyframes.html
+++ b/devtools/client/inspector/animation/test/doc_multi_keyframes.html
@@ -198,8 +198,32 @@
           opacity: 1,
           offset: 1,
         },
       ]
     );
+
+    createAnimation(
+      "same-color",
+      [
+        {
+          backgroundColor: "lime",
+        },
+        {
+          backgroundColor: "lime",
+        },
+      ]
+    );
+
+    createAnimation(
+      "currentcolor",
+      [
+        {
+          backgroundColor: "currentColor",
+        },
+        {
+          backgroundColor: "lime",
+        },
+      ]
+    );
     </script>
   </body>
 </html>
diff --git a/devtools/client/inspector/animation/test/keyframes-graph_keyframe-marker_head.js b/devtools/client/inspector/animation/test/keyframes-graph_keyframe-marker_head.js
--- a/devtools/client/inspector/animation/test/keyframes-graph_keyframe-marker_head.js
+++ b/devtools/client/inspector/animation/test/keyframes-graph_keyframe-marker_head.js
@@ -130,11 +130,47 @@
             marginInlineStart: "100%",
           },
         ],
       },
     ],
-  }
+  },
+  {
+    targetClass: "same-color",
+    properties: [
+      {
+        name: "background-color",
+        expectedValues: [
+          {
+            title: "rgb(0, 255, 0)",
+            marginInlineStart: "0%",
+          },
+          {
+            title: "rgb(0, 255, 0)",
+            marginInlineStart: "100%",
+          },
+        ],
+      },
+    ],
+  },
+  {
+    targetClass: "currentcolor",
+    properties: [
+      {
+        name: "background-color",
+        expectedValues: [
+          {
+            title: "currentcolor",
+            marginInlineStart: "0%",
+          },
+          {
+            title: "rgb(0, 255, 0)",
+            marginInlineStart: "100%",
+          },
+        ],
+      },
+    ],
+  },
 ];
 
 /**
  * Do test for keyframes-graph_keyframe-marker-ltf/rtl.
  *
@@ -177,6 +213,5 @@
           `${ expectedValue.marginInlineStart }`);
       }
     }
   }
 }
-
diff --git a/devtools/client/menus.js b/devtools/client/menus.js
--- a/devtools/client/menus.js
+++ b/devtools/client/menus.js
@@ -1,10 +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/. */
 
-"use strict";
+// "use strict"; // strict (eslint)
 
 /**
  * This module defines the sorted list of menuitems inserted into the
  * "Web Developer" menu.
  * It also defines the key shortcuts that relates to them.
@@ -37,10 +37,12 @@
 loader.lazyRequireGetter(this, "openDocLink", "devtools/client/shared/link", true);
 
 loader.lazyImporter(this, "BrowserToolboxProcess", "resource://devtools/client/framework/ToolboxProcess.jsm");
 loader.lazyImporter(this, "ScratchpadManager", "resource://devtools/client/scratchpad/scratchpad-manager.jsm");
 
+	// no-tabs (eslint)
+
 exports.menuitems = [
   { id: "menu_devToolbox",
     l10nKey: "devToolboxMenuItem",
     oncommand(event) {
       const window = event.target.ownerDocument.defaultView;
diff --git a/devtools/client/shared/scroll.js b/devtools/client/shared/scroll.js
--- a/devtools/client/shared/scroll.js
+++ b/devtools/client/shared/scroll.js
@@ -2,11 +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/. */
 
 "use strict";
 
-// Make this available to both AMD and CJS environments
+# Make this available to both AMD and CJS environments // Parsing error: Unexpected character '#' (eslint)
 define(function(require, exports, module) {
   /**
    * Scroll the document so that the element "elem" appears in the viewport.
    *
    * @param {DOMNode} elem
diff --git a/devtools/client/webconsole/browser-console.js b/devtools/client/webconsole/browser-console.js
new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/browser-console.js
@@ -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/. */
+
+"use strict";
+
+var Services = require("Services");
+loader.lazyRequireGetter(this, "extend", "devtools/shared/extend", true);
+loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+loader.lazyRequireGetter(this, "WebConsole", "devtools/client/webconsole/webconsole");
+
+// The preference prefix for all of the Browser Console filters.
+const BC_FILTER_PREFS_PREFIX = "devtools.browserconsole.filter.";
+
+/**
+ * A BrowserConsole instance is an interactive console initialized *per target*
+ * that displays console log data as well as provides an interactive terminal to
+ * manipulate the target's document content.
+ *
+ * This object only wraps the iframe that holds the Browser Console UI. This is
+ * meant to be an integration point between the Firefox UI and the Browser Console
+ * UI and features.
+ *
+ * This object extends the WebConsole object located in webconsole.js
+ *
+ * @constructor
+ * @param object target
+ *        The target that the browser console will connect to.
+ * @param nsIDOMWindow iframeWindow
+ *        The window where the browser console UI is already loaded.
+ * @param nsIDOMWindow chromeWindow
+ *        The window of the browser console owner.
+ * @param object hudService
+ *        The parent HUD Service
+ */
+function BrowserConsole(target, iframeWindow, chromeWindow, hudService) {
+  WebConsole.call(this, target, iframeWindow, chromeWindow, hudService);
+  this._telemetry = new Telemetry();
+}
+
+BrowserConsole.prototype = extend(WebConsole.prototype, {
+  _browserConsole: true,
+  _bcInit: null,
+  _bcDestroyer: null,
+
+  $init: WebConsole.prototype.init,
+
+  /**
+   * Initialize the Browser Console instance.
+   *
+   * @return object
+   *         A promise for the initialization.
+   */
+  init() {
+    if (this._bcInit) {
+      return this._bcInit;
+    }
+
+    // Only add the shutdown observer if we've opened a Browser Console window.
+    ShutdownObserver.init(this.hudService);
+
+    this.ui._filterPrefsPrefix = BC_FILTER_PREFS_PREFIX;
+
+    const window = this.iframeWindow;
+
+    // Make sure that the closing of the Browser Console window destroys this
+    // instance.
+    window.addEventListener("unload", () => {
+      this.destroy();
+    }, {once: true});
+
+    this._telemetry.toolOpened("browserconsole");
+
+    this._bcInit = this.$init();
+    return this._bcInit;
+  },
+
+  $destroy: WebConsole.prototype.destroy,
+
+  /**
+   * Destroy the object.
+   *
+   * @return object
+   *         A promise object that is resolved once the Browser Console is closed.
+   */
+  destroy() {
+    if (this._bcDestroyer) {
+      return this._bcDestroyer;
+    }
+
+    this._bcDestroyer = (async () => {
+      this._telemetry.toolClosed("browserconsole");
+      await this.$destroy();
+      await this.target.client.close();
+      this.hudService._browserConsoleID = null;
+      this.chromeWindow.close();
+    })();
+
+    return this._bcDestroyer;
+  },
+});
+
+/**
+ * The ShutdownObserver listens for app shutdown and saves the current state
+ * of the Browser Console for session restore.
+ */
+var ShutdownObserver = {
+  _initialized: false,
+
+  init(hudService) {
+    if (this._initialized) {
+      return;
+    }
+
+    Services.obs.addObserver(this, "quit-application-granted");
+
+    this._initialized = true;
+    this.hudService = hudService;
+  },
+
+  observe(message, topic) {
+    if (topic == "quit-application-granted") {
+      this.hudService.storeBrowserConsoleSessionState();
+      this.uninit();
+    }
+  },
+
+  uninit() {
+    Services.obs.removeObserver(this, "quit-application-granted");
+  }
+};
+
+module.exports = BrowserConsole;
diff --git a/devtools/client/webconsole/components/JSTerm.js b/devtools/client/webconsole/components/JSTerm.js
--- a/devtools/client/webconsole/components/JSTerm.js
+++ b/devtools/client/webconsole/components/JSTerm.js
@@ -17,10 +17,11 @@
 loader.lazyRequireGetter(this, "PropTypes", "devtools/client/shared/vendor/react-prop-types");
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "KeyCodes", "devtools/client/shared/keycodes", true);
 loader.lazyRequireGetter(this, "Editor", "devtools/client/sourceeditor/editor");
 loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
+loader.lazyRequireGetter(this, "processScreenshot", "devtools/shared/webconsole/screenshot-helper");
 
 const l10n = require("devtools/client/webconsole/webconsole-l10n");
 
 const HELP_URL = "https://developer.mozilla.org/docs/Tools/Web_Console/Helpers";
 
@@ -329,11 +330,11 @@
    *        Optional function to invoke when the evaluation result is added to
    *        the output.
    * @param object response
    *        The message received from the server.
    */
-  _executeResultCallback(callback, response) {
+  async _executeResultCallback(callback, response) {
     if (!this.hud) {
       return;
     }
     if (response.error) {
       console.error("Evaluation error " + response.error + ": " + response.message);
@@ -371,10 +372,16 @@
           this.hud.owner.openLink(HELP_URL);
           break;
         case "copyValueToClipboard":
           clipboardHelper.copyString(helperResult.value);
           break;
+        case "screenshotOutput":
+          const { args, value } = helperResult;
+          const results = await processScreenshot(this.hud.window, args, value);
+          this.screenshotNotify(results);
+          // early return as screenshot notify has dispatched all necessary messages
+          return;
       }
     }
 
     // Hide undefined results coming from JSTerm helper functions.
     if (!errorMessage && result && typeof result == "object" &&
@@ -397,10 +404,15 @@
       }
     }, true);
     return this.hud.consoleOutput;
   }
 
+  screenshotNotify(results) {
+    const wrappedResults = results.map(result => ({ result }));
+    this.hud.consoleOutput.dispatchMessagesAdd(wrappedResults);
+  }
+
   /**
    * Execute a string. Execution happens asynchronously in the content process.
    *
    * @param string [executeString]
    *        The string you want to execute. If this is not provided, the current
diff --git a/devtools/client/webconsole/hudservice.js b/devtools/client/webconsole/hudservice.js
--- a/devtools/client/webconsole/hudservice.js
+++ b/devtools/client/webconsole/hudservice.js
@@ -3,49 +3,42 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 var Services = require("Services");
-loader.lazyRequireGetter(this, "Utils", "devtools/client/webconsole/utils", true);
-loader.lazyRequireGetter(this, "extend", "devtools/shared/extend", true);
 loader.lazyRequireGetter(this, "TargetFactory", "devtools/client/framework/target", true);
 loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true);
-loader.lazyRequireGetter(this, "Telemetry", "devtools/client/shared/telemetry");
-loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/webconsole-frame", true);
 loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
 loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/debugger-client", true);
-loader.lazyRequireGetter(this, "viewSource", "devtools/client/shared/view-source");
 loader.lazyRequireGetter(this, "l10n", "devtools/client/webconsole/webconsole-l10n");
-loader.lazyRequireGetter(this, "openDocLink", "devtools/client/shared/link", true);
-const BC_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
-
-// The preference prefix for all of the Browser Console filters.
-const BC_FILTER_PREFS_PREFIX = "devtools.browserconsole.filter.";
+loader.lazyRequireGetter(this, "WebConsole", "devtools/client/webconsole/webconsole");
+loader.lazyRequireGetter(this, "BrowserConsole", "devtools/client/webconsole/browser-console");
 
-var gHudId = 0;
+const BC_WINDOW_FEATURES = "chrome,titlebar,toolbar,centerscreen,resizable,dialog=no";
 
-function HUD_SERVICE() {
+function HUDService() {
   this.consoles = new Map();
   this.lastFinishedRequest = { callback: null };
 }
 
-HUD_SERVICE.prototype =
-{
+HUDService.prototype = {
   _browserConsoleID: null,
   _browserConsoleInitializing: null,
 
   /**
    * Keeps a reference for each Web Console / Browser Console that is created.
    * @type Map
    */
   consoles: null,
 
   _browerConsoleSessionState: false,
+
   storeBrowserConsoleSessionState() {
     this._browerConsoleSessionState = !!this.getBrowserConsole();
   },
+
   getBrowserConsoleSessionState() {
     return this._browerConsoleSessionState;
   },
 
   /**
@@ -81,11 +74,11 @@
    *        The window of the web console owner.
    * @return object
    *         A promise object for the opening of the new WebConsole instance.
    */
   openWebConsole(target, iframeWindow, chromeWindow) {
-    const hud = new WebConsole(target, iframeWindow, chromeWindow);
+    const hud = new WebConsole(target, iframeWindow, chromeWindow, this);
     this.consoles.set(hud.hudId, hud);
     return hud.init();
   },
 
   /**
@@ -101,11 +94,11 @@
    *        The window of the browser console owner.
    * @return object
    *         A promise object for the opening of the new BrowserConsole instance.
    */
   openBrowserConsole(target, iframeWindow, chromeWindow) {
-    const hud = new BrowserConsole(target, iframeWindow, chromeWindow);
+    const hud = new BrowserConsole(target, iframeWindow, chromeWindow, this);
     this._browserConsoleID = hud.hudId;
     this.consoles.set(hud.hudId, hud);
     return hud.init();
   },
 
@@ -244,416 +237,6 @@
   getBrowserConsole() {
     return this.getHudReferenceById(this._browserConsoleID);
   },
 };
 
-/**
- * A WebConsole instance is an interactive console initialized *per target*
- * that displays console log data as well as provides an interactive terminal to
- * manipulate the target's document content.
- *
- * This object only wraps the iframe that holds the Web Console UI. This is
- * meant to be an integration point between the Firefox UI and the Web Console
- * UI and features.
- *
- * @constructor
- * @param object target
- *        The target that the web console will connect to.
- * @param nsIDOMWindow iframeWindow
- *        The window where the web console UI is already loaded.
- * @param nsIDOMWindow chromeWindow
- *        The window of the web console owner.
- */
-function WebConsole(target, iframeWindow, chromeWindow) {
-  this.iframeWindow = iframeWindow;
-  this.chromeWindow = chromeWindow;
-  this.hudId = "hud_" + ++gHudId;
-  this.target = target;
-  this.browserWindow = this.chromeWindow.top;
-  const element = this.browserWindow.document.documentElement;
-  if (element.getAttribute("windowtype") != gDevTools.chromeWindowType) {
-    this.browserWindow = HUDService.currentContext();
-  }
-  this.ui = new WebConsoleFrame(this);
-}
-WebConsole.prototype = {
-  iframeWindow: null,
-  chromeWindow: null,
-  browserWindow: null,
-  hudId: null,
-  target: null,
-  ui: null,
-  _browserConsole: false,
-  _destroyer: null,
-
-  /**
-   * Getter for a function to to listen for every request that completes. Used
-   * by unit tests. The callback takes one argument: the HTTP activity object as
-   * received from the remote Web Console.
-   *
-   * @type function
-   */
-  get lastFinishedRequestCallback() {
-    return HUDService.lastFinishedRequest.callback;
-  },
-
-  /**
-   * Getter for the window that can provide various utilities that the web
-   * console makes use of, like opening links, managing popups, etc.  In
-   * most cases, this will be |this.browserWindow|, but in some uses (such as
-   * the Browser Toolbox), there is no browser window, so an alternative window
-   * hosts the utilities there.
-   * @type nsIDOMWindow
-   */
-  get chromeUtilsWindow() {
-    if (this.browserWindow) {
-      return this.browserWindow;
-    }
-    return this.chromeWindow.top;
-  },
-
-  /**
-   * Getter for the xul:popupset that holds any popups we open.
-   * @type Element
-   */
-  get mainPopupSet() {
-    return this.chromeUtilsWindow.document.getElementById("mainPopupSet");
-  },
-
-  /**
-   * Getter for the output element that holds messages we display.
-   * @type Element
-   */
-  get outputNode() {
-    return this.ui ? this.ui.outputNode : null;
-  },
-
-  get gViewSourceUtils() {
-    return this.chromeUtilsWindow.gViewSourceUtils;
-  },
-
-  /**
-   * Initialize the Web Console instance.
-   *
-   * @return object
-   *         A promise for the initialization.
-   */
-  init() {
-    return this.ui.init().then(() => this);
-  },
-
-  /**
-   * The JSTerm object that manages the console's input.
-   * @see webconsole.js::JSTerm
-   * @type object
-   */
-  get jsterm() {
-    return this.ui ? this.ui.jsterm : null;
-  },
-
-  /**
-   * Alias for the WebConsoleFrame.setFilterState() method.
-   * @see webconsole.js::WebConsoleFrame.setFilterState()
-   */
-  setFilterState() {
-    this.ui && this.ui.setFilterState.apply(this.ui, arguments);
-  },
-
-  /**
-   * Open a link in a new tab.
-   *
-   * @param string link
-   *        The URL you want to open in a new tab.
-   */
-  openLink(link, e) {
-    openDocLink(link);
-  },
-
-  /**
-   * Open a link in Firefox's view source.
-   *
-   * @param string sourceURL
-   *        The URL of the file.
-   * @param integer sourceLine
-   *        The line number which should be highlighted.
-   */
-  viewSource(sourceURL, sourceLine) {
-    this.gViewSourceUtils.viewSource({ URL: sourceURL, lineNumber: sourceLine || 0 });
-  },
-
-  /**
-   * Tries to open a Stylesheet file related to the web page for the web console
-   * instance in the Style Editor. If the file is not found, it is opened in
-   * source view instead.
-   *
-   * Manually handle the case where toolbox does not exist (Browser Console).
-   *
-   * @param string sourceURL
-   *        The URL of the file.
-   * @param integer sourceLine
-   *        The line number which you want to place the caret.
-   */
-  viewSourceInStyleEditor(sourceURL, sourceLine) {
-    const toolbox = gDevTools.getToolbox(this.target);
-    if (!toolbox) {
-      this.viewSource(sourceURL, sourceLine);
-      return;
-    }
-    toolbox.viewSourceInStyleEditor(sourceURL, sourceLine);
-  },
-
-  /**
-   * Tries to open a JavaScript file related to the web page for the web console
-   * instance in the Script Debugger. If the file is not found, it is opened in
-   * source view instead.
-   *
-   * Manually handle the case where toolbox does not exist (Browser Console).
-   *
-   * @param string sourceURL
-   *        The URL of the file.
-   * @param integer sourceLine
-   *        The line number which you want to place the caret.
-   */
-  viewSourceInDebugger(sourceURL, sourceLine) {
-    const toolbox = gDevTools.getToolbox(this.target);
-    if (!toolbox) {
-      this.viewSource(sourceURL, sourceLine);
-      return;
-    }
-    toolbox.viewSourceInDebugger(sourceURL, sourceLine).then(() => {
-      this.ui.emit("source-in-debugger-opened");
-    });
-  },
-
-  /**
-   * Tries to open a JavaScript file related to the web page for the web console
-   * instance in the corresponding Scratchpad.
-   *
-   * @param string sourceURL
-   *        The URL of the file which corresponds to a Scratchpad id.
-   */
-  viewSourceInScratchpad(sourceURL, sourceLine) {
-    viewSource.viewSourceInScratchpad(sourceURL, sourceLine);
-  },
-
-  /**
-   * Retrieve information about the JavaScript debugger's stackframes list. This
-   * is used to allow the Web Console to evaluate code in the selected
-   * stackframe.
-   *
-   * @return object|null
-   *         An object which holds:
-   *         - frames: the active ThreadClient.cachedFrames array.
-   *         - selected: depth/index of the selected stackframe in the debugger
-   *         UI.
-   *         If the debugger is not open or if it's not paused, then |null| is
-   *         returned.
-   */
-  getDebuggerFrames() {
-    const toolbox = gDevTools.getToolbox(this.target);
-    if (!toolbox) {
-      return null;
-    }
-    const panel = toolbox.getPanel("jsdebugger");
-
-    if (!panel) {
-      return null;
-    }
-
-    return panel.getFrames();
-  },
-
-  async getMappedExpression(expression) {
-    const toolbox = gDevTools.getToolbox(this.target);
-    if (!toolbox) {
-      return expression;
-    }
-    const panel = toolbox.getPanel("jsdebugger");
-
-    if (!panel) {
-      return expression;
-    }
-
-    return panel.getMappedExpression(expression);
-  },
-
-  /**
-   * Retrieves the current selection from the Inspector, if such a selection
-   * exists. This is used to pass the ID of the selected actor to the Web
-   * Console server for the $0 helper.
-   *
-   * @return object|null
-   *         A Selection referring to the currently selected node in the
-   *         Inspector.
-   *         If the inspector was never opened, or no node was ever selected,
-   *         then |null| is returned.
-   */
-  getInspectorSelection() {
-    const toolbox = gDevTools.getToolbox(this.target);
-    if (!toolbox) {
-      return null;
-    }
-    const panel = toolbox.getPanel("inspector");
-    if (!panel || !panel.selection) {
-      return null;
-    }
-    return panel.selection;
-  },
-
-  /**
-   * Destroy the object. Call this method to avoid memory leaks when the Web
-   * Console is closed.
-   *
-   * @return object
-   *         A promise object that is resolved once the Web Console is closed.
-   */
-  async destroy() {
-    if (this._destroyer) {
-      return this._destroyer;
-    }
-
-    this._destroyer = (async () => {
-      HUDService.consoles.delete(this.hudId);
-
-      // The document may already be removed
-      if (this.chromeUtilsWindow && this.mainPopupSet) {
-        const popupset = this.mainPopupSet;
-        const panels = popupset.querySelectorAll("panel[hudId=" + this.hudId + "]");
-        for (const panel of panels) {
-          panel.hidePopup();
-        }
-      }
-
-      if (this.ui) {
-        await this.ui.destroy();
-      }
-
-      if (!this._browserConsole) {
-        try {
-          await this.target.activeTab.focus();
-        } catch (ex) {
-          // Tab focus can fail if the tab or target is closed.
-        }
-      }
-
-      const id = Utils.supportsString(this.hudId);
-      Services.obs.notifyObservers(id, "web-console-destroyed");
-    })();
-
-    return this._destroyer;
-  },
-};
-
-/**
- * A BrowserConsole instance is an interactive console initialized *per target*
- * that displays console log data as well as provides an interactive terminal to
- * manipulate the target's document content.
- *
- * This object only wraps the iframe that holds the Browser Console UI. This is
- * meant to be an integration point between the Firefox UI and the Browser Console
- * UI and features.
- *
- * @constructor
- * @param object target
- *        The target that the browser console will connect to.
- * @param nsIDOMWindow iframeWindow
- *        The window where the browser console UI is already loaded.
- * @param nsIDOMWindow chromeWindow
- *        The window of the browser console owner.
- */
-function BrowserConsole() {
-  WebConsole.apply(this, arguments);
-  this._telemetry = new Telemetry();
-}
-
-BrowserConsole.prototype = extend(WebConsole.prototype, {
-  _browserConsole: true,
-  _bcInit: null,
-  _bcDestroyer: null,
-
-  $init: WebConsole.prototype.init,
-
-  /**
-   * Initialize the Browser Console instance.
-   *
-   * @return object
-   *         A promise for the initialization.
-   */
-  init() {
-    if (this._bcInit) {
-      return this._bcInit;
-    }
-
-    // Only add the shutdown observer if we've opened a Browser Console window.
-    ShutdownObserver.init();
-
-    this.ui._filterPrefsPrefix = BC_FILTER_PREFS_PREFIX;
-
-    const window = this.iframeWindow;
-
-    // Make sure that the closing of the Browser Console window destroys this
-    // instance.
-    window.addEventListener("unload", () => {
-      this.destroy();
-    }, {once: true});
-
-    this._telemetry.toolOpened("browserconsole");
-
-    this._bcInit = this.$init();
-    return this._bcInit;
-  },
-
-  $destroy: WebConsole.prototype.destroy,
-
-  /**
-   * Destroy the object.
-   *
-   * @return object
-   *         A promise object that is resolved once the Browser Console is closed.
-   */
-  destroy() {
-    if (this._bcDestroyer) {
-      return this._bcDestroyer;
-    }
-
-    this._bcDestroyer = (async () => {
-      this._telemetry.toolClosed("browserconsole");
-      await this.$destroy();
-      await this.target.client.close();
-      HUDService._browserConsoleID = null;
-      this.chromeWindow.close();
-    })();
-
-    return this._bcDestroyer;
-  },
-});
-
-const HUDService = new HUD_SERVICE();
-exports.HUDService = HUDService;
-
-/**
- * The ShutdownObserver listens for app shutdown and saves the current state
- * of the Browser Console for session restore.
- */
-var ShutdownObserver = {
-  _initialized: false,
-  init() {
-    if (this._initialized) {
-      return;
-    }
-
-    Services.obs.addObserver(this, "quit-application-granted");
-
-    this._initialized = true;
-  },
-
-  observe(message, topic) {
-    if (topic == "quit-application-granted") {
-      HUDService.storeBrowserConsoleSessionState();
-      this.uninit();
-    }
-  },
-
-  uninit() {
-    Services.obs.removeObserver(this, "quit-application-granted");
-  }
-};
+exports.HUDService = new HUDService();
diff --git a/devtools/client/webconsole/moz.build b/devtools/client/webconsole/moz.build
--- a/devtools/client/webconsole/moz.build
+++ b/devtools/client/webconsole/moz.build
@@ -13,10 +13,11 @@
     'selectors',
     'test',
     'utils',
 ]
 DevToolsModules(
+    'browser-console.js',
     'console-commands.js',
     'constants.js',
     'hudservice.js',
     'main.js',
     'panel.js',
@@ -25,8 +26,9 @@
     'utils.js',
     'webconsole-connection-proxy.js',
     'webconsole-frame.js',
     'webconsole-l10n.js',
     'webconsole-output-wrapper.js',
+    'webconsole.js',
 )
 with Files('**'):
     BUG_COMPONENT = ('DevTools', 'Console')
diff --git a/devtools/client/webconsole/test/mochitest/browser.ini b/devtools/client/webconsole/test/mochitest/browser.ini
--- a/devtools/client/webconsole/test/mochitest/browser.ini
+++ b/devtools/client/webconsole/test/mochitest/browser.ini
@@ -101,10 +101,11 @@
   test-insecure-passwords-about-blank-web-console-warning.html
   test-insecure-passwords-web-console-warning.html
   test-inspect-cross-domain-objects-frame.html
   test-inspect-cross-domain-objects-top.html
   test-jsterm-dollar.html
+  test_jsterm_screenshot_command.html
   test-local-session-storage.html
   test-location-debugger-link-console-log.js
   test-location-debugger-link-errors.js
   test-location-debugger-link.html
   test-location-styleeditor-link-1.css
@@ -225,10 +226,14 @@
 [browser_jsterm_no_input_and_tab_key_pressed.js]
 [browser_jsterm_no_input_change_and_tab_key_pressed.js]
 [browser_jsterm_null_undefined.js]
 [browser_jsterm_popup_close_on_tab_switch.js]
 [browser_jsterm_popup.js]
+[browser_jsterm_screenshot_command_clipboard.js]
+subsuite = clipboard
+[browser_jsterm_screenshot_command_file.js]
+skip-if = (os == 'win') # Bug 1464461, disabled on Win due to timeouts
 [browser_jsterm_selfxss.js]
 subsuite = clipboard
 [browser_webconsole_allow_mixedcontent_securityerrors.js]
 tags = mcb
 [browser_webconsole_batching.js]
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_clipboard.js
@@ -0,0 +1,209 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that screenshot command works properly
+
+"use strict";
+
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
+                 "test/mochitest/test_jsterm_screenshot_command.html";
+
+// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
+// to keep tests consistant across OSs we are setting the dpr to 1
+const dpr = "--dpr 1";
+
+add_task(async function() {
+  const hud = await openNewTabAndConsole(TEST_URI);
+  ok(hud, "web console opened");
+
+  await testClipboard(hud);
+  await testFullpageClipboard(hud);
+  await testSelectorClipboard(hud);
+
+  // overflow
+  await createScrollbarOverflow();
+  await testFullpageClipboardScrollbar(hud);
+});
+
+async function testClipboard(hud) {
+  const command = `:screenshot --clipboard ${dpr}`;
+  const onMessage = waitForMessage(hud, "Screenshot copied to clipboard.");
+  hud.jsterm.execute(command);
+  await onMessage;
+  const contentSize = await getContentSize();
+  const imgSize = await getImageSizeFromClipboard();
+
+  is(imgSize.width, contentSize.innerWidth,
+     "Clipboard: Image width matches window size");
+  is(imgSize.height, contentSize.innerHeight,
+     "Clipboard: Image height matches window size");
+}
+
+async function testFullpageClipboard(hud) {
+  const command = `:screenshot --fullpage --clipboard ${dpr}`;
+  const onMessage = waitForMessage(hud, "Screenshot copied to clipboard.");
+  hud.jsterm.execute(command);
+  await onMessage;
+  const contentSize = await getContentSize();
+  const imgSize = await getImageSizeFromClipboard();
+
+  is(imgSize.width,
+    (contentSize.innerWidth + contentSize.scrollMaxX -
+     contentSize.scrollMinX),
+    "Fullpage Clipboard: Image width matches page size");
+  is(imgSize.height,
+    (contentSize.innerHeight + contentSize.scrollMaxY -
+     contentSize.scrollMinY),
+    "Fullpage Clipboard: Image height matches page size");
+}
+
+async function testSelectorClipboard(hud) {
+  const command = `:screenshot --selector "img#testImage" --clipboard ${dpr}`;
+  const messageReceived = waitForMessage(hud, "Screenshot copied to clipboard.");
+  hud.jsterm.execute(command);
+  await messageReceived;
+  const imgSize1 = await getImageSizeFromClipboard();
+  await ContentTask.spawn(
+    gBrowser.selectedBrowser,
+    imgSize1,
+    function(imgSize) {
+      const img = content.document.querySelector("#testImage");
+      is(imgSize.width, img.clientWidth,
+         "Selector Clipboard: Image width matches element size");
+      is(imgSize.height, img.clientHeight,
+         "Selector Clipboard: Image height matches element size");
+    }
+  );
+}
+
+async function testFullpageClipboardScrollbar(hud) {
+  const command = `:screenshot --fullpage --clipboard ${dpr}`;
+  const onMessage = waitForMessage(hud, "Screenshot copied to clipboard.");
+  hud.jsterm.execute(command);
+  await onMessage;
+  const contentSize = await getContentSize();
+  const scrollbarSize = await getScrollbarSize();
+  const imgSize = await getImageSizeFromClipboard();
+
+  is(imgSize.width,
+    (contentSize.innerWidth + contentSize.scrollMaxX -
+     contentSize.scrollMinX) - scrollbarSize.width,
+    "Scroll Fullpage Clipboard: Image width matches page size minus scrollbar size");
+  is(imgSize.height,
+    (contentSize.innerHeight + contentSize.scrollMaxY -
+     contentSize.scrollMinY) - scrollbarSize.height,
+    "Scroll Fullpage Clipboard: Image height matches page size minus scrollbar size");
+}
+
+async function createScrollbarOverflow() {
+  // Trigger scrollbars by forcing document to overflow
+  // This only affects results on OSes with scrollbars that reduce document size
+  // (non-floating scrollbars).  With default OS settings, this means Windows
+  // and Linux are affected, but Mac is not.  For Mac to exhibit this behavior,
+  // change System Preferences -> General -> Show scroll bars to Always.
+  await ContentTask.spawn(gBrowser.selectedBrowser, {}, function() {
+    content.document.body.classList.add("overflow");
+  });
+}
+
+async function getScrollbarSize() {
+  const scrollbarSize = await ContentTask.spawn(
+    gBrowser.selectedBrowser,
+    {},
+    function() {
+      const winUtils = content.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIDOMWindowUtils);
+      const scrollbarHeight = {};
+      const scrollbarWidth = {};
+      winUtils.getScrollbarSize(true, scrollbarWidth, scrollbarHeight);
+      return {
+        width: scrollbarWidth.value,
+        height: scrollbarHeight.value,
+      };
+    }
+  );
+  info(`Scrollbar size: ${scrollbarSize.width}x${scrollbarSize.height}`);
+  return scrollbarSize;
+}
+
+async function getContentSize() {
+  const contentSize = await ContentTask.spawn(
+    gBrowser.selectedBrowser,
+    {},
+    function() {
+      return {
+        scrollMaxY: content.scrollMaxY,
+        scrollMaxX: content.scrollMaxX,
+        scrollMinY: content.scrollMinY,
+        scrollMinX: content.scrollMinX,
+        innerWidth: content.innerWidth,
+        innerHeight: content.innerHeight
+      };
+    }
+  );
+
+  info(`content size: ${contentSize.innerWidth}x${contentSize.innerHeight}`);
+  return contentSize;
+}
+
+async function getImageSizeFromClipboard() {
+  const clipid = Ci.nsIClipboard;
+  const clip = Cc["@mozilla.org/widget/clipboard;1"].getService(clipid);
+  const trans = Cc["@mozilla.org/widget/transferable;1"]
+                .createInstance(Ci.nsITransferable);
+  const flavor = "image/png";
+  trans.init(null);
+  trans.addDataFlavor(flavor);
+
+  clip.getData(trans, clipid.kGlobalClipboard);
+  const data = {};
+  const dataLength = {};
+  trans.getTransferData(flavor, data, dataLength);
+
+  ok(data.value, "screenshot exists");
+  ok(dataLength.value > 0, "screenshot has length");
+
+  let image = data.value;
+  let dataURI = `data:${flavor};base64,`;
+
+  // Due to the differences in how images could be stored in the clipboard the
+  // checks below are needed. The clipboard could already provide the image as
+  // byte streams, but also as pointer, or as image container. If it's not
+  // possible obtain a byte stream, the function returns `null`.
+  if (image instanceof Ci.nsISupportsInterfacePointer) {
+    image = image.data;
+  }
+
+  if (image instanceof Ci.imgIContainer) {
+    image = Cc["@mozilla.org/image/tools;1"]
+              .getService(Ci.imgITools)
+              .encodeImage(image, flavor);
+  }
+
+  if (image instanceof Ci.nsIInputStream) {
+    const binaryStream = Cc["@mozilla.org/binaryinputstream;1"]
+                         .createInstance(Ci.nsIBinaryInputStream);
+    binaryStream.setInputStream(image);
+    const rawData = binaryStream.readBytes(binaryStream.available());
+    const charCodes = Array.from(rawData, c => c.charCodeAt(0) & 0xff);
+    let encodedData = String.fromCharCode(...charCodes);
+    encodedData = btoa(encodedData);
+    dataURI = dataURI + encodedData;
+  } else {
+    throw new Error("Unable to read image data");
+  }
+
+  const img = document.createElementNS("http://www.w3.org/1999/xhtml", "img");
+
+  const loaded =  once(img, "load");
+
+  img.src = dataURI;
+  document.documentElement.appendChild(img);
+  await loaded;
+  img.remove();
+
+  return {
+    width: img.width,
+    height: img.height,
+  };
+}
diff --git a/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/browser_jsterm_screenshot_command_file.js
@@ -0,0 +1,39 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// Test that screenshot command works properly
+
+"use strict";
+
+const TEST_URI = "http://example.com/browser/devtools/client/webconsole/" +
+                 "test/mochitest/test_jsterm_screenshot_command.html";
+
+const FileUtils = (ChromeUtils.import("resource://gre/modules/FileUtils.jsm", {})).FileUtils;
+// on some machines, such as macOS, dpr is set to 2. This is expected behavior, however
+// to keep tests consistant across OSs we are setting the dpr to 1
+const dpr = "--dpr 1";
+
+add_task(async function() {
+  await addTab(TEST_URI);
+
+  const hud = await openConsole();
+  ok(hud, "web console opened");
+
+  await testFile(hud);
+});
+
+async function testFile(hud) {
+  // Test capture to file
+  const file = FileUtils.getFile("TmpD", [ "TestScreenshotFile.png" ]);
+  const command = `:screenshot ${file.path} ${dpr}`;
+  const onMessage = waitForMessage(hud, `Saved to ${file.path}`);
+  hud.jsterm.execute(command);
+  await onMessage;
+
+  ok(file.exists(), "Screenshot file exists");
+
+  if (file.exists()) {
+    file.remove(false);
+  }
+}
+
diff --git a/devtools/client/webconsole/test/mochitest/test_jsterm_screenshot_command.html b/devtools/client/webconsole/test/mochitest/test_jsterm_screenshot_command.html
new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/test/mochitest/test_jsterm_screenshot_command.html
@@ -0,0 +1,18 @@
+<html>
+  <head>
+    <style>
+      img {
+        height: 100px;
+        width: 100px;
+      }
+      .overflow {
+        overflow: scroll;
+        height: 200%;
+        width: 200%;
+      }
+    </style>
+  </head>
+  <body>
+    <img id="testImage" ></img>
+  </body>
+</html>
diff --git a/devtools/client/webconsole/webconsole-output-wrapper.js b/devtools/client/webconsole/webconsole-output-wrapper.js
--- a/devtools/client/webconsole/webconsole-output-wrapper.js
+++ b/devtools/client/webconsole/webconsole-output-wrapper.js
@@ -259,16 +259,16 @@
       });
     } else {
       promise = Promise.resolve();
     }
 
-    this.batchedMessagesAdd(packet);
+    this.batchedMessageAdd(packet);
     return promise;
   },
 
   dispatchMessagesAdd: function(messages) {
-    store.dispatch(actions.messagesAdd(messages));
+    this.batchedMessagesAdd(messages);
   },
 
   dispatchMessagesClear: function() {
     // We might still have pending message additions and updates when the clear action is
     // triggered, so we need to flush them to make sure we don't have unexpected behavior
@@ -371,15 +371,20 @@
   batchedRequestUpdates: function(message) {
     this.queuedRequestUpdates.push(message);
     this.setTimeoutIfNeeded();
   },
 
-  batchedMessagesAdd: function(message) {
+  batchedMessageAdd: function(message) {
     this.queuedMessageAdds.push(message);
     this.setTimeoutIfNeeded();
   },
 
+  batchedMessagesAdd: function(messages) {
+    this.queuedMessageAdds = this.queuedMessageAdds.concat(messages);
+    this.setTimeoutIfNeeded();
+  },
+
   dispatchClearHistory: function() {
     store.dispatch(actions.clearHistory());
   },
 
   /**
diff --git a/devtools/client/webconsole/webconsole.js b/devtools/client/webconsole/webconsole.js
new file mode 100644
--- /dev/null
+++ b/devtools/client/webconsole/webconsole.js
@@ -0,0 +1,318 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 Services = require("Services");
+loader.lazyRequireGetter(this, "Utils", "devtools/client/webconsole/utils", true);
+loader.lazyRequireGetter(this, "WebConsoleFrame", "devtools/client/webconsole/webconsole-frame", true);
+loader.lazyRequireGetter(this, "gDevTools", "devtools/client/framework/devtools", true);
+loader.lazyRequireGetter(this, "viewSource", "devtools/client/shared/view-source");
+loader.lazyRequireGetter(this, "openDocLink", "devtools/client/shared/link", true);
+
+var gHudId = 0;
+
+/**
+ * A WebConsole instance is an interactive console initialized *per target*
+ * that displays console log data as well as provides an interactive terminal to
+ * manipulate the target's document content.
+ *
+ * This object only wraps the iframe that holds the Web Console UI. This is
+ * meant to be an integration point between the Firefox UI and the Web Console
+ * UI and features.
+ *
+ * @constructor
+ * @param object target
+ *        The target that the web console will connect to.
+ * @param nsIDOMWindow iframeWindow
+ *        The window where the web console UI is already loaded.
+ * @param nsIDOMWindow chromeWindow
+ *        The window of the web console owner.
+ * @param object hudService
+ *        The parent HUD Service
+ */
+function WebConsole(target, iframeWindow, chromeWindow, hudService) {
+  this.iframeWindow = iframeWindow;
+  this.chromeWindow = chromeWindow;
+  this.hudId = "hud_" + ++gHudId;
+  this.target = target;
+  this.browserWindow = this.chromeWindow.top;
+  this.hudService = hudService;
+
+  const element = this.browserWindow.document.documentElement;
+  if (element.getAttribute("windowtype") != gDevTools.chromeWindowType) {
+    this.browserWindow = this.hudService.currentContext();
+  }
+  this.ui = new WebConsoleFrame(this);
+}
+
+WebConsole.prototype = {
+  iframeWindow: null,
+  chromeWindow: null,
+  browserWindow: null,
+  hudId: null,
+  target: null,
+  ui: null,
+  _browserConsole: false,
+  _destroyer: null,
+
+  /**
+   * Getter for a function to to listen for every request that completes. Used
+   * by unit tests. The callback takes one argument: the HTTP activity object as
+   * received from the remote Web Console.
+   *
+   * @type function
+   */
+  get lastFinishedRequestCallback() {
+    return this.hudService.lastFinishedRequest.callback;
+  },
+
+  /**
+   * Getter for the window that can provide various utilities that the web
+   * console makes use of, like opening links, managing popups, etc.  In
+   * most cases, this will be |this.browserWindow|, but in some uses (such as
+   * the Browser Toolbox), there is no browser window, so an alternative window
+   * hosts the utilities there.
+   * @type nsIDOMWindow
+   */
+  get chromeUtilsWindow() {
+    if (this.browserWindow) {
+      return this.browserWindow;
+    }
+    return this.chromeWindow.top;
+  },
+
+  /**
+   * Getter for the xul:popupset that holds any popups we open.
+   * @type Element
+   */
+  get mainPopupSet() {
+    return this.chromeUtilsWindow.document.getElementById("mainPopupSet");
+  },
+
+  /**
+   * Getter for the output element that holds messages we display.
+   * @type Element
+   */
+  get outputNode() {
+    return this.ui ? this.ui.outputNode : null;
+  },
+
+  get gViewSourceUtils() {
+    return this.chromeUtilsWindow.gViewSourceUtils;
+  },
+
+  /**
+   * Initialize the Web Console instance.
+   *
+   * @return object
+   *         A promise for the initialization.
+   */
+  init() {
+    return this.ui.init().then(() => this);
+  },
+
+  /**
+   * The JSTerm object that manages the console's input.
+   * @see webconsole.js::JSTerm
+   * @type object
+   */
+  get jsterm() {
+    return this.ui ? this.ui.jsterm : null;
+  },
+
+  /**
+   * Alias for the WebConsoleFrame.setFilterState() method.
+   * @see webconsole.js::WebConsoleFrame.setFilterState()
+   */
+  setFilterState() {
+    this.ui && this.ui.setFilterState.apply(this.ui, arguments);
+  },
+
+  /**
+   * Open a link in a new tab.
+   *
+   * @param string link
+   *        The URL you want to open in a new tab.
+   */
+  openLink(link, e) {
+    openDocLink(link);
+  },
+
+  /**
+   * Open a link in Firefox's view source.
+   *
+   * @param string sourceURL
+   *        The URL of the file.
+   * @param integer sourceLine
+   *        The line number which should be highlighted.
+   */
+  viewSource(sourceURL, sourceLine) {
+    this.gViewSourceUtils.viewSource({ URL: sourceURL, lineNumber: sourceLine || 0 });
+  },
+
+  /**
+   * Tries to open a Stylesheet file related to the web page for the web console
+   * instance in the Style Editor. If the file is not found, it is opened in
+   * source view instead.
+   *
+   * Manually handle the case where toolbox does not exist (Browser Console).
+   *
+   * @param string sourceURL
+   *        The URL of the file.
+   * @param integer sourceLine
+   *        The line number which you want to place the caret.
+   */
+  viewSourceInStyleEditor(sourceURL, sourceLine) {
+    const toolbox = gDevTools.getToolbox(this.target);
+    if (!toolbox) {
+      this.viewSource(sourceURL, sourceLine);
+      return;
+    }
+    toolbox.viewSourceInStyleEditor(sourceURL, sourceLine);
+  },
+
+  /**
+   * Tries to open a JavaScript file related to the web page for the web console
+   * instance in the Script Debugger. If the file is not found, it is opened in
+   * source view instead.
+   *
+   * Manually handle the case where toolbox does not exist (Browser Console).
+   *
+   * @param string sourceURL
+   *        The URL of the file.
+   * @param integer sourceLine
+   *        The line number which you want to place the caret.
+   */
+  viewSourceInDebugger(sourceURL, sourceLine) {
+    const toolbox = gDevTools.getToolbox(this.target);
+    if (!toolbox) {
+      this.viewSource(sourceURL, sourceLine);
+      return;
+    }
+    toolbox.viewSourceInDebugger(sourceURL, sourceLine).then(() => {
+      this.ui.emit("source-in-debugger-opened");
+    });
+  },
+
+  /**
+   * Tries to open a JavaScript file related to the web page for the web console
+   * instance in the corresponding Scratchpad.
+   *
+   * @param string sourceURL
+   *        The URL of the file which corresponds to a Scratchpad id.
+   */
+  viewSourceInScratchpad(sourceURL, sourceLine) {
+    viewSource.viewSourceInScratchpad(sourceURL, sourceLine);
+  },
+
+  /**
+   * Retrieve information about the JavaScript debugger's stackframes list. This
+   * is used to allow the Web Console to evaluate code in the selected
+   * stackframe.
+   *
+   * @return object|null
+   *         An object which holds:
+   *         - frames: the active ThreadClient.cachedFrames array.
+   *         - selected: depth/index of the selected stackframe in the debugger
+   *         UI.
+   *         If the debugger is not open or if it's not paused, then |null| is
+   *         returned.
+   */
+  getDebuggerFrames() {
+    const toolbox = gDevTools.getToolbox(this.target);
+    if (!toolbox) {
+      return null;
+    }
+    const panel = toolbox.getPanel("jsdebugger");
+
+    if (!panel) {
+      return null;
+    }
+
+    return panel.getFrames();
+  },
+
+  async getMappedExpression(expression) {
+    const toolbox = gDevTools.getToolbox(this.target);
+    if (!toolbox) {
+      return expression;
+    }
+    const panel = toolbox.getPanel("jsdebugger");
+
+    if (!panel) {
+      return expression;
+    }
+
+    return panel.getMappedExpression(expression);
+  },
+
+  /**
+   * Retrieves the current selection from the Inspector, if such a selection
+   * exists. This is used to pass the ID of the selected actor to the Web
+   * Console server for the $0 helper.
+   *
+   * @return object|null
+   *         A Selection referring to the currently selected node in the
+   *         Inspector.
+   *         If the inspector was never opened, or no node was ever selected,
+   *         then |null| is returned.
+   */
+  getInspectorSelection() {
+    const toolbox = gDevTools.getToolbox(this.target);
+    if (!toolbox) {
+      return null;
+    }
+    const panel = toolbox.getPanel("inspector");
+    if (!panel || !panel.selection) {
+      return null;
+    }
+    return panel.selection;
+  },
+
+  /**
+   * Destroy the object. Call this method to avoid memory leaks when the Web
+   * Console is closed.
+   *
+   * @return object
+   *         A promise object that is resolved once the Web Console is closed.
+   */
+  async destroy() {
+    if (this._destroyer) {
+      return this._destroyer;
+    }
+
+    this._destroyer = (async () => {
+      this.hudService.consoles.delete(this.hudId);
+
+      // The document may already be removed
+      if (this.chromeUtilsWindow && this.mainPopupSet) {
+        const popupset = this.mainPopupSet;
+        const panels = popupset.querySelectorAll("panel[hudId=" + this.hudId + "]");
+        for (const panel of panels) {
+          panel.hidePopup();
+        }
+      }
+
+      if (this.ui) {
+        await this.ui.destroy();
+      }
+
+      if (!this._browserConsole) {
+        try {
+          await this.target.activeTab.focus();
+        } catch (ex) {
+          // Tab focus can fail if the tab or target is closed.
+        }
+      }
+
+      const id = Utils.supportsString(this.hudId);
+      Services.obs.notifyObservers(id, "web-console-destroyed");
+    })();
+
+    return this._destroyer;
+  },
+};
+
+module.exports = WebConsole;
diff --git a/devtools/server/actors/stylesheets.js b/devtools/server/actors/stylesheets.js
--- a/devtools/server/actors/stylesheets.js
+++ b/devtools/server/actors/stylesheets.js
@@ -677,12 +677,12 @@
     }
 
     this.parentActor.off("stylesheet-added", this._onNewStyleSheetActor);
     this.parentActor.off("window-ready", this._onWindowReady);
 
-    this.parentActor.chromeEventHandler.removeEventListener("StyleSheetAdded",
-                                                            this._onSheetAdded, true);
+    this.parentActor.chromeEventHandler
+      .removeEventListener("StyleSheetApplicableStateChanged", this._onSheetAdded, true);
 
     protocol.Actor.prototype.destroy.call(this);
   },
 
   /**
diff --git a/devtools/server/actors/targets/browsing-context.js b/devtools/server/actors/targets/browsing-context.js
--- a/devtools/server/actors/targets/browsing-context.js
+++ b/devtools/server/actors/targets/browsing-context.js
@@ -1449,10 +1449,11 @@
    * @return StyleSheetActor actor
    *         The actor for this style sheet.
    *
    */
   createStyleSheetActor(styleSheet) {
+    assert(!this.exited, "Target must not be exited to create a sheet actor.");
     if (this._styleSheetActors.has(styleSheet)) {
       return this._styleSheetActors.get(styleSheet);
     }
     const actor = new StyleSheetActor(styleSheet, this);
     this._styleSheetActors.set(styleSheet, actor);
diff --git a/devtools/server/actors/webconsole.js b/devtools/server/actors/webconsole.js
--- a/devtools/server/actors/webconsole.js
+++ b/devtools/server/actors/webconsole.js
@@ -25,10 +25,12 @@
 loader.lazyRequireGetter(this, "StackTraceCollector", "devtools/shared/webconsole/network-monitor", true);
 loader.lazyRequireGetter(this, "JSPropertyProvider", "devtools/shared/webconsole/js-property-provider", true);
 loader.lazyRequireGetter(this, "Parser", "resource://devtools/shared/Parser.jsm", true);
 loader.lazyRequireGetter(this, "NetUtil", "resource://gre/modules/NetUtil.jsm", true);
 loader.lazyRequireGetter(this, "addWebConsoleCommands", "devtools/server/actors/webconsole/utils", true);
+loader.lazyRequireGetter(this, "formatCommand", "devtools/server/actors/webconsole/commands", true);
+loader.lazyRequireGetter(this, "isCommand", "devtools/server/actors/webconsole/commands", true);
 loader.lazyRequireGetter(this, "CONSOLE_WORKER_IDS", "devtools/server/actors/webconsole/utils", true);
 loader.lazyRequireGetter(this, "WebConsoleUtils", "devtools/server/actors/webconsole/utils", true);
 loader.lazyRequireGetter(this, "EnvironmentActor", "devtools/server/actors/environment", true);
 loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
 
@@ -873,10 +875,11 @@
   /**
    * Handler for the "evaluateJSAsync" request. This method evaluates the given
    * JavaScript string and sends back a packet with a unique ID.
    * The result will be returned later as an unsolicited `evaluationResult`,
    * that can be associated back to this request via the `resultID` field.
+   * Cannot be async, see Comment two on Bug #1452920
    *
    * @param object request
    *        The JSON request object received from the Web Console client.
    * @return object
    *         The response packet to send to with the unique id in the
@@ -895,10 +898,43 @@
 
     // Then, execute the script that may pause.
     const response = this.evaluateJS(request);
     response.resultID = resultID;
 
+    this._waitForHelperResultAndSend(response).catch(e =>
+      DevToolsUtils.reportException(
+        "evaluateJSAsync",
+        Error(`Encountered error while waiting for Helper Result: ${e}`)
+      )
+    );
+  },
+
+  /**
+   * In order to have asynchronous commands such as screenshot, we have to be
+   * able to handle promises in the helper result. This method handles waiting
+   * for the promise, and then dispatching the result
+   *
+   *
+   * @private
+   * @param object response
+   *         The response packet to send to with the unique id in the
+   *         `resultID` field, and potentially a promise in the helperResult
+   *         field.
+   *
+   * @return object
+   *         The response packet to send to with the unique id in the
+   *         `resultID` field, with a sanitized helperResult field.
+   */
+  _waitForHelperResultAndSend: async function(response) {
+    // Wait for asynchronous command completion before sending back the response
+    if (
+      response.helperResult &&
+      typeof response.helperResult.then == "function"
+    ) {
+      response.helperResult = await response.helperResult;
+    }
+
     // Finally, send an unsolicited evaluationResult packet with
     // the normal return value
     this.conn.sendActorEvent(this.actorID, "evaluationResult", response);
   },
 
@@ -1086,12 +1122,17 @@
         };
         addWebConsoleCommands(helpers);
         this._webConsoleCommandsCache =
           Object.getOwnPropertyNames(helpers.sandbox);
       }
+
       matches = matches.concat(this._webConsoleCommandsCache
-          .filter(n => n.startsWith(result.matchProp)));
+          .filter(n =>
+            // filter out `screenshot` command as it is inaccessible without
+            // the `:` prefix
+            n !== "screenshot" && n.startsWith(result.matchProp)
+          ));
     }
 
     return {
       from: this.actorID,
       matches: matches.sort(),
@@ -1294,10 +1335,20 @@
     // The help function needs to be easy to guess, so we make the () optional.
     if (trimmedString == "help" || trimmedString == "?") {
       string = "help()";
     }
 
+    const isCmd = isCommand(string);
+    // we support Unix like syntax for commands if it is preceeded by `:`
+    if (isCmd) {
+      try {
+        string = formatCommand(string);
+      } catch (e) {
+        string = `throw "${e}"`;
+      }
+    }
+
     // Add easter egg for console.mihai().
     if (trimmedString == "console.mihai()" || trimmedString == "console.mihai();") {
       string = "\"http://incompleteness.me/blog/2015/02/09/console-dot-mihai/\"";
     }
 
@@ -1367,31 +1418,41 @@
     }
 
     // Check if the Debugger.Frame or Debugger.Object for the global include
     // $ or $$. We will not overwrite these functions with the Web Console
     // commands.
-    let found$ = false, found$$ = false;
-    if (frame) {
-      const env = frame.environment;
-      if (env) {
-        found$ = !!env.find("$");
-        found$$ = !!env.find("$$");
+    let found$ = false, found$$ = false, disableScreenshot = false;
+    // do not override command functions if we are using the command key `:`
+    // before the command string
+    if (!isCmd) {
+      // if we do not have the command key as a prefix, screenshot is disabled by default
+      disableScreenshot = true;
+      if (frame) {
+        const env = frame.environment;
+        if (env) {
+          found$ = !!env.find("$");
+          found$$ = !!env.find("$$");
+        }
+      } else {
+        found$ = !!dbgWindow.getOwnPropertyDescriptor("$");
+        found$$ = !!dbgWindow.getOwnPropertyDescriptor("$$");
       }
-    } else {
-      found$ = !!dbgWindow.getOwnPropertyDescriptor("$");
-      found$$ = !!dbgWindow.getOwnPropertyDescriptor("$$");
     }
 
-    let $ = null, $$ = null;
+    let $ = null, $$ = null, screenshot = null;
     if (found$) {
       $ = bindings.$;
       delete bindings.$;
     }
     if (found$$) {
       $$ = bindings.$$;
       delete bindings.$$;
     }
+    if (disableScreenshot) {
+      screenshot = bindings.screenshot;
+      delete bindings.screenshot;
+    }
 
     // Ready to evaluate the string.
     helpers.evalInput = string;
 
     let evalOptions;
@@ -1490,10 +1551,13 @@
       bindings.$ = $;
     }
     if ($$) {
       bindings.$$ = $$;
     }
+    if (screenshot) {
+      bindings.screenshot = screenshot;
+    }
 
     if (bindings._self) {
       delete bindings._self;
     }
 
diff --git a/devtools/server/actors/webconsole/commands.js b/devtools/server/actors/webconsole/commands.js
new file mode 100644
--- /dev/null
+++ b/devtools/server/actors/webconsole/commands.js
@@ -0,0 +1,227 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const validCommands = ["help", "screenshot"];
+
+const COMMAND = "command";
+const KEY = "key";
+const ARG = "arg";
+
+const COMMAND_PREFIX = /^:/;
+const KEY_PREFIX = /^--/;
+
+// default value for flags
+const DEFAULT_VALUE = true;
+const COMMAND_DEFAULT_FLAG = {
+  screenshot: "filename"
+};
+
+/**
+ * When given a string that begins with `:` and a unix style string,
+ * format a JS like object.
+ * This is intended to be used by the WebConsole actor only.
+ *
+ * @param String string
+ *        A string to format that begins with `:`.
+ *
+ * @returns String formatted as `command({ ..args })`
+ */
+function formatCommand(string) {
+  if (!isCommand(string)) {
+    throw Error("formatCommand was called without `:`");
+  }
+  const tokens = string.trim().split(/\s+/).map(createToken);
+  const { command, args } = parseCommand(tokens);
+  const argsString = formatArgs(args);
+  return `${command}(${argsString})`;
+}
+
+/**
+ * collapses the array of arguments from the parsed command into
+ * a single string
+ *
+ * @param Object tree
+ *               A tree object produced by parseCommand
+ *
+ * @returns String formatted as ` { key: value, ... } ` or an empty string
+ */
+function formatArgs(args) {
+  return Object.keys(args).length ?
+    JSON.stringify(args) :
+    "";
+}
+
+/**
+ * creates a token object depending on a string which as a prefix,
+ * either `:` for a command or `--` for a key, or nothing for an argument
+ *
+ * @param String string
+ *               A string to use as the basis for the token
+ *
+ * @returns Object Token Object, with the following shape
+ *                { type: String, value: String }
+ */
+function createToken(string) {
+  if (isCommand(string)) {
+    const value = string.replace(COMMAND_PREFIX, "");
+    if (!value || !validCommands.includes(value)) {
+      throw Error(`'${value}' is not a valid command`);
+    }
+    return { type: COMMAND, value };
+  }
+  if (isKey(string)) {
+    const value = string.replace(KEY_PREFIX, "");
+    if (!value) {
+      throw Error("invalid flag");
+    }
+    return { type: KEY, value };
+  }
+  return { type: ARG, value: string };
+}
+
+/**
+ * returns a command Tree object for a set of tokens
+ *
+ *
+ * @param Array Tokens tokens
+ *                     An array of Token objects
+ *
+ * @returns Object Tree Object, with the following shape
+ *                 { command: String, args: Array of Strings }
+ */
+function parseCommand(tokens) {
+  let command = null;
+  const args = {};
+
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    if (token.type === COMMAND) {
+      if (command) {
+        // we are throwing here because two commands have been passed and it is unclear
+        // what the user's intention was
+        throw Error("Invalid command");
+      }
+      command = token.value;
+    }
+
+    if (token.type === KEY) {
+      const nextTokenIndex = i + 1;
+      const nextToken = tokens[nextTokenIndex];
+      let values = args[token.value] || DEFAULT_VALUE;
+      if (nextToken && nextToken.type === ARG) {
+        const { value, offset } = collectString(nextToken, tokens, nextTokenIndex);
+        // in order for JSON.stringify to correctly output values, they must be correctly
+        // typed
+        // As per the GCLI documentation, we can only have one value associated with a
+        // flag but multiple flags with the same name can exist and should be combined
+        // into and array.  Here we are associating only the value on the right hand
+        // side if it is of type `arg` as a single value; the second case initializes
+        // an array, and the final case pushes a value to an existing array
+        const typedValue = getTypedValue(value);
+        if (values === DEFAULT_VALUE) {
+          values = typedValue;
+        } else if (!Array.isArray(values)) {
+          values = [values, typedValue];
+        } else {
+          values.push(typedValue);
+        }
+        // skip the next token since we have already consumed it
+        i = nextTokenIndex + offset;
+      }
+      args[token.value] = values;
+    }
+
+    // Since this has only been implemented for screenshot, we can only have one default
+    // value. Eventually we may have more default values. For now, ignore multiple
+    // unflagged args
+    const defaultFlag = COMMAND_DEFAULT_FLAG[command];
+    if (token.type === ARG && !args[defaultFlag]) {
+      const { value, offset } = collectString(token, tokens, i);
+      args[defaultFlag] = getTypedValue(value);
+      i = i + offset;
+    }
+  }
+  return { command, args };
+}
+
+const stringChars = ["\"", "'", "`"];
+function isStringChar(testChar) {
+  return stringChars.includes(testChar);
+}
+
+function checkLastChar(string, testChar) {
+  const lastChar = string[string.length - 1];
+  return lastChar === testChar;
+}
+
+function hasUnexpectedChar(value, char, rightOffset, leftOffset) {
+  const lastPos = value.length - 1;
+  value.slice(rightOffset, lastPos - leftOffset).includes(char);
+}
+
+function collectString(token, tokens, index) {
+  const firstChar = token.value[0];
+  const isString = isStringChar(firstChar);
+  let value = token.value;
+
+  // the test value is not a string, or it is a string but a complete one
+  // i.e. `"test"`, as opposed to `"foo`. In either case, this we can return early
+  if (!isString || checkLastChar(value, firstChar)) {
+    return { value, offset: 0 };
+  }
+
+  if (hasUnexpectedChar(value, firstChar, 1, 0)) {
+    throw Error(`String contains unexpected ${firstChar} character`);
+  }
+
+  let offset = null;
+  for (let i = index + 1; i <= tokens.length; i++) {
+    if (i === tokens.length) {
+      throw Error("String does not terminate");
+    }
+
+    const nextToken = tokens[i];
+    if (nextToken.type !== ARG) {
+      throw Error(`String does not terminate before flag ${nextToken.value}`);
+    }
+
+    if (hasUnexpectedChar(nextToken.value, firstChar, 0, 1)) {
+      throw Error(`String contains unexpected ${firstChar} character`);
+    }
+
+    value = `${value} ${nextToken.value}`;
+    if (checkLastChar(nextToken.value, firstChar)) {
+      offset = i - index;
+      break;
+    }
+  }
+  return { value, offset };
+}
+
+function isCommand(string) {
+  return COMMAND_PREFIX.test(string);
+}
+
+function isKey(string) {
+  return KEY_PREFIX.test(string);
+}
+
+function getTypedValue(value) {
+  if (!isNaN(value)) {
+    return Number(value);
+  }
+  if (value === "true" || value === "false") {
+    return Boolean(value);
+  }
+  if (isStringChar(value[0])) {
+    return value.slice(1, value.length - 1);
+  }
+  return value;
+}
+
+exports.formatCommand = formatCommand;
+exports.isCommand = isCommand;
diff --git a/devtools/server/actors/webconsole/moz.build b/devtools/server/actors/webconsole/moz.build
--- a/devtools/server/actors/webconsole/moz.build
+++ b/devtools/server/actors/webconsole/moz.build
@@ -3,10 +3,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/.
 
 DevToolsModules(
+    'commands.js',
     'content-process-forward.js',
     'listeners.js',
+    'screenshot.js',
     'utils.js',
     'worker-listeners.js',
 )
diff --git a/devtools/server/actors/webconsole/screenshot.js b/devtools/server/actors/webconsole/screenshot.js
new file mode 100644
--- /dev/null
+++ b/devtools/server/actors/webconsole/screenshot.js
@@ -0,0 +1,141 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { Ci, Cu } = require("chrome");
+const { getRect } = require("devtools/shared/layout/utils");
+const { LocalizationHelper } = require("devtools/shared/l10n");
+
+const CONTAINER_FLASHING_DURATION = 500;
+const STRINGS_URI = "devtools/shared/locales/screenshot.properties";
+const L10N = new LocalizationHelper(STRINGS_URI);
+
+exports.screenshot = function takeAsyncScreenshot(owner, args = {}) {
+  if (args.help) {
+    // Early return as help will be handled on the client side.
+    return null;
+  }
+  return captureScreenshot(args, owner.window.document);
+};
+
+/**
+ * This function is called to simulate camera effects
+ */
+function simulateCameraFlash(document) {
+  const window = document.defaultView;
+  const frames = Cu.cloneInto({ opacity: [ 0, 1 ] }, window);
+  document.documentElement.animate(frames, CONTAINER_FLASHING_DURATION);
+}
+
+/**
+ * This function simply handles the --delay argument before calling
+ * createScreenshotData
+ */
+function captureScreenshot(args, document) {
+  if (args.delay > 0) {
+    return new Promise((resolve, reject) => {
+      document.defaultView.setTimeout(() => {
+        createScreenshotData(document, args).then(resolve, reject);
+      }, args.delay * 1000);
+    });
+  }
+  return createScreenshotData(document, args);
+}
+
+/**
+ * This does the dirty work of creating a base64 string out of an
+ * area of the browser window
+ */
+function createScreenshotData(document, args) {
+  const window = document.defaultView;
+  let left = 0;
+  let top = 0;
+  let width;
+  let height;
+  const currentX = window.scrollX;
+  const currentY = window.scrollY;
+
+  let filename = getFilename(args.filename);
+
+  if (args.fullpage) {
+    // Bug 961832: GCLI screenshot shows fixed position element in wrong
+    // position if we don't scroll to top
+    window.scrollTo(0, 0);
+    width = window.innerWidth + window.scrollMaxX - window.scrollMinX;
+    height = window.innerHeight + window.scrollMaxY - window.scrollMinY;
+    filename = filename.replace(".png", "-fullpage.png");
+  } else if (args.selector) {
+    const node = window.document.querySelector(args.selector);
+    ({ top, left, width, height } = getRect(window, node, window));
+  } else {
+    left = window.scrollX;
+    top = window.scrollY;
+    width = window.innerWidth;
+    height = window.innerHeight;
+  }
+
+  // Only adjust for scrollbars when considering the full window
+  if (!args.selector) {
+    const winUtils = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                         .getInterface(Ci.nsIDOMWindowUtils);
+    const scrollbarHeight = {};
+    const scrollbarWidth = {};
+    winUtils.getScrollbarSize(false, scrollbarWidth, scrollbarHeight);
+    width -= scrollbarWidth.value;
+    height -= scrollbarHeight.value;
+  }
+
+  const canvas = document.createElementNS("http://www.w3.org/1999/xhtml", "canvas");
+  const ctx = canvas.getContext("2d");
+  const ratio = args.dpr ? args.dpr : window.devicePixelRatio;
+  canvas.width = width * ratio;
+  canvas.height = height * ratio;
+  ctx.scale(ratio, ratio);
+  ctx.drawWindow(window, left, top, width, height, "#fff");
+  const data = canvas.toDataURL("image/png", "");
+
+  // See comment above on bug 961832
+  if (args.fullpage) {
+    window.scrollTo(currentX, currentY);
+  }
+
+  simulateCameraFlash(document);
+
+  return Promise.resolve({
+    destinations: [],
+    data: data,
+    height: height,
+    width: width,
+    filename: filename,
+  });
+}
+
+/**
+ * We may have a filename specified in args, or we might have to generate
+ * one.
+ */
+function getFilename(defaultName) {
+  // Create a name for the file if not present
+  if (defaultName) {
+    return defaultName;
+  }
+
+  const date = new Date();
+  let dateString = date.getFullYear() + "-" + (date.getMonth() + 1) +
+                  "-" + date.getDate();
+  dateString = dateString.split("-").map(function(part) {
+    if (part.length == 1) {
+      part = "0" + part;
+    }
+    return part;
+  }).join("-");
+
+  const timeString = date.toTimeString().replace(/:/g, ".").split(" ")[0];
+  return L10N.getFormatStr(
+    "screenshotGeneratedFilename",
+    dateString,
+    timeString
+  ) + ".png";
+}
diff --git a/devtools/server/actors/webconsole/utils.js b/devtools/server/actors/webconsole/utils.js
--- a/devtools/server/actors/webconsole/utils.js
+++ b/devtools/server/actors/webconsole/utils.js
@@ -1,15 +1,16 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ft= javascript 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/. */
 
 "use strict";
 
 const {Ci, Cu} = require("chrome");
 
+loader.lazyRequireGetter(this, "screenshot", "devtools/server/actors/webconsole/screenshot", true);
+
 // Note that this is only used in WebConsoleCommands, see $0 and pprint().
 if (!isWorker) {
   loader.lazyImporter(this, "VariablesView", "resource://devtools/client/shared/widgets/VariablesView.jsm");
 }
 
@@ -590,10 +591,32 @@
     type: "copyValueToClipboard",
     value: payload,
   };
 });
 
+/**
+ * Take a screenshot of a page.
+ *
+ * @param object args
+ *               The arguments to be passed to the screenshot
+ * @return void
+ */
+WebConsoleCommands._registerOriginal("screenshot", function(owner, args) {
+  owner.helperResult = (async () => {
+    // creates data for saving the screenshot
+    const value = await screenshot(owner, args);
+    return {
+      type: "screenshotOutput",
+      value,
+      // pass args through to the client, so that the client can take care of copying
+      // and saving the screenshot data on the client machine instead of on the
+      // remote machine
+      args
+    };
+  })();
+});
+
 /**
  * (Internal only) Add the bindings to |owner.sandbox|.
  * This is intended to be used by the WebConsole actor only.
   *
   * @param object owner
diff --git a/devtools/server/tests/unit/test_format_command.js b/devtools/server/tests/unit/test_format_command.js
new file mode 100644
--- /dev/null
+++ b/devtools/server/tests/unit/test_format_command.js
@@ -0,0 +1,96 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+/* eslint-disable no-shadow, max-nested-callbacks */
+
+"use strict";
+
+const { formatCommand } = require("devtools/server/actors/webconsole/commands.js");
+
+const testcases = [
+  { input: ":help", expectedOutput: "help()" },
+  {
+    input: ":screenshot  --fullscreen",
+    expectedOutput: "screenshot({\"fullscreen\":true})"
+  },
+  {
+    input: ":screenshot  --fullscreen true",
+    expectedOutput: "screenshot({\"fullscreen\":true})"
+  },
+  { input: ":screenshot  ", expectedOutput: "screenshot()" },
+  {
+    input: ":screenshot --dpr 0.5 --fullpage --chrome",
+    expectedOutput: "screenshot({\"dpr\":0.5,\"fullpage\":true,\"chrome\":true})"
+  },
+  {
+    input: ":screenshot 'filename'",
+    expectedOutput: "screenshot({\"filename\":\"filename\"})"
+  },
+  {
+    input: ":screenshot filename",
+    expectedOutput: "screenshot({\"filename\":\"filename\"})"
+  },
+  {
+    input: ":screenshot --name 'filename' --name `filename` --name \"filename\"",
+    expectedOutput: "screenshot({\"name\":[\"filename\",\"filename\",\"filename\"]})"
+  },
+  {
+    input: ":screenshot 'filename1' 'filename2' 'filename3'",
+    expectedOutput: "screenshot({\"filename\":\"filename1\"})"
+  },
+  {
+    input: ":screenshot --chrome --chrome",
+    expectedOutput: "screenshot({\"chrome\":true})"
+  },
+  {
+    input: ":screenshot \"file name with spaces\"",
+    expectedOutput: "screenshot({\"filename\":\"file name with spaces\"})"
+  },
+  {
+    input: ":screenshot 'filename1' --name 'filename2'",
+    expectedOutput: "screenshot({\"filename\":\"filename1\",\"name\":\"filename2\"})"
+  },
+  {
+    input: ":screenshot --name 'filename1' 'filename2'",
+    expectedOutput: "screenshot({\"name\":\"filename1\",\"filename\":\"filename2\"})"
+  },
+  {
+    input: ":screenshot \"fo\\\"o bar\"",
+    expectedOutput: "screenshot({\"filename\":\"fo\\\\\\\"o bar\"})"
+  },
+  {
+    input: ":screenshot \"foo b\\\"ar\"",
+    expectedOutput: "screenshot({\"filename\":\"foo b\\\\\\\"ar\"})"
+  }
+];
+
+const edgecases = [
+  { input: ":", expectedError: "'' is not a valid command" },
+  { input: ":invalid", expectedError: "'invalid' is not a valid command" },
+  { input: ":screenshot :help", expectedError: "invalid command" },
+  { input: ":screenshot --", expectedError: "invalid flag" },
+  {
+    input: ":screenshot \"fo\"o bar",
+    expectedError: "String contains unexpected `\"` character"
+  },
+  {
+    input: ":screenshot \"foo b\"ar",
+    expectedError: "String contains unexpected `\"` character"
+  },
+  { input: ": screenshot", expectedError: "'' is not a valid command" },
+  { input: ":screenshot \"file name", expectedError: "String does not terminate" },
+  {
+    input: ":screenshot \"file name --clipboard",
+    expectedError: "String does not terminate before flag \"clipboard\""
+  },
+  { input: "::screenshot", expectedError: "':screenshot' is not a valid command" }
+];
+
+function run_test() {
+  testcases.forEach(testcase => {
+    Assert.equal(formatCommand(testcase.input), testcase.expectedOutput);
+  });
+
+  edgecases.forEach(testcase => {
+    Assert.throws(() => formatCommand(testcase.input), testcase.expectedError);
+  });
+}
diff --git a/devtools/server/tests/unit/xpcshell.ini b/devtools/server/tests/unit/xpcshell.ini
--- a/devtools/server/tests/unit/xpcshell.ini
+++ b/devtools/server/tests/unit/xpcshell.ini
@@ -84,10 +84,11 @@
 [test_eval-01.js]
 [test_eval-02.js]
 [test_eval-03.js]
 [test_eval-04.js]
 [test_eval-05.js]
+[test_format_command.js]
 [test_promises_actor_attach.js]
 [test_promises_actor_exist.js]
 [test_promises_actor_list_promises.js]
 skip-if = coverage # bug 1336670
 [test_promises_actor_onnewpromise.js]
diff --git a/devtools/shared/gcli/commands/screenshot.js b/devtools/shared/gcli/commands/screenshot.js
--- a/devtools/shared/gcli/commands/screenshot.js
+++ b/devtools/shared/gcli/commands/screenshot.js
@@ -552,11 +552,10 @@
   // objects as opposed to just writing with OS.File allows us to tie into the
   // download manager to record a download entry and to get visual feedback from
   // the downloads toolbar button when the save is done.
   const nsIWBP = Ci.nsIWebBrowserPersist;
   const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                nsIWBP.PERSIST_FLAGS_FORCE_ALLOW_COOKIES |
                 nsIWBP.PERSIST_FLAGS_BYPASS_CACHE |
                 nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
   const isPrivate =
     PrivateBrowsingUtils.isContentWindowPrivate(document.defaultView);
   const persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
@@ -571,11 +570,13 @@
           null,
           persist,
           isPrivate);
   const listener = new DownloadListener(window, tr);
   persist.progressListener = listener;
+  const principal = Services.scriptSecurityManager.getSystemPrincipal();
   persist.savePrivacyAwareURI(sourceURI,
+                              principal,
                               0,
                               document.documentURIObject,
                               Ci.nsIHttpChannel.REFERRER_POLICY_UNSET,
                               null,
                               null,
diff --git a/devtools/shared/locales/en-US/screenshot.properties b/devtools/shared/locales/en-US/screenshot.properties
new file mode 100644
--- /dev/null
+++ b/devtools/shared/locales/en-US/screenshot.properties
@@ -0,0 +1,116 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 These strings are used inside Web Console commands.
+# The Web Console command line is available from the Web Developer sub-menu
+# -> 'Web Console'.
+#
+# 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 (screenshotDesc) A very short description of the
+# 'screenshot' command. Displayed when the --help flag is passed to
+# the screenshot command.
+screenshotDesc=Save an image of the page
+
+# LOCALIZATION NOTE (screenshotFilenameDesc) A very short string to describe
+# the 'filename' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the screenshot command.
+screenshotFilenameDesc=Destination filename
+
+# LOCALIZATION NOTE (screenshotFilenameManual) A fuller description of the
+# 'filename' parameter to the 'screenshot' command.
+screenshotFilenameManual=The name of the file (should have a ‘.png’ extension) to which we write the screenshot.
+
+# LOCALIZATION NOTE (screenshotClipboardDesc) A very short string to describe
+# the 'clipboard' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the screenshot command.
+screenshotClipboardDesc=Copy screenshot to clipboard? (true/false)
+
+# LOCALIZATION NOTE (screenshotClipboardManual) A fuller description of the
+# 'clipboard' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the screenshot command.
+screenshotClipboardManual=True if you want to copy the screenshot instead of saving it to a file.
+
+# LOCALIZATION NOTE (screenshotGroupOptions) A label for the optional options of
+# the screenshot command. Displayed when the --help flag is passed to the
+# screenshot command.
+screenshotGroupOptions=Options
+
+# LOCALIZATION NOTE (screenshotDelayDesc) A very short string to describe
+# the 'delay' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the screenshot command.
+screenshotDelayDesc=Delay (seconds)
+
+# LOCALIZATION NOTE (screenshotDelayManual) A fuller description of the
+# 'delay' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the screenshot command.
+screenshotDelayManual=The time to wait (in seconds) before the screenshot is taken
+
+# LOCALIZATION NOTE (screenshotDPRDesc) A very short string to describe
+# the 'dpr' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+screenshotDPRDesc=Device pixel ratio
+
+# LOCALIZATION NOTE (screenshotDPRManual) A fuller description of the
+# 'dpr' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+screenshotDPRManual=The device pixel ratio to use when taking the screenshot
+
+# LOCALIZATION NOTE (screenshotFullPageDesc) A very short string to describe
+# the 'fullpage' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+screenshotFullPageDesc=Entire webpage? (true/false)
+
+# LOCALIZATION NOTE (screenshotFullPageManual) A fuller description of the
+# 'fullpage' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+screenshotFullPageManual=True if the screenshot should also include parts of the webpage which are outside the current scrolled bounds.
+
+# LOCALIZATION NOTE (screenshotFileDesc) A very short string to describe
+# the 'file' parameter to the 'screenshot' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+screenshotFileDesc=Save to file? (true/false)
+
+# 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 if the screenshot should save the file even when other options are enabled (eg. clipboard).
+
+# LOCALIZATION NOTE (screenshotGeneratedFilename) The auto generated filename
+# when no file name is provided. The first argument (%1$S) is the date string
+# in yyyy-mm-dd format and the second argument (%2$S) is the time string
+# in HH.MM.SS format. Please don't add the extension here.
+screenshotGeneratedFilename=Screen Shot %1$S at %2$S
+
+# LOCALIZATION NOTE (screenshotErrorSavingToFile) Text displayed to user upon
+# encountering error while saving the screenshot to the file specified.
+# The argument (%1$S) is the filename.
+screenshotErrorSavingToFile=Error saving to %1$S
+
+# LOCALIZATION NOTE (screenshotSavedToFile) Text displayed to user when the
+# screenshot is successfully saved to the file specified.
+# The argument (%1$S) is the filename.
+screenshotSavedToFile=Saved to %1$S
+
+# LOCALIZATION NOTE (screenshotErrorCopying) Text displayed to user upon
+# encountering error while copying the screenshot to clipboard.
+screenshotErrorCopying=Error occurred while copying screenshot to clipboard.
+
+# LOCALIZATION NOTE (screenshotCopied) Text displayed to user when the
+# screenshot is successfully copied to the clipboard.
+screenshotCopied=Screenshot copied to clipboard.
+
+# LOCALIZATION NOTE (inspectNodeDesc) A very short string to describe the
+# 'node' parameter to the 'inspect' command. Displayed when the
+# --help flag is passed to the `screenshot command.
+inspectNodeDesc=CSS selector
+
+# LOCALIZATION NOTE (inspectNodeManual) A fuller description of the 'node'
+# parameter to the 'inspect' command. Displayed when the --help flag is
+# passed to the `screenshot command.
+inspectNodeManual=A CSS selector for use with document.querySelector which identifies a single element
diff --git a/devtools/shared/webconsole/moz.build b/devtools/shared/webconsole/moz.build
--- a/devtools/shared/webconsole/moz.build
+++ b/devtools/shared/webconsole/moz.build
@@ -11,7 +11,8 @@
 DevToolsModules(
     'client.js',
     'js-property-provider.js',
     'network-helper.js',
     'network-monitor.js',
+    'screenshot-helper.js',
     'throttle.js',
 )
diff --git a/devtools/shared/webconsole/screenshot-helper.js b/devtools/shared/webconsole/screenshot-helper.js
new file mode 100644
--- /dev/null
+++ b/devtools/shared/webconsole/screenshot-helper.js
@@ -0,0 +1,397 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 { Cc, Ci, Cr } = require("chrome");
+const ChromeUtils = require("ChromeUtils");
+const { LocalizationHelper } = require("devtools/shared/l10n");
+const Services = require("Services");
+const { NetUtil } = require("resource://gre/modules/NetUtil.jsm");
+
+loader.lazyImporter(this, "Downloads", "resource://gre/modules/Downloads.jsm");
+loader.lazyImporter(this, "OS", "resource://gre/modules/osfile.jsm");
+loader.lazyImporter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm");
+loader.lazyImporter(this, "PrivateBrowsingUtils",
+                          "resource://gre/modules/PrivateBrowsingUtils.jsm");
+
+const STRINGS_URI = "devtools/shared/locales/screenshot.properties";
+const L10N = new LocalizationHelper(STRINGS_URI);
+
+const screenshotDescription = L10N.getStr("screenshotDesc");
+const screenshotGroupOptions = L10N.getStr("screenshotGroupOptions");
+const screenshotCommandParams = [
+  {
+    name: "clipboard",
+    type: "boolean",
+    description: L10N.getStr("screenshotClipboardDesc"),
+    manual: L10N.getStr("screenshotClipboardManual")
+  },
+  {
+    name: "delay",
+    type: "number",
+    description: L10N.getStr("screenshotDelayDesc"),
+    manual: L10N.getStr("screenshotDelayManual")
+  },
+  {
+    name: "dpr",
+    type: "number",
+    description: L10N.getStr("screenshotDPRDesc"),
+    manual: L10N.getStr("screenshotDPRManual")
+  },
+  {
+    name: "fullpage",
+    type: "boolean",
+    description: L10N.getStr("screenshotFullPageDesc"),
+    manual: L10N.getStr("screenshotFullPageManual")
+  },
+  {
+    name: "selector",
+    type: "string",
+    description: L10N.getStr("inspectNodeDesc"),
+    manual: L10N.getStr("inspectNodeManual")
+  },
+  {
+    name: "file",
+    type: "boolean",
+    description: L10N.getStr("screenshotFileDesc"),
+    manual: L10N.getStr("screenshotFileManual"),
+  },
+  {
+    name: "filename",
+    type: "string",
+    description: L10N.getStr("screenshotFilenameDesc"),
+    manual: L10N.getStr("screenshotFilenameManual")
+  }
+];
+
+/**
+ * Creates a string from an object for use when screenshot is passed the `--help` argument
+ *
+ * @param object param
+ *        The param object to be formatted.
+ * @return string
+ *         The formatted information from the param object as a string
+ */
+function formatHelpField(param) {
+  const padding = " ".repeat(5);
+  return Object.entries(param).map(([key, value]) => {
+    if (key === "name") {
+      const name = `${padding}--${value}`;
+      return name;
+    }
+    return `${padding.repeat(2)}${key}: ${value}`;
+  }).join("\n");
+}
+
+/**
+ * Creates a string response from the screenshot options for use when
+ * screenshot is passed the `--help` argument
+ *
+ * @return string
+ *         The formatted information from the param object as a string
+ */
+function getFormattedHelpData() {
+  const formattedParams = screenshotCommandParams
+    .map(formatHelpField)
+    .join("\n\n");
+
+  return `${screenshotDescription}\n${screenshotGroupOptions}\n\n${formattedParams}`;
+}
+
+/**
+ * Main entry point in this file; Takes the original arguments that `:screenshot` was
+ * called with and the image value from the server, and uses the client window to save
+ * the screenshot to the remote debugging machine's memory or clipboard.
+ *
+ * @param object window
+ *        The Debugger Client window.
+ *
+ * @param object args
+ *        The original args with which the screenshot
+ *        was called.
+ * @param object value
+ *        an object with a image value and file name
+ *
+ * @return string[]
+ *         Response messages from processing the screenshot
+ */
+function processScreenshot(window, args = {}, value) {
+  if (args.help) {
+    const message = getFormattedHelpData();
+    // Wrap meesage in an array so that the return value is consistant with saveScreenshot
+    return [message];
+  }
+  simulateCameraShutter(window.document);
+  return saveScreenshot(window, args, value);
+}
+
+/**
+ * This function is called to simulate camera effects
+ *
+ * @param object document
+ *        The Debugger Client document.
+ */
+function simulateCameraShutter(document) {
+  const window = document.defaultView;
+  if (Services.prefs.getBoolPref("devtools.screenshot.audio.enabled")) {
+    const audioCamera = new window.Audio("resource://devtools/client/themes/audio/shutter.wav");
+    audioCamera.play();
+  }
+}
+
+/**
+ * Save the captured screenshot to one of several destinations.
+ *
+ * @param object window
+ *        The Debugger Client window.
+ *
+ * @param object args
+ *        The original args with which the screenshot was called.
+ *
+ * @param object image
+ *        The image object that was sent from the server.
+ *
+ * @return string[]
+ *         Response messages from processing the screenshot.
+ */
+async function saveScreenshot(window, args, image) {
+  const fileNeeded = args.filename ||
+    !args.clipboard || args.file;
+  const results = [];
+
+  if (args.clipboard) {
+    const result = await saveToClipboard(window, image.data);
+    results.push(result);
+  }
+
+  if (fileNeeded) {
+    const result = await saveToFile(window, image);
+    results.push(result);
+  }
+  return results;
+}
+
+/**
+ * Save the image data to the clipboard. This returns a promise, so it can
+ * be treated exactly like file processing.
+ *
+ * @param object window
+ *        The Debugger Client window.
+ *
+ * @param string data
+ *        The image data encoded in base64 that was sent from the server.
+ *
+ * @return string
+ *         Response message from processing the screenshot.
+ */
+function saveToClipboard(window, data) {
+  return new Promise(resolve => {
+    try {
+      const channel = NetUtil.newChannel({
+        uri: data,
+        loadUsingSystemPrincipal: true,
+        contentPolicyType: Ci.nsIContentPolicy.TYPE_INTERNAL_IMAGE
+      });
+      const input = channel.open2();
+
+      const loadContext = window.QueryInterface(Ci.nsIInterfaceRequestor)
+                                .getInterface(Ci.nsIWebNavigation)
+                                .QueryInterface(Ci.nsILoadContext);
+
+      const callback = {
+        onImageReady(container, status) {
+          if (!container) {
+            console.error("imgTools.decodeImageAsync failed");
+            resolve(L10N.getStr("screenshotErrorCopying"));
+            return;
+          }
+
+          try {
+            const wrapped = Cc["@mozilla.org/supports-interface-pointer;1"]
+                              .createInstance(Ci.nsISupportsInterfacePointer);
+            wrapped.data = container;
+
+            const trans = Cc["@mozilla.org/widget/transferable;1"]
+                            .createInstance(Ci.nsITransferable);
+            trans.init(loadContext);
+            trans.addDataFlavor(channel.contentType);
+            trans.setTransferData(channel.contentType, wrapped, -1);
+
+            Services.clipboard.setData(trans, null, Ci.nsIClipboard.kGlobalClipboard);
+
+            resolve(L10N.getStr("screenshotCopied"));
+          } catch (ex) {
+            console.error(ex);
+            resolve(L10N.getStr("screenshotErrorCopying"));
+          }
+        }
+      };
+
+      const threadManager = Cc["@mozilla.org/thread-manager;1"].getService();
+      const imgTools = Cc["@mozilla.org/image/tools;1"]
+                          .getService(Ci.imgITools);
+      imgTools.decodeImageAsync(input, channel.contentType, callback,
+                                threadManager.currentThread);
+    } catch (ex) {
+      console.error(ex);
+      resolve(L10N.getStr("screenshotErrorCopying"));
+    }
+  });
+}
+
+/**
+ * Progress listener that forwards calls to a transfer object.
+ *
+ * This is used below in saveToFile to forward progress updates from the
+ * nsIWebBrowserPersist object that does the actual saving to the nsITransfer
+ * which just represents the operation for the Download Manager. This keeps the
+ * Download Manager updated on saving progress and completion, so that it gives
+ * visual feedback from the downloads toolbar button when the save is done.
+ *
+ * It also allows the browser window to show auth prompts if needed (should not
+ * be needed for saving screenshots).
+ *
+ * This code is borrowed directly from contentAreaUtils.js.
+ *
+ * @param object win
+ *        The Debugger Client window.
+ *
+ * @param object transfer
+ *        The transfer object.
+ *
+ */
+function DownloadListener(win, transfer) {
+  this.window = win;
+  this.transfer = transfer;
+
+  // For most method calls, forward to the transfer object.
+  for (const name in transfer) {
+    if (name != "QueryInterface" &&
+        name != "onStateChange") {
+      this[name] = (...args) => transfer[name].apply(transfer, args);
+    }
+  }
+
+  // Allow saveToFile to await completion for error handling
+  this._completedDeferred = {};
+  this.completed = new Promise((resolve, reject) => {
+    this._completedDeferred.resolve = resolve;
+    this._completedDeferred.reject = reject;
+  });
+}
+
+DownloadListener.prototype = {
+  QueryInterface: ChromeUtils.generateQI(["nsIInterfaceRequestor",
+                                          "nsIWebProgressListener",
+                                          "nsIWebProgressListener2"]),
+
+  getInterface: function(iid) {
+    if (iid.equals(Ci.nsIAuthPrompt) ||
+        iid.equals(Ci.nsIAuthPrompt2)) {
+      const ww = Cc["@mozilla.org/embedcomp/window-watcher;1"]
+                 .getService(Ci.nsIPromptFactory);
+      return ww.getPrompt(this.window, iid);
+    }
+
+    throw Cr.NS_ERROR_NO_INTERFACE;
+  },
+
+  onStateChange: function(webProgress, request, state, status) {
+    // Check if the download has completed
+    if ((state & Ci.nsIWebProgressListener.STATE_STOP) &&
+        (state & Ci.nsIWebProgressListener.STATE_IS_NETWORK)) {
+      if (status == Cr.NS_OK) {
+        this._completedDeferred.resolve();
+      } else {
+        this._completedDeferred.reject();
+      }
+    }
+
+    this.transfer.onStateChange.apply(this.transfer, arguments);
+  }
+};
+
+/**
+ * Save the screenshot data to disk, returning a promise which is resolved on
+ * completion.
+ *
+ * @param object window
+ *        The Debugger Client window.
+ *
+ * @param object image
+ *        The image object that was sent from the server.
+ *
+ * @return string
+ *         Response message from processing the screenshot.
+ */
+async function saveToFile(window, image) {
+  const document = window.document;
+  let filename = image.filename;
+
+  // Check there is a .png extension to filename
+  if (!filename.match(/.png$/i)) {
+    filename += ".png";
+  }
+
+  const downloadsDir = await Downloads.getPreferredDownloadsDirectory();
+  const downloadsDirExists = await OS.File.exists(downloadsDir);
+  if (downloadsDirExists) {
+    // If filename is absolute, it will override the downloads directory and
+    // still be applied as expected.
+    filename = OS.Path.join(downloadsDir, filename);
+  }
+
+  const sourceURI = Services.io.newURI(image.data);
+  const targetFile = new FileUtils.File(filename);
+  const targetFileURI = Services.io.newFileURI(targetFile);
+
+  // Create download and track its progress.
+  // This is adapted from saveURL in contentAreaUtils.js, but simplified greatly
+  // and modified to allow saving to arbitrary paths on disk. Using these
+  // objects as opposed to just writing with OS.File allows us to tie into the
+  // download manager to record a download entry and to get visual feedback from
+  // the downloads toolbar button when the save is done.
+  const nsIWBP = Ci.nsIWebBrowserPersist;
+  const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
+                nsIWBP.PERSIST_FLAGS_BYPASS_CACHE |
+                nsIWBP.PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION;
+  const isPrivate =
+    PrivateBrowsingUtils.isContentWindowPrivate(document.defaultView);
+  const persist = Cc["@mozilla.org/embedding/browser/nsWebBrowserPersist;1"]
+                  .createInstance(Ci.nsIWebBrowserPersist);
+  persist.persistFlags = flags;
+  const tr = Cc["@mozilla.org/transfer;1"].createInstance(Ci.nsITransfer);
+  tr.init(sourceURI,
+          targetFileURI,
+          "",
+          null,
+          null,
+          null,
+          persist,
+          isPrivate);
+  const listener = new DownloadListener(window, tr);
+  persist.progressListener = listener;
+  const principal = Services.scriptSecurityManager.getSystemPrincipal();
+  persist.savePrivacyAwareURI(sourceURI,
+                              principal,
+                              0,
+                              document.documentURIObject,
+                              Ci.nsIHttpChannel.REFERRER_POLICY_UNSET,
+                              null,
+                              null,
+                              targetFileURI,
+                              isPrivate);
+
+  try {
+    // Await successful completion of the save via the listener
+    await listener.completed;
+    return L10N.getFormatStr("screenshotSavedToFile", filename);
+  } catch (ex) {
+    console.error(ex);
+    return L10N.getFormatStr("screenshotErrorSavingToFile", filename);
+  }
+}
+
+module.exports = processScreenshot;
diff --git a/devtools/startup/devtools-startup.js b/devtools/startup/devtools-startup.js
--- a/devtools/startup/devtools-startup.js
+++ b/devtools/startup/devtools-startup.js
@@ -38,10 +38,12 @@
                                "resource://gre/modules/AppConstants.jsm");
 ChromeUtils.defineModuleGetter(this, "CustomizableUI",
                                "resource:///modules/CustomizableUI.jsm");
 ChromeUtils.defineModuleGetter(this, "CustomizableWidgets",
                                "resource:///modules/CustomizableWidgets.jsm");
+ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils",
+                               "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
 // We don't want to spend time initializing the full loader here so we create
 // our own lazy require.
 XPCOMUtils.defineLazyGetter(this, "Telemetry", function() {
   const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
@@ -946,20 +948,36 @@
     const browser = chrome.gBrowser.selectedBrowser;
     if (message.data === null) {
       // Save original contents
       chrome.saveBrowser(browser);
     } else {
+      if (!message.data.startsWith("blob:null") || !browser.contentPrincipal.isNullPrincipal) {
+        Cu.reportError("Got invalid request to save JSON data");
+        return;
+      }
       // The following code emulates saveBrowser, but:
       // - Uses the given blob URL containing the custom contents to save.
       // - Obtains the file name from the URL of the document, not the blob.
+      // - avoids passing the document and explicitly passes system principal.
+      //   We have a blob created by a null principal to save, and the null
+      //   principal is from the child. Null principals don't survive crossing
+      //   over IPC, so there's no other principal that'll work.
       const persistable = browser.frameLoader;
       persistable.startPersistence(0, {
         onDocumentReady(doc) {
           const uri = chrome.makeURI(doc.documentURI, doc.characterSet);
           const filename = chrome.getDefaultFileName(undefined, uri, doc, null);
-          chrome.internalSave(message.data, doc, filename, null, doc.contentType,
-            false, null, null, null, doc, false, null, undefined);
+          chrome.internalSave(message.data, null, filename, null, doc.contentType,
+            false /* bypass cache */,
+            null, /* filepicker title key */
+            null, /* file chosen */
+            null, /* referrer */
+            null, /* initiating document */
+            false, /* don't skip prompt for a location */
+            null, /* cache key */
+            PrivateBrowsingUtils.isBrowserPrivate(browser), /* private browsing ? */
+            Services.scriptSecurityManager.getSystemPrincipal());
         },
         onError(status) {
           throw new Error("JSON Viewer's onSave failed in startPersistence");
         }
       });
diff --git a/dom/base/Element.h b/dom/base/Element.h
--- a/dom/base/Element.h
+++ b/dom/base/Element.h
@@ -1099,10 +1099,12 @@
 
   void GetAttribute(const nsAString& aName, DOMString& aReturn);
   void GetAttributeNS(const nsAString& aNamespaceURI,
                       const nsAString& aLocalName,
                       nsAString& aReturn);
+  bool ToggleAttribute(const nsAString& aName, const Optional<bool>& aForce,
+                       nsIPrincipal* aTriggeringPrincipal, ErrorResult& aError);
   void SetAttribute(const nsAString& aName, const nsAString& aValue,
                     nsIPrincipal* aTriggeringPrincipal, ErrorResult& aError);
   void SetAttributeNS(const nsAString& aNamespaceURI,
                       const nsAString& aLocalName,
                       const nsAString& aValue,
diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -1319,10 +1319,47 @@
       aReturn.SetNull();
     }
   }
 }
 
+bool
+Element::ToggleAttribute(const nsAString& aName,
+                         const Optional<bool>& aForce,
+                         nsIPrincipal* aTriggeringPrincipal,
+                         ErrorResult& aError)
+{
+  aError = nsContentUtils::CheckQName(aName, false);
+  if (aError.Failed()) {
+    return false;
+  }
+
+  nsAutoString nameToUse;
+  const nsAttrName* name = InternalGetAttrNameFromQName(aName, &nameToUse);
+  if (!name) {
+    if (aForce.WasPassed() && !aForce.Value()) {
+      return false;
+    }
+    RefPtr<nsAtom> nameAtom = NS_AtomizeMainThread(nameToUse);
+    if (!nameAtom) {
+      aError.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return false;
+    }
+    aError = SetAttr(kNameSpaceID_None, nameAtom, EmptyString(), aTriggeringPrincipal, true);
+    return true;
+  }
+  if (aForce.WasPassed() && aForce.Value()) {
+    return true;
+  }
+  // Hold a strong reference here so that the atom or nodeinfo doesn't go
+  // away during UnsetAttr. If it did UnsetAttr would be left with a
+  // dangling pointer as argument without knowing it.
+  nsAttrName tmp(*name);
+
+  aError = UnsetAttr(name->NamespaceID(), name->LocalName(), true);
+  return false;
+}
+
 void
 Element::SetAttribute(const nsAString& aName,
                       const nsAString& aValue,
                       nsIPrincipal* aTriggeringPrincipal,
                       ErrorResult& aError)
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -74,10 +74,11 @@
 class Presentation;
 class LegacyMozTCPSocket;
 class VRDisplay;
 class VRServiceTest;
 class StorageManager;
+class MediaCapabilities;
 
 class Navigator final : public nsISupports
                       , public nsWrapperCache
 {
 public:
@@ -213,10 +214,12 @@
 
   StorageManager* Storage();
 
   static void GetAcceptLanguages(nsTArray<nsString>& aLanguages);
 
+  dom::MediaCapabilities* MediaCapabilities();
+
   // WebIDL helper methods
   static bool HasUserMediaSupport(JSContext* /* unused */,
                                   JSObject* /* unused */);
 
   nsPIDOMWindowInner* GetParentObject() const
@@ -272,10 +275,11 @@
   RefPtr<GamepadServiceTest> mGamepadServiceTest;
   nsTArray<RefPtr<Promise> > mVRGetDisplaysPromises;
   RefPtr<VRServiceTest> mVRServiceTest;
   nsTArray<uint32_t> mRequestedVibrationPattern;
   RefPtr<StorageManager> mStorageManager;
+  RefPtr<dom::MediaCapabilities> mMediaCapabilities;
 };
 
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -32,10 +32,11 @@
 #include "mozilla/Preferences.h"
 #include "mozilla/Telemetry.h"
 #include "BatteryManager.h"
 #include "mozilla/dom/CredentialsContainer.h"
 #include "mozilla/dom/GamepadServiceTest.h"
+#include "mozilla/dom/MediaCapabilities.h"
 #include "mozilla/dom/WakeLock.h"
 #include "mozilla/dom/power/PowerManagerService.h"
 #include "mozilla/dom/MIDIAccessManager.h"
 #include "mozilla/dom/MIDIOptionsBinding.h"
 #include "mozilla/dom/Permissions.h"
@@ -150,10 +151,11 @@
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCredentials)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaDevices)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mServiceWorkerContainer)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaCapabilities)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaKeySystemAccessManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresentation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGamepadServiceTest)
@@ -220,10 +222,12 @@
 
   if (mVRServiceTest) {
     mVRServiceTest->Shutdown();
     mVRServiceTest = nullptr;
   }
+
+  mMediaCapabilities = nullptr;
 }
 
 void
 Navigator::GetUserAgent(nsAString& aUserAgent, CallerType aCallerType,
                         ErrorResult& aRv) const
@@ -1793,10 +1797,20 @@
     mCredentials = new CredentialsContainer(GetWindow());
   }
   return mCredentials;
 }
 
+dom::MediaCapabilities*
+Navigator::MediaCapabilities()
+{
+  if (!mMediaCapabilities) {
+    mMediaCapabilities =
+      new dom::MediaCapabilities(GetWindow()->AsGlobal());
+  }
+  return mMediaCapabilities;
+}
+
 /* static */
 bool
 Navigator::Webdriver()
 {
   return Preferences::GetBool("marionette.enabled", false);
diff --git a/dom/base/ScreenLuminance.h b/dom/base/ScreenLuminance.h
new file mode 100644
--- /dev/null
+++ b/dom/base/ScreenLuminance.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 et tw=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/. */
+
+#ifndef mozilla_dom_ScreenLuminance_h
+#define mozilla_dom_ScreenLuminance_h
+
+#include "nsCycleCollectionParticipant.h"
+#include "nsISupportsImpl.h"
+
+class nsScreen;
+
+namespace mozilla {
+namespace dom {
+
+class ScreenLuminance final : public nsWrapperCache
+{
+public:
+  // Ref counting and cycle collection
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(ScreenLuminance)
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(ScreenLuminance)
+
+  // WebIDL methods
+  double Min() const { return mMin; }
+  double Max() const { return mMax; }
+  double MaxAverage() const { return mMaxAverage; }
+  // End WebIDL methods
+
+  ScreenLuminance(nsScreen* aScreen,
+                  double aMin,
+                  double aMax,
+                  double aMaxAverage)
+    : mScreen(aScreen)
+    , mMin(aMin)
+    , mMax(aMax)
+    , mMaxAverage(aMaxAverage)
+  {
+  }
+
+  nsScreen* GetParentObject() const { return mScreen; }
+  JSObject* WrapObject(JSContext* aCx,
+                       JS::Handle<JSObject*> aGivenProto) override;
+
+private:
+  virtual ~ScreenLuminance() {}
+
+  RefPtr<nsScreen> mScreen;
+  double mMin;
+  double mMax;
+  double mMaxAverage;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // mozilla_dom_ScreenLuminance_h
diff --git a/dom/base/ScreenLuminance.cpp b/dom/base/ScreenLuminance.cpp
new file mode 100644
--- /dev/null
+++ b/dom/base/ScreenLuminance.cpp
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 et tw=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/. */
+
+#include "ScreenLuminance.h"
+#include "nsScreen.h"
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(ScreenLuminance, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(ScreenLuminance, Release)
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ScreenLuminance, mScreen)
+
+JSObject*
+ScreenLuminance::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+  return ScreenLuminance_Binding::Wrap(aCx, this, aGivenProto);
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/dom/base/UseCounters.conf b/dom/base/UseCounters.conf
--- a/dom/base/UseCounters.conf
+++ b/dom/base/UseCounters.conf
@@ -113,5 +113,9 @@
 method console.timeEnd
 method console.exception
 method console.timeStamp
 method console.profile
 method console.profileEnd
+
+// document.open information
+custom DocumentOpen calls document.open in a way that creates a new Window object
+custom DocumentOpenReplace calls document.open in a way that creates a new Window object and replaces the old history entry.
diff --git a/dom/base/moz.build b/dom/base/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -208,10 +208,11 @@
     'Pose.h',
     'ProcessGlobal.h',
     'ProcessMessageManager.h',
     'ResponsiveImageSelector.h',
     'SameProcessMessageQueue.h',
+    'ScreenLuminance.h',
     'ScreenOrientation.h',
     'Selection.h',
     'ShadowRoot.h',
     'StructuredCloneBlob.h',
     'StructuredCloneHolder.h',
@@ -357,10 +358,11 @@
     'PostMessageEvent.cpp',
     'ProcessGlobal.cpp',
     'ProcessMessageManager.cpp',
     'ResponsiveImageSelector.cpp',
     'SameProcessMessageQueue.cpp',
+    'ScreenLuminance.cpp',
     'ScreenOrientation.cpp',
     'Selection.cpp',
     'SelectionChangeListener.cpp',
     'ShadowRoot.cpp',
     'StructuredCloneBlob.cpp',
diff --git a/dom/base/nsContentAreaDragDrop.h b/dom/base/nsContentAreaDragDrop.h
--- a/dom/base/nsContentAreaDragDrop.h
+++ b/dom/base/nsContentAreaDragDrop.h
@@ -75,10 +75,11 @@
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIFLAVORDATAPROVIDER
 
   nsresult SaveURIToFile(nsIURI* inSourceURI,
+                         nsIPrincipal* inTriggeringPrincipal,
                          nsIFile* inDestFile, bool isPrivate);
 };
 
 
 #endif /* nsContentAreaDragDrop_h__ */
diff --git a/dom/base/nsContentAreaDragDrop.cpp b/dom/base/nsContentAreaDragDrop.cpp
--- a/dom/base/nsContentAreaDragDrop.cpp
+++ b/dom/base/nsContentAreaDragDrop.cpp
@@ -139,10 +139,11 @@
 // SaveURIToFile
 // used on platforms where it's possible to drag items (e.g. images)
 // into the file system
 nsresult
 nsContentAreaDragDropDataProvider::SaveURIToFile(nsIURI* inSourceURI,
+                                                 nsIPrincipal* inTriggeringPrincipal,
                                                  nsIFile* inDestFile,
                                                  bool isPrivate)
 {
   nsCOMPtr<nsIURL> sourceURL = do_QueryInterface(inSourceURI);
   if (!sourceURL) {
@@ -160,11 +161,12 @@
   NS_ENSURE_SUCCESS(rv, rv);
 
   persist->SetPersistFlags(nsIWebBrowserPersist::PERSIST_FLAGS_AUTODETECT_APPLY_CONVERSION);
 
   // referrer policy can be anything since the referrer is nullptr
-  return persist->SavePrivacyAwareURI(inSourceURI, 0, nullptr,
+  return persist->SavePrivacyAwareURI(inSourceURI,
+                                      inTriggeringPrincipal, 0, nullptr,
                                       mozilla::net::RP_Unset,
                                       nullptr, nullptr,
                                       inDestFile, isPrivate);
 }
 
@@ -340,11 +342,13 @@
     file->Append(targetFilename);
 
     bool isPrivate;
     aTransferable->GetIsPrivateData(&isPrivate);
 
-    rv = SaveURIToFile(sourceURI, file, isPrivate);
+    nsCOMPtr<nsIPrincipal> principal;
+    aTransferable->GetRequestingPrincipal(getter_AddRefs(principal));
+    rv = SaveURIToFile(sourceURI, principal, file, isPrivate);
     // send back an nsIFile
     if (NS_SUCCEEDED(rv)) {
       CallQueryInterface(file, aData);
       *aDataLen = sizeof(nsIFile*);
     }
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -4795,11 +4795,11 @@
   }
 
   for (auto i = sEventListenerManagersHash->Iter(); !i.Done(); i.Next()) {
     auto entry = static_cast<EventListenerManagerMapEntry*>(i.Get());
     nsINode* n = static_cast<nsINode*>(entry->mListenerManager->GetTarget());
-    if (n && n->IsInUncomposedDoc() &&
+    if (n && n->IsInComposedDoc() &&
         nsCCUncollectableMarker::InGeneration(n->OwnerDoc()->GetMarkedCCGeneration())) {
       entry->mListenerManager->MarkForCC();
     }
   }
 }
@@ -7236,11 +7236,11 @@
 {
 #ifdef XP_MACOSX
   // We control dispatch to all mac plugins.
   return false;
 #else
-  if (!aContent || !aContent->IsInUncomposedDoc()) {
+  if (!aContent || !aContent->IsInComposedDoc()) {
     return false;
   }
 
   nsCOMPtr<nsIObjectLoadingContent> olc = do_QueryInterface(aContent);
   if (!olc) {
diff --git a/dom/base/nsGlobalWindowInner.h b/dom/base/nsGlobalWindowInner.h
--- a/dom/base/nsGlobalWindowInner.h
+++ b/dom/base/nsGlobalWindowInner.h
@@ -43,10 +43,11 @@
 #include "mozilla/ErrorResult.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/GuardObjects.h"
 #include "mozilla/LinkedList.h"
 #include "mozilla/TimeStamp.h"
+#include "mozilla/webgpu/InstanceProvider.h"
 #include "nsWrapperCacheInlines.h"
 #include "nsIIdleObserver.h"
 #include "nsIDocument.h"
 #include "mozilla/dom/EventTarget.h"
 #include "mozilla/dom/WindowBinding.h"
@@ -215,10 +216,11 @@
   , public nsIScriptObjectPrincipal
   , public nsSupportsWeakReference
   , public nsIInterfaceRequestor
   , public PRCListStr
   , public nsAPostRefreshObserver
+  , public mozilla::webgpu::InstanceProvider
 {
 public:
   typedef mozilla::TimeStamp TimeStamp;
   typedef mozilla::TimeDuration TimeDuration;
 
diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
--- a/dom/base/nsGlobalWindowInner.cpp
+++ b/dom/base/nsGlobalWindowInner.cpp
@@ -884,10 +884,11 @@
 //***    nsGlobalWindowInner: Object Management
 //*****************************************************************************
 
 nsGlobalWindowInner::nsGlobalWindowInner(nsGlobalWindowOuter *aOuterWindow)
   : nsPIDOMWindowInner(aOuterWindow->AsOuter()),
+    mozilla::webgpu::InstanceProvider(this),
     mIdleFuzzFactor(0),
     mIdleCallbackIndex(-1),
     mCurrentlyIdle(false),
     mAddActiveEventFuzzTime(true),
     mWasOffline(false),
@@ -1477,10 +1478,12 @@
   for (size_t i = 0; i < tmp->mDocumentFlushedResolvers.Length(); i++) {
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocumentFlushedResolvers[i]->mPromise);
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocumentFlushedResolvers[i]->mCallback);
   }
 
+  static_cast<mozilla::webgpu::InstanceProvider*>(tmp)->CcTraverse(cb);
+
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindowInner)
   tmp->CleanupCachedXBLHandlers();
 
@@ -1580,10 +1583,12 @@
     NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocumentFlushedResolvers[i]->mPromise);
     NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocumentFlushedResolvers[i]->mCallback);
   }
   tmp->mDocumentFlushedResolvers.Clear();
 
+  static_cast<mozilla::webgpu::InstanceProvider*>(tmp)->CcUnlink();
+
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 #ifdef DEBUG
 void
diff --git a/dom/base/nsRange.cpp b/dom/base/nsRange.cpp
--- a/dom/base/nsRange.cpp
+++ b/dom/base/nsRange.cpp
@@ -3028,18 +3028,18 @@
   // Hold strong pointers across the flush
   nsCOMPtr<nsINode> startContainer = aStartContainer;
   nsCOMPtr<nsINode> endContainer = aEndContainer;
 
   // Flush out layout so our frames are up to date.
-  if (!aStartContainer->IsInUncomposedDoc()) {
+  if (!aStartContainer->IsInComposedDoc()) {
     return;
   }
 
   if (aFlushLayout) {
     aStartContainer->OwnerDoc()->FlushPendingNotifications(FlushType::Layout);
     // Recheck whether we're still in the document
-    if (!aStartContainer->IsInUncomposedDoc()) {
+    if (!aStartContainer->IsInComposedDoc()) {
       return;
     }
   }
 
   RangeSubtreeIterator iter;
@@ -3168,11 +3168,11 @@
   nsIDocument* doc = mStart.Container()->OwnerDoc();
   NS_ENSURE_TRUE(doc, NS_ERROR_UNEXPECTED);
   doc->FlushPendingNotifications(FlushType::Frames);
 
   // Recheck whether we're still in the document
-  NS_ENSURE_TRUE(mStart.Container()->IsInUncomposedDoc(), NS_ERROR_UNEXPECTED);
+  NS_ENSURE_TRUE(mStart.Container()->IsInComposedDoc(), NS_ERROR_UNEXPECTED);
 
   // A table to map gfxFontEntry objects to InspectorFontFace objects.
   // (We hold on to the InspectorFontFaces strongly due to the nsAutoPtrs
   // in the nsClassHashtable, until we move them out into aResult at the end
   // of the function.)
diff --git a/dom/base/nsScreen.h b/dom/base/nsScreen.h
--- a/dom/base/nsScreen.h
+++ b/dom/base/nsScreen.h
@@ -5,10 +5,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #ifndef nsScreen_h___
 #define nsScreen_h___
 
 #include "mozilla/Attributes.h"
+#include "mozilla/dom/ScreenBinding.h"
+#include "mozilla/dom/ScreenLuminance.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "mozilla/DOMEventTargetHelper.h"
 #include "mozilla/ErrorResult.h"
 #include "nsCOMPtr.h"
 #include "nsRect.h"
@@ -108,10 +110,23 @@
     nsRect rect;
     aRv = GetAvailRect(rect);
     return rect.Height();
   }
 
+  // Media Capabilities extension
+  mozilla::dom::ScreenColorGamut ColorGamut() const
+  {
+    return mozilla::dom::ScreenColorGamut::Srgb;
+  }
+
+  already_AddRefed<mozilla::dom::ScreenLuminance> GetLuminance() const
+  {
+    return nullptr;
+  }
+
+  IMPL_EVENT_HANDLER(change);
+
   // Deprecated
   void GetMozOrientation(nsString& aOrientation,
                          mozilla::dom::CallerType aCallerType) const;
 
   IMPL_EVENT_HANDLER(mozorientationchange)
diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp
--- a/dom/base/nsScreen.cpp
+++ b/dom/base/nsScreen.cpp
@@ -2,11 +2,10 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/dom/ScreenBinding.h"
 #include "nsContentUtils.h"
 #include "nsScreen.h"
 #include "nsIDocument.h"
 #include "nsIDocShell.h"
 #include "nsIDocument.h"
diff --git a/dom/base/test/test_range_bounds.html b/dom/base/test/test_range_bounds.html
--- a/dom/base/test/test_range_bounds.html
+++ b/dom/base/test/test_range_bounds.html
@@ -253,10 +253,26 @@
 		   firstSpanRect.height],
 		  [bdoRect.right - 7 * widthPerChar, bdoRect.right,
 		   bdoRect.top, bdoRect.bottom,
 		   7*widthPerChar, bdoRect.height]]});
 }
+
+function testShadowDOM() {
+  var ifr = document.createElement("iframe");
+  document.body.appendChild(ifr);
+  var doc = ifr.contentDocument;
+  var d = doc.createElement("div");
+  var sr = d.attachShadow({mode: "open"});
+  sr.innerHTML = "<div>inside shadow DOM</div>";
+  doc.body.appendChild(d);
+  var r = new ifr.contentWindow.Range();
+  r.selectNode(sr.firstChild);
+  var rect = r.getBoundingClientRect();
+  isnot(rect.width, 0, "Div element inside shadow shouldn't have zero size.");
+  isnot(rect.height, 0, "Div element inside shadow shouldn't have zero size.");
+}
+
 function test(){
   //test ltr
   doTest();
 
   //test rtl
@@ -272,11 +288,15 @@
   //test transforms
   isTransformed = true;
   root.style.transform = "translate(30px,50px)";
   doTest();
 
-  SimpleTest.finish();
+  SpecialPowers.pushPrefEnv({"set":[["dom.webcomponents.shadowdom.enabled", true]]},
+                            () => {
+                              testShadowDOM();
+                              SimpleTest.finish();
+                            });
 }
 
 window.onload = function() {
   SimpleTest.waitForExplicitFinish();
   setTimeout(test, 0);
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -515,10 +515,14 @@
 'MatchPatternSet': {
     'headerFile': 'mozilla/extensions/MatchPattern.h',
     'nativeType': 'mozilla::extensions::MatchPatternSet',
 },
 
+'MediaCapabilitiesInfo' : {
+    'wrapperCache': False,
+},
+
 'MediaKeys' : {
     'implicitJSContext': [ 'createSession']
 },
 
 'MediaStream': {
@@ -1291,10 +1295,143 @@
 'WebGLVertexArrayObject': {
     'nativeType': 'mozilla::WebGLVertexArray',
     'headerFile': 'WebGLVertexArray.h'
 },
 
+# WebGPU
+
+'WebGPU': {
+    'nativeType': 'mozilla::webgpu::Instance',
+},
+'WebGPUAdapter': {
+    'nativeType': 'mozilla::webgpu::Adapter',
+},
+'WebGPUAttachmentState': {
+    'nativeType': 'mozilla::webgpu::AttachmentState',
+},
+'WebGPUBindGroup': {
+    'nativeType': 'mozilla::webgpu::BindGroup',
+},
+'WebGPUBindGroupLayout': {
+    'nativeType': 'mozilla::webgpu::BindGroupLayout',
+},
+'WebGPUBlendState': {
+    'nativeType': 'mozilla::webgpu::BlendState',
+},
+'WebGPUBuffer': {
+    'nativeType': 'mozilla::webgpu::Buffer',
+},
+'WebGPUCommandBuffer': {
+    'nativeType': 'mozilla::webgpu::CommandBuffer',
+},
+'WebGPUCommandEncoder': {
+    'nativeType': 'mozilla::webgpu::CommandEncoder',
+},
+'WebGPUComputePipeline': {
+    'nativeType': 'mozilla::webgpu::ComputePipeline',
+},
+'WebGPUDepthStencilState': {
+    'nativeType': 'mozilla::webgpu::DepthStencilState',
+},
+'WebGPUDevice': {
+    'nativeType': 'mozilla::webgpu::Device',
+},
+'WebGPUFence': {
+    'nativeType': 'mozilla::webgpu::Fence',
+},
+'WebGPUInputState': {
+    'nativeType': 'mozilla::webgpu::InputState',
+},
+'WebGPULogEntry': {
+    'nativeType': 'mozilla::webgpu::LogEntry',
+},
+'WebGPUPipelineLayout': {
+    'nativeType': 'mozilla::webgpu::PipelineLayout',
+},
+'WebGPUQueue': {
+    'nativeType': 'mozilla::webgpu::Queue',
+},
+'WebGPURenderPipeline': {
+    'nativeType': 'mozilla::webgpu::RenderPipeline',
+},
+'WebGPUSampler': {
+    'nativeType': 'mozilla::webgpu::Sampler',
+},
+'WebGPUShaderModule': {
+    'nativeType': 'mozilla::webgpu::ShaderModule',
+},
+'WebGPUSwapChain': {
+    'nativeType': 'mozilla::webgpu::SwapChain',
+},
+'WebGPUTexture': {
+    'nativeType': 'mozilla::webgpu::Texture',
+},
+'WebGPUTextureView': {
+    'nativeType': 'mozilla::webgpu::TextureView',
+},
+
+
+'WebGPUBindingType': {
+    'concrete': False,
+},
+'WebGPUBlendFactor': {
+    'concrete': False,
+},
+'WebGPUBlendOperation': {
+    'concrete': False,
+},
+'WebGPUBufferUsage': {
+    'concrete': False,
+},
+'WebGPUColorWriteBits': {
+    'concrete': False,
+},
+'WebGPUCompareFunction': {
+    'concrete': False,
+},
+'WebGPUFilterMode': {
+    'concrete': False,
+},
+'WebGPUIndexFormat': {
+    'concrete': False,
+},
+'WebGPUInputStepMode': {
+    'concrete': False,
+},
+'WebGPULoadOp': {
+    'concrete': False,
+},
+'WebGPUPrimitiveTopology': {
+    'concrete': False,
+},
+'WebGPUShaderStage': {
+    'concrete': False,
+},
+'WebGPUShaderStageBit': {
+    'concrete': False,
+},
+'WebGPUStencilOperation': {
+    'concrete': False,
+},
+'WebGPUStoreOp': {
+    'concrete': False,
+},
+'WebGPUTextureDimension': {
+    'concrete': False,
+},
+'WebGPUTextureFormat': {
+    'concrete': False,
+},
+'WebGPUTextureUsage': {
+    'concrete': False,
+},
+'WebGPUVertexFormat': {
+    'concrete': False,
+},
+
+# WebRTC
+
 'WebrtcGlobalInformation': {
     'nativeType': 'mozilla::dom::WebrtcGlobalInformation',
     'headerFile': 'WebrtcGlobalInformation.h',
     'wrapperCache': False,
     'concrete': False,
diff --git a/dom/bindings/Errors.msg b/dom/bindings/Errors.msg
--- a/dom/bindings/Errors.msg
+++ b/dom/bindings/Errors.msg
@@ -102,5 +102,7 @@
 MSG_DEF(MSG_ONLY_IF_CACHED_WITHOUT_SAME_ORIGIN, 1, JSEXN_TYPEERR, "Request mode '{0}' was used, but request cache mode 'only-if-cached' can only be used with request mode 'same-origin'.")
 MSG_DEF(MSG_THRESHOLD_RANGE_ERROR, 0, JSEXN_RANGEERR, "Threshold values must all be in the range [0, 1].")
 MSG_DEF(MSG_WORKER_THREAD_SHUTTING_DOWN, 0, JSEXN_TYPEERR, "The Worker thread is shutting down.")
 MSG_DEF(MSG_CACHE_OPEN_FAILED, 0, JSEXN_TYPEERR, "CacheStorage.open() failed to access the storage system.")
 MSG_DEF(MSG_MATRIX_INIT_LENGTH_WRONG, 1, JSEXN_TYPEERR, "Matrix init sequence must have a length of 6 or 16 (actual value: {0})")
+MSG_DEF(MSG_INVALID_MEDIA_VIDEO_CONFIGURATION, 0, JSEXN_TYPEERR, "Invalid VideoConfiguration.")
+MSG_DEF(MSG_INVALID_MEDIA_AUDIO_CONFIGURATION, 0, JSEXN_TYPEERR, "Invalid AudioConfiguration.")
diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -5,10 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
     BUG_COMPONENT = ("Core", "DOM")
 
+if CONFIG['CC_TYPE'] == 'msvc':
+    CXXFLAGS += ['-bigobj']
+
 TEST_DIRS += ['test']
 
 XPIDL_SOURCES += [
     'nsIScriptError.idl'
 ]
diff --git a/dom/browser-element/BrowserElementParent.cpp b/dom/browser-element/BrowserElementParent.cpp
--- a/dom/browser-element/BrowserElementParent.cpp
+++ b/dom/browser-element/BrowserElementParent.cpp
@@ -158,11 +158,11 @@
                            NS_LITERAL_STRING("mozbrowseropenwindow"),
                            cx,
                            val, &status);
 
   if (dispatchSucceeded) {
-    if (aPopupFrameElement->IsInUncomposedDoc()) {
+    if (aPopupFrameElement->IsInComposedDoc()) {
       return BrowserElementParent::OPEN_WINDOW_ADDED;
     }
     if (status == nsEventStatus_eConsumeNoDefault) {
       // If the frame was not added to a document, report to callers whether
       // preventDefault was called on or not
diff --git a/dom/events/PointerEventHandler.cpp b/dom/events/PointerEventHandler.cpp
--- a/dom/events/PointerEventHandler.cpp
+++ b/dom/events/PointerEventHandler.cpp
@@ -630,11 +630,11 @@
   nsCOMPtr<nsIPresShell> shell = targetDoc->GetShell();
   if (NS_WARN_IF(!shell)) {
     return;
   }
 
-  if (!aIsGotCapture && !aCaptureTarget->IsInUncomposedDoc()) {
+  if (!aIsGotCapture && !aCaptureTarget->IsInComposedDoc()) {
     // If the capturing element was removed from the DOM tree, fire
     // ePointerLostCapture at the document.
     PointerEventInit init;
     init.mPointerId = aPointerEvent->pointerId;
     init.mBubbles = true;
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -7690,11 +7690,11 @@
     Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 0);
   } else {
     // 1 = ALL_INVISIBLE
     Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 1);
 
-    if (IsInUncomposedDoc()) {
+    if (IsInComposedDoc()) {
       // 0 = ALL_IN_TREE
       Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT,
                             0);
     } else {
       // 1 = ALL_NOT_IN_TREE
@@ -7710,11 +7710,11 @@
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 2);
       } else {
         // 3 = drawImage_INVISIBLE
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 3);
 
-        if (IsInUncomposedDoc()) {
+        if (IsInComposedDoc()) {
           // 2 = drawImage_IN_TREE
           Telemetry::Accumulate(
             Telemetry::VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT, 2);
         } else {
           // 3 = drawImage_NOT_IN_TREE
@@ -7730,11 +7730,11 @@
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 4);
       } else {
         // 5 = createPattern_INVISIBLE
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 5);
 
-        if (IsInUncomposedDoc()) {
+        if (IsInComposedDoc()) {
           // 4 = createPattern_IN_TREE
           Telemetry::Accumulate(
             Telemetry::VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT, 4);
         } else {
           // 5 = createPattern_NOT_IN_TREE
@@ -7750,11 +7750,11 @@
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 6);
       } else {
         // 7 = createImageBitmap_INVISIBLE
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 7);
 
-        if (IsInUncomposedDoc()) {
+        if (IsInComposedDoc()) {
           // 6 = createImageBitmap_IN_TREE
           Telemetry::Accumulate(
             Telemetry::VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT, 6);
         } else {
           // 7 = createImageBitmap_NOT_IN_TREE
@@ -7770,11 +7770,11 @@
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 8);
       } else {
         // 9 = captureStream_INVISIBLE
         Telemetry::Accumulate(Telemetry::VIDEO_AS_CONTENT_SOURCE, 9);
 
-        if (IsInUncomposedDoc()) {
+        if (IsInComposedDoc()) {
           // 8 = captureStream_IN_TREE
           Telemetry::Accumulate(
             Telemetry::VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT, 8);
         } else {
           // 9 = captureStream_NOT_IN_TREE
@@ -7795,11 +7795,11 @@
   if (!isVisible) {
     LOG(LogLevel::Debug,
         ("%p Log VIDEO_AS_CONTENT_SOURCE_IN_TREE_OR_NOT: inTree = %u, API: "
          "'%d' and 'All'",
          this,
-         IsInUncomposedDoc(),
+         IsInComposedDoc(),
          static_cast<int>(aAPI)));
   }
 }
 
 void
@@ -7922,11 +7922,11 @@
 void
 HTMLMediaElement::NotifyDecoderActivityChanges() const
 {
   if (mDecoder) {
     mDecoder->NotifyOwnerActivityChanged(
-      !IsHidden(), mVisibilityState, IsInUncomposedDoc());
+      !IsHidden(), mVisibilityState, IsInComposedDoc());
   }
 }
 
 nsIDocument*
 HTMLMediaElement::GetDocument() const
diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -1337,10 +1337,18 @@
 
     aError.Throw(NS_ERROR_DOM_SECURITY_ERR);
     return nullptr;
   }
 
+  // At this point we know this is a valid-enough document.open() call
+  // and not a no-op.  Increment our use counters.
+  SetDocumentAndPageUseCounter(eUseCounter_custom_DocumentOpen);
+  bool isReplace = aReplace.LowerCaseEqualsLiteral("replace");
+  if (isReplace) {
+    SetDocumentAndPageUseCounter(eUseCounter_custom_DocumentOpenReplace);
+  }
+
   // Stop current loads targeted at the window this document is in.
   if (mScriptGlobalObject) {
     nsCOMPtr<nsIContentViewer> cv;
     shell->GetContentViewer(getter_AddRefs(cv));
 
@@ -1565,12 +1573,11 @@
 
   // Now check whether we were opened with a "replace" argument.  If
   // so, we need to tell the docshell to not create a new history
   // entry for this load. Otherwise, make sure that we're doing a normal load,
   // not whatever type of load was previously done on this docshell.
-  shell->SetLoadType(aReplace.LowerCaseEqualsLiteral("replace") ?
-                       LOAD_NORMAL_REPLACE : LOAD_NORMAL);
+  shell->SetLoadType(isReplace ? LOAD_NORMAL_REPLACE : LOAD_NORMAL);
 
   nsCOMPtr<nsIContentViewer> cv;
   shell->GetContentViewer(getter_AddRefs(cv));
   if (cv) {
     cv->LoadStart(this);
diff --git a/dom/media/ADTSDecoder.h b/dom/media/ADTSDecoder.h
--- a/dom/media/ADTSDecoder.h
+++ b/dom/media/ADTSDecoder.h
@@ -5,21 +5,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef ADTS_DECODER_H_
 #define ADTS_DECODER_H_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class ADTSDecoder
 {
 public:
   // Returns true if the ADTS backend is pref'ed on, and we're running on a
   // platform that is likely to have decoders for the format.
   static bool IsEnabled();
   static bool IsSupportedType(const MediaContainerType& aContainerType);
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif // !ADTS_DECODER_H_
diff --git a/dom/media/ADTSDecoder.cpp b/dom/media/ADTSDecoder.cpp
--- a/dom/media/ADTSDecoder.cpp
+++ b/dom/media/ADTSDecoder.cpp
@@ -29,6 +29,21 @@
   }
 
   return false;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+ADTSDecoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (!IsSupportedType(aType)) {
+    return tracks;
+  }
+
+  tracks.AppendElement(
+    CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+      NS_LITERAL_CSTRING("audio/mp4a-latm"), aType));
+
+  return tracks;
+}
+
 } // namespace mozilla
diff --git a/dom/media/Benchmark.h b/dom/media/Benchmark.h
--- a/dom/media/Benchmark.h
+++ b/dom/media/Benchmark.h
@@ -21,24 +21,24 @@
 class Benchmark;
 
 class BenchmarkPlayback : public QueueObject
 {
   friend class Benchmark;
-  BenchmarkPlayback(Benchmark* aMainThreadState, MediaDataDemuxer* aDemuxer);
+  BenchmarkPlayback(Benchmark* aGlobalState, MediaDataDemuxer* aDemuxer);
   void DemuxSamples();
   void DemuxNextSample();
-  void MainThreadShutdown();
+  void GlobalShutdown();
   void InitDecoder(TrackInfo&& aInfo);
 
   void Output(const MediaDataDecoder::DecodedData& aResults);
   void Error(const MediaResult& aError);
   void InputExhausted();
 
   // Shutdown trackdemuxer and demuxer if any and shutdown the task queues.
   void FinalizeShutdown();
 
-  Atomic<Benchmark*> mMainThreadState;
+  Atomic<Benchmark*> mGlobalState;
 
   RefPtr<TaskQueue> mDecoderTaskQueue;
   RefPtr<MediaDataDecoder> mDecoder;
 
   // Object only accessed on Thread()
@@ -60,39 +60,40 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Benchmark)
 
   struct Parameters
   {
     Parameters()
-      : mFramesToMeasure(-1)
+      : mFramesToMeasure(UINT32_MAX)
       , mStartupFrame(1)
       , mTimeout(TimeDuration::Forever())
     {
     }
 
-    Parameters(int32_t aFramesToMeasure,
+    Parameters(uint32_t aFramesToMeasure,
                uint32_t aStartupFrame,
-               int32_t aStopAtFrame,
+               uint32_t aStopAtFrame,
                const TimeDuration& aTimeout)
       : mFramesToMeasure(aFramesToMeasure)
       , mStartupFrame(aStartupFrame)
       , mStopAtFrame(Some(aStopAtFrame))
       , mTimeout(aTimeout)
     {
     }
 
-    const int32_t mFramesToMeasure;
+    const uint32_t mFramesToMeasure;
     const uint32_t mStartupFrame;
-    const Maybe<int32_t> mStopAtFrame;
+    const Maybe<uint32_t> mStopAtFrame;
     const TimeDuration mTimeout;
   };
 
   typedef MozPromise<uint32_t, MediaResult, /* IsExclusive = */ true> BenchmarkPromise;
 
   explicit Benchmark(MediaDataDemuxer* aDemuxer,
                      const Parameters& aParameters = Parameters());
   RefPtr<BenchmarkPromise> Run();
 
+  // Must be called on the main thread.
   static void Init();
 
 private:
   friend class BenchmarkPlayback;
   virtual ~Benchmark();
@@ -106,11 +107,11 @@
 };
 
 class VP9Benchmark
 {
 public:
-  static bool IsVP9DecodeFast();
+  static bool IsVP9DecodeFast(bool aDefault = false);
   static const char* sBenchmarkFpsPref;
   static const char* sBenchmarkFpsVersionCheck;
   static const uint32_t sBenchmarkVersionID;
   static bool sHasRunTest;
 };
diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp
--- a/dom/media/Benchmark.cpp
+++ b/dom/media/Benchmark.cpp
@@ -13,10 +13,12 @@
 #include "WebMDemuxer.h"
 #include "gfxPrefs.h"
 #include "mozilla/AbstractThread.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedThreadPool.h"
+#include "mozilla/StaticMutex.h"
+#include "mozilla/StaticPrefs.h"
 #include "mozilla/SystemGroup.h"
 #include "mozilla/TaskQueue.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/gfx/gfxVars.h"
@@ -37,37 +39,39 @@
 const char* VP9Benchmark::sBenchmarkFpsVersionCheck = "media.benchmark.vp9.versioncheck";
 bool VP9Benchmark::sHasRunTest = false;
 
 // static
 bool
-VP9Benchmark::IsVP9DecodeFast()
+VP9Benchmark::IsVP9DecodeFast(bool aDefault)
 {
-  MOZ_ASSERT(NS_IsMainThread());
-
   // Disable VP9 estimizer on Mac, see bug 1400787.
 #if defined(MOZ_WIDGET_ANDROID) || defined(MOZ_APPLEMEDIA)
   return false;
 #else
-  bool hasPref = Preferences::HasUserValue(sBenchmarkFpsPref);
-  uint32_t hadRecentUpdate = Preferences::GetUint(sBenchmarkFpsVersionCheck, 0U);
-
-  if (!sHasRunTest && (!hasPref || hadRecentUpdate != sBenchmarkVersionID)) {
+  static StaticMutex sMutex;
+  uint32_t decodeFps = StaticPrefs::MediaBenchmarkVp9Fps();
+  uint32_t hadRecentUpdate = StaticPrefs::MediaBenchmarkVp9Versioncheck();
+  bool needBenchmark;
+  {
+    StaticMutexAutoLock lock(sMutex);
+    needBenchmark = !sHasRunTest &&
+                    (decodeFps == 0 || hadRecentUpdate != sBenchmarkVersionID);
     sHasRunTest = true;
+  }
 
+  if (needBenchmark) {
     RefPtr<WebMDemuxer> demuxer = new WebMDemuxer(
       new BufferMediaResource(sWebMSample, sizeof(sWebMSample)));
-    RefPtr<Benchmark> estimiser =
-      new Benchmark(demuxer,
-                    {
-                      Preferences::GetInt("media.benchmark.frames", 300), // frames to measure
-                      1, // start benchmarking after decoding this frame.
-                      8, // loop after decoding that many frames.
-                      TimeDuration::FromMilliseconds(
-                        Preferences::GetUint("media.benchmark.timeout", 1000))
-                    });
+    RefPtr<Benchmark> estimiser = new Benchmark(
+      demuxer,
+      { StaticPrefs::MediaBenchmarkFrames(), // frames to measure
+        1, // start benchmarking after decoding this frame.
+        8, // loop after decoding that many frames.
+        TimeDuration::FromMilliseconds(StaticPrefs::MediaBenchmarkTimeout()) });
     estimiser->Run()->Then(
-      SystemGroup::AbstractMainThreadFor(TaskCategory::Other), __func__,
+      AbstractThread::MainThread(),
+      __func__,
       [](uint32_t aDecodeFps) {
         if (XRE_IsContentProcess()) {
           dom::ContentChild* contentChild = dom::ContentChild::GetSingleton();
           if (contentChild) {
             contentChild->SendNotifyBenchmarkResult(NS_LITERAL_STRING("VP9"),
@@ -75,52 +79,49 @@
           }
         } else {
           Preferences::SetUint(sBenchmarkFpsPref, aDecodeFps);
           Preferences::SetUint(sBenchmarkFpsVersionCheck, sBenchmarkVersionID);
         }
-        Telemetry::Accumulate(Telemetry::HistogramID::VIDEO_VP9_BENCHMARK_FPS, aDecodeFps);
+        Telemetry::Accumulate(Telemetry::HistogramID::VIDEO_VP9_BENCHMARK_FPS,
+                              aDecodeFps);
       },
-      []() { });
+      []() {});
   }
 
-  if (!hasPref) {
-    return false;
+  if (decodeFps == 0) {
+    return aDefault;
   }
 
-  uint32_t decodeFps = Preferences::GetUint(sBenchmarkFpsPref);
-  uint32_t threshold =
-    Preferences::GetUint("media.benchmark.vp9.threshold", 150);
-
-  return decodeFps >= threshold;
+  return decodeFps >= StaticPrefs::MediaBenchmarkVp9Threshold();
 #endif
 }
 
 Benchmark::Benchmark(MediaDataDemuxer* aDemuxer, const Parameters& aParameters)
-  : QueueObject(AbstractThread::MainThread())
+  : QueueObject(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
+                              "Benchmark::QueueObject"))
   , mParameters(aParameters)
   , mKeepAliveUntilComplete(this)
   , mPlaybackState(this, aDemuxer)
 {
   MOZ_COUNT_CTOR(Benchmark);
-  MOZ_ASSERT(Thread(), "Must be run in task queue");
 }
 
 Benchmark::~Benchmark()
 {
   MOZ_COUNT_DTOR(Benchmark);
 }
 
 RefPtr<Benchmark::BenchmarkPromise>
 Benchmark::Run()
 {
-  MOZ_ASSERT(OnThread());
-
-  RefPtr<BenchmarkPromise> p = mPromise.Ensure(__func__);
   RefPtr<Benchmark> self = this;
-  mPlaybackState.Dispatch(NS_NewRunnableFunction(
-    "Benchmark::Run", [self]() { self->mPlaybackState.DemuxSamples(); }));
-  return p;
+  return InvokeAsync(Thread(), __func__, [self] {
+    RefPtr<BenchmarkPromise> p = self->mPromise.Ensure(__func__);
+    self->mPlaybackState.Dispatch(NS_NewRunnableFunction(
+      "Benchmark::Run", [self]() { self->mPlaybackState.DemuxSamples(); }));
+    return p;
+  });
 }
 
 void
 Benchmark::ReturnResult(uint32_t aDecodeFps)
 {
@@ -151,34 +152,33 @@
   MOZ_ASSERT(NS_IsMainThread());
   gfxVars::Initialize();
   gfxPrefs::GetSingleton();
 }
 
-BenchmarkPlayback::BenchmarkPlayback(Benchmark* aMainThreadState,
+BenchmarkPlayback::BenchmarkPlayback(Benchmark* aGlobalState,
                                      MediaDataDemuxer* aDemuxer)
   : QueueObject(new TaskQueue(
       GetMediaThreadPool(MediaThreadType::PLAYBACK),
       "BenchmarkPlayback::QueueObject"))
-  , mMainThreadState(aMainThreadState)
+  , mGlobalState(aGlobalState)
   , mDecoderTaskQueue(new TaskQueue(
       GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
       "BenchmarkPlayback::mDecoderTaskQueue"))
   , mDemuxer(aDemuxer)
   , mSampleIndex(0)
   , mFrameCount(0)
   , mFinished(false)
   , mDrained(false)
 {
-  MOZ_ASSERT(static_cast<Benchmark*>(mMainThreadState)->OnThread());
 }
 
 void
 BenchmarkPlayback::DemuxSamples()
 {
   MOZ_ASSERT(OnThread());
 
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   mDemuxer->Init()->Then(
     Thread(), __func__,
     [this, ref](nsresult aResult) {
       MOZ_ASSERT(OnThread());
       if (mDemuxer->GetNumberTracks(TrackInfo::kVideoTrack)) {
@@ -200,18 +200,18 @@
 void
 BenchmarkPlayback::DemuxNextSample()
 {
   MOZ_ASSERT(OnThread());
 
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   RefPtr<MediaTrackDemuxer::SamplesPromise> promise = mTrackDemuxer->GetSamples();
   promise->Then(
     Thread(), __func__,
     [this, ref](RefPtr<MediaTrackDemuxer::SamplesHolder> aHolder) {
       mSamples.AppendElements(std::move(aHolder->mSamples));
       if (ref->mParameters.mStopAtFrame &&
-          mSamples.Length() == (size_t)ref->mParameters.mStopAtFrame.ref()) {
+          mSamples.Length() == ref->mParameters.mStopAtFrame.ref()) {
         InitDecoder(std::move(*mTrackDemuxer->GetInfo()));
       } else {
         Dispatch(NS_NewRunnableFunction("BenchmarkPlayback::DemuxNextSample",
                                         [this, ref]() { DemuxNextSample(); }));
       }
@@ -237,11 +237,11 @@
   mDecoder = platform->CreateDecoder({ aInfo, mDecoderTaskQueue });
   if (!mDecoder) {
     Error(MediaResult(NS_ERROR_FAILURE, "Failed to create decoder"));
     return;
   }
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   mDecoder->Init()->Then(
     Thread(), __func__,
     [this, ref](TrackInfo::TrackType aTrackType) { InputExhausted(); },
     [this, ref](const MediaResult& aError) { Error(aError); });
 }
@@ -261,28 +261,28 @@
     mTrackDemuxer->BreakCycles();
     mTrackDemuxer = nullptr;
   }
   mDemuxer = nullptr;
 
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   Thread()->AsTaskQueue()->BeginShutdown()->Then(
     ref->Thread(), __func__,
     [ref]() { ref->Dispose(); },
     []() { MOZ_CRASH("not reached"); });
 }
 
 void
-BenchmarkPlayback::MainThreadShutdown()
+BenchmarkPlayback::GlobalShutdown()
 {
   MOZ_ASSERT(OnThread());
 
   MOZ_ASSERT(!mFinished, "We've already shutdown");
 
   mFinished = true;
 
   if (mDecoder) {
-    RefPtr<Benchmark> ref(mMainThreadState);
+    RefPtr<Benchmark> ref(mGlobalState);
     mDecoder->Flush()->Then(
       Thread(), __func__,
       [ref, this]() {
         mDecoder->Shutdown()->Then(
           Thread(), __func__,
@@ -302,22 +302,23 @@
 BenchmarkPlayback::Output(const MediaDataDecoder::DecodedData& aResults)
 {
   MOZ_ASSERT(OnThread());
   MOZ_ASSERT(!mFinished);
 
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   mFrameCount += aResults.Length();
   if (!mDecodeStartTime && mFrameCount >= ref->mParameters.mStartupFrame) {
     mDecodeStartTime = Some(TimeStamp::Now());
   }
   TimeStamp now = TimeStamp::Now();
-  int32_t frames = mFrameCount - ref->mParameters.mStartupFrame;
+  uint32_t frames = mFrameCount - ref->mParameters.mStartupFrame;
   TimeDuration elapsedTime = now - mDecodeStartTime.refOr(now);
-  if (((frames == ref->mParameters.mFramesToMeasure) && frames > 0) ||
+  if (((frames == ref->mParameters.mFramesToMeasure) &&
+       mFrameCount > ref->mParameters.mStartupFrame && frames > 0) ||
       elapsedTime >= ref->mParameters.mTimeout || mDrained) {
     uint32_t decodeFps = frames / elapsedTime.ToSeconds();
-    MainThreadShutdown();
+    GlobalShutdown();
     ref->Dispatch(
       NS_NewRunnableFunction("BenchmarkPlayback::Output", [ref, decodeFps]() {
         ref->ReturnResult(decodeFps);
       }));
   }
@@ -326,12 +327,12 @@
 void
 BenchmarkPlayback::Error(const MediaResult& aError)
 {
   MOZ_ASSERT(OnThread());
 
-  RefPtr<Benchmark> ref(mMainThreadState);
-  MainThreadShutdown();
+  RefPtr<Benchmark> ref(mGlobalState);
+  GlobalShutdown();
   ref->Dispatch(NS_NewRunnableFunction(
     "BenchmarkPlayback::Error",
     [ref, aError]() { ref->ReturnError(aError); }));
 }
 
@@ -345,11 +346,11 @@
     Error(MediaResult(NS_ERROR_FAILURE, "Nothing left to decode"));
     return;
   }
 
   RefPtr<MediaRawData> sample = mSamples[mSampleIndex];
-  RefPtr<Benchmark> ref(mMainThreadState);
+  RefPtr<Benchmark> ref(mGlobalState);
   RefPtr<MediaDataDecoder::DecodePromise> p = mDecoder->Decode(sample);
 
   mSampleIndex++;
   if (mSampleIndex == mSamples.Length() && !ref->mParameters.mStopAtFrame) {
     // Complete current frame decode then drain if still necessary.
diff --git a/dom/media/BitReader.h b/dom/media/BitReader.h
--- a/dom/media/BitReader.h
+++ b/dom/media/BitReader.h
@@ -11,16 +11,16 @@
 {
 
 class BitReader
 {
 public:
-  explicit BitReader(const mozilla::MediaByteBuffer* aBuffer);
-  BitReader(const mozilla::MediaByteBuffer* aBuffer, size_t aBits);
+  explicit BitReader(const MediaByteBuffer* aBuffer);
+  BitReader(const MediaByteBuffer* aBuffer, size_t aBits);
   BitReader(const uint8_t* aBuffer, size_t aBits);
   ~BitReader();
   uint32_t ReadBits(size_t aNum);
-  uint32_t ReadBit() { return ReadBits(1); }
+  bool ReadBit() { return ReadBits(1) != 0; }
   uint32_t ReadU32() { return ReadBits(32); }
   uint64_t ReadU64();
 
   // Read the UTF-8 sequence and convert it to its 64-bit UCS-4 encoded form.
   // Return 0xfffffffffffffff if sequence was invalid.
@@ -33,10 +33,13 @@
   // Return the number of bits parsed so far;
   size_t BitCount() const;
   // Return the number of bits left.
   size_t BitsLeft() const;
 
+  // Return RBSP bit length.
+  static uint32_t GetBitLength(const MediaByteBuffer* aNAL);
+
 private:
   void FillReservoir();
   const uint8_t* mData;
   const size_t mOriginalBitSize;
   size_t mTotalBitsLeft;
diff --git a/dom/media/BitReader.cpp b/dom/media/BitReader.cpp
--- a/dom/media/BitReader.cpp
+++ b/dom/media/BitReader.cpp
@@ -155,6 +155,52 @@
 
   mNumBitsLeft = 8 * i;
   mReservoir <<= 32 - mNumBitsLeft;
 }
 
+/* static */ uint32_t
+BitReader::GetBitLength(const mozilla::MediaByteBuffer* aNAL)
+{
+  size_t size = aNAL->Length();
+
+  while (size > 0 && aNAL->ElementAt(size - 1) == 0) {
+    size--;
+  }
+
+  if (!size) {
+    return 0;
+  }
+
+  if (size > UINT32_MAX / 8) {
+    // We can't represent it, we'll use as much as we can.
+    return UINT32_MAX;
+  }
+
+  uint8_t v = aNAL->ElementAt(size - 1);
+  size *= 8;
+
+  // Remove the stop bit and following trailing zeros.
+  if (v) {
+    // Count the consecutive zero bits (trailing) on the right by binary search.
+    // Adapted from Matt Whitlock algorithm to only bother with 8 bits integers.
+    uint32_t c;
+    if (v & 1) {
+      // Special case for odd v (assumed to happen half of the time).
+      c = 0;
+    } else {
+      c = 1;
+      if ((v & 0xf) == 0) {
+        v >>= 4;
+        c += 4;
+      }
+      if ((v & 0x3) == 0) {
+        v >>= 2;
+        c += 2;
+      }
+      c -= v & 0x1;
+    }
+    size -= c + 1;
+  }
+  return size;
+}
+
 } // namespace mozilla
diff --git a/dom/media/BitWriter.h b/dom/media/BitWriter.h
new file mode 100644
--- /dev/null
+++ b/dom/media/BitWriter.h
@@ -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/. */
+
+#ifndef BIT_WRITER_H_
+#define BIT_WRITER_H_
+
+#include "mozilla/RefPtr.h"
+
+namespace mozilla
+{
+
+class MediaByteBuffer;
+
+class BitWriter
+{
+public:
+  explicit BitWriter(MediaByteBuffer* aBuffer);
+  virtual ~BitWriter();
+  void WriteBits(uint64_t aValue, size_t aBits);
+  void WriteBit(bool aValue) { WriteBits(aValue, 1); }
+  void WriteU8(uint8_t aValue) { WriteBits(aValue, 8); }
+  void WriteU32(uint32_t aValue) { WriteBits(aValue, 32); }
+  void WriteU64(uint64_t aValue) { WriteBits(aValue, 64); }
+
+  // Write unsigned integer into Exp-Golomb-coded. 2^32-2 at most
+  void WriteUE(uint32_t aValue);
+
+  // Write RBSP trailing bits.
+  void CloseWithRbspTrailing();
+
+  // Return the number of bits written so far;
+  size_t BitCount() const { return mPosition * 8 + mBitIndex; }
+
+private:
+  RefPtr<MediaByteBuffer> mBuffer;
+  size_t mPosition = 0;
+  uint8_t mBitIndex = 0;
+};
+
+} // namespace mozilla
+
+#endif // BIT_WRITER_H_
diff --git a/dom/media/BitWriter.cpp b/dom/media/BitWriter.cpp
new file mode 100644
--- /dev/null
+++ b/dom/media/BitWriter.cpp
@@ -0,0 +1,96 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 "BitWriter.h"
+#include "MediaData.h"
+#include "mozilla/MathAlgorithms.h"
+
+namespace mozilla
+{
+
+constexpr uint8_t golombLen[256] = {
+  1,  3,  3,  5,  5,  5,  5,  7,  7,  7,  7,  7,  7,  7,  7,  9,  9,  9,  9,
+  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+  11, 11, 11, 11, 11, 11, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 17,
+};
+
+BitWriter::BitWriter(MediaByteBuffer* aBuffer)
+  : mBuffer(aBuffer)
+{
+}
+
+BitWriter::~BitWriter() {}
+
+void
+BitWriter::WriteBits(uint64_t aValue, size_t aBits)
+{
+  MOZ_ASSERT(aBits <= sizeof(uint64_t) * 8);
+
+  while (aBits) {
+    if (mBitIndex == 0) {
+      mBuffer->AppendElement(0);
+    }
+
+    const uint8_t clearMask = ~(~0 << (8 - mBitIndex));
+    uint8_t mask = 0;
+
+    if (mBitIndex + aBits > 8) {
+      // Not enough bits in the current byte to write all the bits
+      // required, we'll process what we can and continue with the left over.
+      const uint8_t leftOverBits = mBitIndex + aBits - 8;
+      const uint64_t leftOver = aValue & (~uint64_t(0) >> (8 - mBitIndex));
+      mask = aValue >> leftOverBits;
+
+      mBitIndex = 8;
+      aValue = leftOver;
+      aBits = leftOverBits;
+    } else {
+      const uint8_t offset = 8 - mBitIndex - aBits;
+      mask = aValue << offset;
+
+      mBitIndex += aBits;
+      aBits = 0;
+    }
+
+    mBuffer->ElementAt(mPosition) |= mask & clearMask;
+
+    if (mBitIndex == 8) {
+      mPosition++;
+      mBitIndex = 0;
+    }
+  }
+}
+
+void
+BitWriter::WriteUE(uint32_t aValue)
+{
+  MOZ_ASSERT(aValue <= (UINT32_MAX - 1));
+
+  if (aValue < 256) {
+    WriteBits(aValue + 1, golombLen[aValue]);
+  } else {
+    const uint32_t e = FloorLog2(aValue + 1);
+    WriteBits(aValue + 1, e * 2 + 1);
+  }
+}
+
+void
+BitWriter::CloseWithRbspTrailing()
+{
+  WriteBit(true);
+  WriteBits(0, (8 - mBitIndex) & 7);
+}
+
+} // namespace mozilla
diff --git a/dom/media/DecoderTraits.h b/dom/media/DecoderTraits.h
--- a/dom/media/DecoderTraits.h
+++ b/dom/media/DecoderTraits.h
@@ -5,18 +5,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef DecoderTraits_h_
 #define DecoderTraits_h_
 
+#include "mozilla/UniquePtr.h"
 #include "nsStringFwd.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 
 class DecoderDoctorDiagnostics;
 class MediaContainerType;
 struct MediaFormatReaderInit;
 class MediaFormatReader;
+class TrackInfo;
 
 enum CanPlayStatus {
   CANPLAY_NO,
   CANPLAY_MAYBE,
   CANPLAY_YES
@@ -55,10 +58,14 @@
 
   // Returns true if aType is matroska type.
   static bool IsMatroskaType(const MediaContainerType& aType);
 
   static bool IsSupportedType(const MediaContainerType& aType);
+
+  // Returns an array of all TrackInfo objects described by this type.
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/DecoderTraits.cpp b/dom/media/DecoderTraits.cpp
--- a/dom/media/DecoderTraits.cpp
+++ b/dom/media/DecoderTraits.cpp
@@ -96,12 +96,12 @@
   }
   if (WaveDecoder::IsSupportedType(MediaContainerType(mimeType))) {
     if (WaveDecoder::IsSupportedType(aType)) {
       return CANPLAY_YES;
     }
-    // We can only reach this position if a particular codec was requested,
-    // ogg is supported and working: the codec must be invalid.
+    // We can only reach this position if a particular codec was requested, wave
+    // is supported and working: the codec must be invalid or not supported.
     return CANPLAY_NO;
   }
   if (WebMDecoder::IsSupportedType(mimeType)) {
     if (WebMDecoder::IsSupportedType(aType)) {
       return CANPLAY_YES;
@@ -119,18 +119,33 @@
     // We can only reach this position if a particular codec was requested,
     // fmp4 is supported and working: the codec must be invalid.
     return CANPLAY_NO;
   }
 #endif
-  if (MP3Decoder::IsSupportedType(aType)) {
-    return CANPLAY_YES;
+  if (MP3Decoder::IsSupportedType(mimeType)) {
+    if (MP3Decoder::IsSupportedType(aType)) {
+      return CANPLAY_YES;
+    }
+    // We can only reach this position if a particular codec was requested,
+    // mp3 is supported and working: the codec must be invalid.
+    return CANPLAY_NO;
   }
-  if (ADTSDecoder::IsSupportedType(aType)) {
-    return CANPLAY_YES;
+  if (ADTSDecoder::IsSupportedType(mimeType)) {
+    if (ADTSDecoder::IsSupportedType(aType)) {
+      return CANPLAY_YES;
+    }
+    // We can only reach this position if a particular codec was requested,
+    // adts is supported and working: the codec must be invalid.
+    return CANPLAY_NO;
   }
-  if (FlacDecoder::IsSupportedType(aType)) {
-    return CANPLAY_YES;
+  if (FlacDecoder::IsSupportedType(mimeType)) {
+    if (FlacDecoder::IsSupportedType(aType)) {
+      return CANPLAY_YES;
+    }
+    // We can only reach this position if a particular codec was requested,
+    // flac is supported and working: the codec must be invalid.
+    return CANPLAY_NO;
   }
 
   return CANPLAY_MAYBE;
 }
 
@@ -322,6 +337,38 @@
     HLSDecoder::IsSupportedType(*type) ||
 #endif
     false;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+DecoderTraits::GetTracksInfo(const MediaContainerType& aType)
+{
+  // Container type with just the MIME type/subtype, no codecs.
+  const MediaContainerType mimeType(aType.Type());
+
+  if (OggDecoder::IsSupportedType(mimeType)) {
+    return OggDecoder::GetTracksInfo(aType);
+  }
+  if (WaveDecoder::IsSupportedType(mimeType)) {
+    return WaveDecoder::GetTracksInfo(aType);
+  }
+#ifdef MOZ_FMP4
+  if (MP4Decoder::IsSupportedType(mimeType, nullptr)) {
+    return MP4Decoder::GetTracksInfo(aType);
+  }
+#endif
+  if (WebMDecoder::IsSupportedType(mimeType)) {
+    return WebMDecoder::GetTracksInfo(aType);
+  }
+  if (MP3Decoder::IsSupportedType(mimeType)) {
+    return MP3Decoder::GetTracksInfo(aType);
+  }
+  if (ADTSDecoder::IsSupportedType(mimeType)) {
+    return ADTSDecoder::GetTracksInfo(aType);
+  }
+  if (FlacDecoder::IsSupportedType(mimeType)) {
+    return FlacDecoder::GetTracksInfo(aType);
+  }
+  return nsTArray<UniquePtr<TrackInfo>>();
+}
+
 } // namespace mozilla
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -4,11 +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/. */
 
 #include "MediaFormatReader.h"
 
-#include "AutoTaskQueue.h"
 #include "MediaData.h"
 #include "MediaInfo.h"
 #include "VideoFrameContainer.h"
 #include "VideoUtils.h"
 #include "mozilla/AbstractThread.h"
@@ -16,10 +15,11 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/NotNull.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/StaticPrefs.h"
+#include "mozilla/TaskQueue.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/Unused.h"
 #include "nsContentUtils.h"
 #include "nsPrintfCString.h"
 #ifdef MOZ_WIDGET_ANDROID
@@ -919,13 +919,13 @@
   using TrackType = TrackInfo::TrackType;
   class Wrapper;
 
 public:
   explicit DemuxerProxy(MediaDataDemuxer* aDemuxer)
-    : mTaskQueue(new AutoTaskQueue(
-        GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
-        "DemuxerProxy::mTaskQueue"))
+    : mTaskQueue(
+        new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
+                      "DemuxerProxy::mTaskQueue"))
     , mData(new Data(aDemuxer))
   {
     MOZ_COUNT_CTOR(DemuxerProxy);
   }
 
@@ -1014,11 +1014,11 @@
 
     return mData->mShouldComputeStartTime;
   }
 
 private:
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   struct Data
   {
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Data)
 
     explicit Data(MediaDataDemuxer* aDemuxer)
@@ -1047,11 +1047,11 @@
 };
 
 class MediaFormatReader::DemuxerProxy::Wrapper : public MediaTrackDemuxer
 {
 public:
-  Wrapper(MediaTrackDemuxer* aTrackDemuxer, AutoTaskQueue* aTaskQueue)
+  Wrapper(MediaTrackDemuxer* aTrackDemuxer, TaskQueue* aTaskQueue)
     : mMutex("TrackDemuxer Mutex")
     , mTaskQueue(aTaskQueue)
     , mGetSamplesMayBlock(aTrackDemuxer->GetSamplesMayBlock())
     , mInfo(aTrackDemuxer->GetInfo())
     , mTrackDemuxer(aTrackDemuxer)
@@ -1164,11 +1164,11 @@
 
   void BreakCycles() override { }
 
 private:
   Mutex mMutex;
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   const bool mGetSamplesMayBlock;
   const UniquePtr<TrackInfo> mInfo;
   // mTrackDemuxer is only ever accessed on demuxer's task queue.
   RefPtr<MediaTrackDemuxer> mTrackDemuxer;
   // All following members are protected by mMutex
@@ -1218,11 +1218,11 @@
 MediaFormatReader::DemuxerProxy::Init()
 {
   using InitPromise = MediaDataDemuxer::InitPromise;
 
   RefPtr<Data> data = mData;
-  RefPtr<AutoTaskQueue> taskQueue = mTaskQueue;
+  RefPtr<TaskQueue> taskQueue = mTaskQueue;
   return InvokeAsync(mTaskQueue, __func__,
                      [data, taskQueue]() {
                        if (!data->mDemuxer) {
                          return InitPromise::CreateAndReject(
                            NS_ERROR_DOM_MEDIA_CANCELED, __func__);
diff --git a/dom/media/MediaMIMETypes.h b/dom/media/MediaMIMETypes.h
--- a/dom/media/MediaMIMETypes.h
+++ b/dom/media/MediaMIMETypes.h
@@ -11,10 +11,15 @@
 #include "mozilla/Maybe.h"
 #include "nsString.h"
 
 namespace mozilla {
 
+namespace dom {
+struct AudioConfiguration;
+struct VideoConfiguration;
+}
+
 // Class containing pointing at a media MIME "type/subtype" string literal.
 // See IsMediaMIMEType for restrictions.
 // Mainly used to help construct a MediaMIMEType through the statically-checked
 // MEDIAMIMETYPE macro, or to compare a MediaMIMEType to a literal.
 class DependentMediaMIMEType
@@ -173,44 +178,70 @@
   const MediaCodecs& Codecs() const { return mCodecs; }
 
   // Sizes and rates.
   Maybe<int32_t> GetWidth() const { return GetMaybeNumber(mWidth); }
   Maybe<int32_t> GetHeight() const { return GetMaybeNumber(mHeight); }
-  Maybe<int32_t> GetFramerate() const { return GetMaybeNumber(mFramerate); }
+  Maybe<double> GetFramerate() const { return GetMaybeNumber(mFramerate); }
   Maybe<int32_t> GetBitrate() const { return GetMaybeNumber(mBitrate); }
+  Maybe<int32_t> GetChannels() const { return GetMaybeNumber(mChannels); }
+  Maybe<int32_t> GetSamplerate() const { return GetMaybeNumber(mSamplerate); }
 
   // Original string. Note that "type/subtype" may not be lowercase,
   // use Type().AsString() instead to get the normalized "type/subtype".
   const nsCString& OriginalString() const { return mOriginalString; }
 
   size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
 
+  // aFrac is either a floating-point number or a fraction made of two
+  // floating-point numbers.
+  static Maybe<double> ComputeFractionalString(const nsAString& aFrac);
+
 private:
   friend Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(const nsAString& aType);
+  friend Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(
+    const dom::VideoConfiguration& aConfig);
+  friend Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(
+    const dom::AudioConfiguration& aConfig);
+
   MediaExtendedMIMEType(const nsACString& aOriginalString,
                         const nsACString& aMIMEType,
                         bool aHaveCodecs, const nsAString& aCodecs,
                         int32_t aWidth, int32_t aHeight,
-                        int32_t aFramerate, int32_t aBitrate);
+                        double aFramerate, int32_t aBitrate);
+  MediaExtendedMIMEType(const nsACString& aOriginalString,
+                        const nsACString& aMIMEType,
+                        bool aHaveCodecs, const nsAString& aCodecs,
+                        int32_t aChannels, int32_t aSamplerate,
+                        int32_t aBitrate);
 
-  Maybe<int32_t> GetMaybeNumber(int32_t aNumber) const
+  template <typename T>
+  Maybe<T> GetMaybeNumber(T aNumber) const
   {
-    return (aNumber < 0) ? Maybe<int32_t>(Nothing()) : Some(int32_t(aNumber));
+    return (aNumber < 0) ? Maybe<T>(Nothing()) : Some(T(aNumber));
   }
 
   nsCString mOriginalString; // Original full string.
   MediaMIMEType mMIMEType; // MIME type/subtype.
   bool mHaveCodecs = false; // If false, mCodecs must be empty.
   MediaCodecs mCodecs;
+  // For video
   int32_t mWidth = -1; // -1 if not provided.
   int32_t mHeight = -1; // -1 if not provided.
-  int32_t mFramerate = -1; // -1 if not provided.
+  double mFramerate = -1; // -1 if not provided.
+  // For audio
+  int32_t mChannels = -1; // -1 if not provided.
+  int32_t mSamplerate = -1; // -1 if not provided.
+  // For both audio and video.
   int32_t mBitrate = -1; // -1 if not provided.
 };
 
 Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(const nsAString& aType);
 Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(const nsACString& aType);
 Maybe<MediaExtendedMIMEType> MakeMediaExtendedMIMEType(const char* aType);
+Maybe<MediaExtendedMIMEType>
+MakeMediaExtendedMIMEType(const dom::VideoConfiguration& aConfig);
+Maybe<MediaExtendedMIMEType>
+MakeMediaExtendedMIMEType(const dom::AudioConfiguration& aConfig);
 
 } // namespace mozilla
 
 #endif // MediaMIMETypes_h_
diff --git a/dom/media/MediaMIMETypes.cpp b/dom/media/MediaMIMETypes.cpp
--- a/dom/media/MediaMIMETypes.cpp
+++ b/dom/media/MediaMIMETypes.cpp
@@ -5,10 +5,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "MediaMIMETypes.h"
 
 #include "nsContentTypeParser.h"
+#include "mozilla/dom/MediaCapabilitiesBinding.h"
 
 namespace mozilla {
 
 template <int N>
 static bool
@@ -50,12 +51,10 @@
 }
 
 Maybe<MediaMIMEType>
 MakeMediaMIMEType(const nsAString& aType)
 {
-  MOZ_ASSERT(NS_IsMainThread());
-
   nsContentTypeParser parser(aType);
   nsAutoString mime;
   nsresult rv = parser.GetType(mime);
   if (!NS_SUCCEEDED(rv) || mime.IsEmpty()) {
     return Nothing();
@@ -146,12 +145,14 @@
 
 MediaExtendedMIMEType::MediaExtendedMIMEType(const nsACString& aOriginalString,
                                              const nsACString& aMIMEType,
                                              bool aHaveCodecs,
                                              const nsAString& aCodecs,
-                                             int32_t aWidth, int32_t aHeight,
-                                             int32_t aFramerate, int32_t aBitrate)
+                                             int32_t aWidth,
+                                             int32_t aHeight,
+                                             double aFramerate,
+                                             int32_t aBitrate)
   : mOriginalString(aOriginalString)
   , mMIMEType(aMIMEType)
   , mHaveCodecs(aHaveCodecs)
   , mCodecs(aCodecs)
   , mWidth(aWidth)
@@ -159,10 +160,27 @@
   , mFramerate(aFramerate)
   , mBitrate(aBitrate)
 {
 }
 
+MediaExtendedMIMEType::MediaExtendedMIMEType(const nsACString& aOriginalString,
+                                             const nsACString& aMIMEType,
+                                             bool aHaveCodecs,
+                                             const nsAString& aCodecs,
+                                             int32_t aChannels,
+                                             int32_t aSamplerate,
+                                             int32_t aBitrate)
+  : mOriginalString(aOriginalString)
+  , mMIMEType(aMIMEType)
+  , mHaveCodecs(aHaveCodecs)
+  , mCodecs(aCodecs)
+  , mChannels(aChannels)
+  , mSamplerate(aSamplerate)
+  , mBitrate(aBitrate)
+{
+}
+
 MediaExtendedMIMEType::MediaExtendedMIMEType(const MediaMIMEType& aType)
   : mOriginalString(aType.AsString())
   , mMIMEType(aType)
 {
 }
@@ -171,15 +189,50 @@
   : mOriginalString(aType.AsString())
   , mMIMEType(std::move(aType))
 {
 }
 
+/* static */ Maybe<double>
+MediaExtendedMIMEType::ComputeFractionalString(const nsAString& aFrac)
+{
+  nsAutoString frac(aFrac);
+  nsresult error;
+  double result = frac.ToDouble(&error);
+  if (NS_SUCCEEDED(error)) {
+    if (result <= 0) {
+      return Nothing();
+    }
+    return Some(result);
+  }
+
+  int32_t slashPos = frac.Find(NS_LITERAL_STRING("/"));
+  if (slashPos == kNotFound) {
+    return Nothing();
+  }
+
+  nsAutoString firstPart(Substring(frac, 0, slashPos - 1));
+  double first = firstPart.ToDouble(&error);
+  if (NS_FAILED(error)) {
+    return Nothing();
+  }
+  nsAutoString secondPart(Substring(frac, slashPos + 1));
+  double second = secondPart.ToDouble(&error);
+  if (NS_FAILED(error) || second == 0) {
+    return Nothing();
+  }
+
+  result = first / second;
+  if (result <= 0) {
+    return Nothing();
+  }
+
+  return Some(result);
+}
+
 Maybe<MediaExtendedMIMEType>
 MakeMediaExtendedMIMEType(const nsAString& aType)
 {
-  MOZ_ASSERT(NS_IsMainThread());
-
   nsContentTypeParser parser(aType);
   nsAutoString mime;
   nsresult rv = parser.GetType(mime);
   if (!NS_SUCCEEDED(rv) || mime.IsEmpty()) {
     return Nothing();
@@ -194,20 +247,113 @@
   rv = parser.GetParameter("codecs", codecs);
   bool haveCodecs = NS_SUCCEEDED(rv);
 
   int32_t width = GetParameterAsNumber(parser, "width", -1);
   int32_t height = GetParameterAsNumber(parser, "height", -1);
-  int32_t framerate = GetParameterAsNumber(parser, "framerate", -1);
+  double framerate = GetParameterAsNumber(parser, "framerate", -1);
   int32_t bitrate = GetParameterAsNumber(parser, "bitrate", -1);
 
   return Some(MediaExtendedMIMEType(NS_ConvertUTF16toUTF8(aType),
                                     mime8,
                                     haveCodecs, codecs,
                                     width, height,
                                     framerate, bitrate));
 }
 
+Maybe<MediaExtendedMIMEType>
+MakeMediaExtendedMIMEType(const dom::VideoConfiguration& aConfig)
+{
+  MOZ_ASSERT(aConfig.mContentType.WasPassed() &&
+             aConfig.mFramerate.WasPassed() &&
+             aConfig.mWidth.WasPassed() &&
+             aConfig.mHeight.WasPassed() &&
+             aConfig.mBitrate.WasPassed(),
+             "All dictionary members must be present");
+  if (aConfig.mContentType.Value().IsEmpty()) {
+    return Nothing();
+  }
+  nsContentTypeParser parser(aConfig.mContentType.Value());
+  nsAutoString mime;
+  nsresult rv = parser.GetType(mime);
+  if (!NS_SUCCEEDED(rv) || mime.IsEmpty()) {
+    return Nothing();
+  }
+
+  NS_ConvertUTF16toUTF8 mime8{ mime };
+  if (!IsMediaMIMEType(mime8)) {
+    return Nothing();
+  }
+
+  nsAutoString codecs;
+  rv = parser.GetParameter("codecs", codecs);
+  bool haveCodecs = NS_SUCCEEDED(rv);
+
+  auto framerate =
+    MediaExtendedMIMEType::ComputeFractionalString(aConfig.mFramerate.Value());
+  if (!framerate) {
+    return Nothing();
+  }
+
+  return Some(
+    MediaExtendedMIMEType(NS_ConvertUTF16toUTF8(aConfig.mContentType.Value()),
+                          mime8,
+                          haveCodecs,
+                          codecs,
+                          aConfig.mWidth.Value(),
+                          aConfig.mHeight.Value(),
+                          framerate.ref(),
+                          aConfig.mBitrate.Value()));
+}
+
+Maybe<MediaExtendedMIMEType>
+MakeMediaExtendedMIMEType(const dom::AudioConfiguration& aConfig)
+{
+  if (!aConfig.mContentType.WasPassed() ||
+      aConfig.mContentType.Value().IsEmpty()) {
+    return Nothing();
+  }
+  nsContentTypeParser parser(aConfig.mContentType.Value());
+  nsAutoString mime;
+  nsresult rv = parser.GetType(mime);
+  if (!NS_SUCCEEDED(rv) || mime.IsEmpty()) {
+    return Nothing();
+  }
+
+  NS_ConvertUTF16toUTF8 mime8{ mime };
+  if (!IsMediaMIMEType(mime8)) {
+    return Nothing();
+  }
+
+  nsAutoString codecs;
+  rv = parser.GetParameter("codecs", codecs);
+  bool haveCodecs = NS_SUCCEEDED(rv);
+
+  int32_t channels = 2; // use a stereo config if not known.
+  if (aConfig.mChannels.WasPassed()) {
+    // A channels string was passed. Make sure it is valid.
+    nsresult error;
+    double value = aConfig.mChannels.Value().ToDouble(&error);
+    if (NS_FAILED(error)) {
+      return Nothing();
+    }
+    // Value is a channel configuration such as 5.1. We want to treat this as 6.
+    channels = value;
+    double fp = value - channels;
+     // round up as .1 and .2 aren't exactly expressible in binary.
+    channels += (fp * 10) + .5;
+  }
+
+  return Some(MediaExtendedMIMEType(
+    NS_ConvertUTF16toUTF8(aConfig.mContentType.Value()),
+    mime8,
+    haveCodecs,
+    codecs,
+    channels,
+    aConfig.mSamplerate.WasPassed() ? aConfig.mSamplerate.Value() : 48000,
+    aConfig.mBitrate.WasPassed() ? aConfig.mBitrate.Value() : 131072));
+}
+
 size_t
 MediaExtendedMIMEType::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {
   return mOriginalString.SizeOfExcludingThisIfUnshared(aMallocSizeOf)
          + mMIMEType.SizeOfExcludingThis(aMallocSizeOf)
diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp
--- a/dom/media/MediaRecorder.cpp
+++ b/dom/media/MediaRecorder.cpp
@@ -1528,10 +1528,14 @@
   "vp8",
   "vp8.0",
   // no VP9 yet
   nullptr,
 };
+static char const *const gWebMAudioEncoderCodecs[4] = {
+  "opus",
+  nullptr,
+};
 static char const *const gOggAudioEncoderCodecs[2] = {
   "opus",
   // we could support vorbis here too, but don't
   nullptr,
 };
@@ -1576,13 +1580,18 @@
     if (MediaDecoder::IsOggEnabled() && MediaDecoder::IsOpusEnabled()) {
       codeclist = gOggAudioEncoderCodecs;
     }
   }
 #ifdef MOZ_WEBM_ENCODER
-  else if (mimeType.EqualsLiteral(VIDEO_WEBM) &&
+  else if ((mimeType.EqualsLiteral(VIDEO_WEBM) ||
+            mimeType.EqualsLiteral(AUDIO_WEBM)) &&
            MediaEncoder::IsWebMEncoderEnabled()) {
-    codeclist = gWebMVideoEncoderCodecs;
+    if (mimeType.EqualsLiteral(AUDIO_WEBM)) {
+      codeclist = gWebMAudioEncoderCodecs;
+    } else {
+      codeclist = gWebMVideoEncoderCodecs;
+    }
   }
 #endif
 
   // codecs don't matter if we don't support the container
   if (!codeclist) {
diff --git a/dom/media/VideoUtils.h b/dom/media/VideoUtils.h
--- a/dom/media/VideoUtils.h
+++ b/dom/media/VideoUtils.h
@@ -236,12 +236,13 @@
 // See http://blog.pearce.org.nz/2013/11/what-does-h264avc1-codecs-parameters.html
 // for more details.
 // Returns false on failure.
 bool
 ExtractH264CodecDetails(const nsAString& aCodecs,
-                        int16_t& aProfile,
-                        int16_t& aLevel);
+                        uint8_t& aProfile,
+                        uint8_t& aConstraint,
+                        uint8_t& aLevel);
 
 struct VideoColorSpace
 {
   // TODO: Define the value type as strong type enum
   // to better know the exact meaning corresponding to ISO/IEC 23001-8:2016.
diff --git a/dom/media/VideoUtils.cpp b/dom/media/VideoUtils.cpp
--- a/dom/media/VideoUtils.cpp
+++ b/dom/media/VideoUtils.cpp
@@ -415,15 +415,16 @@
   return rangeId <= 1;
 }
 
 bool
 ExtractH264CodecDetails(const nsAString& aCodec,
-                        int16_t& aProfile,
-                        int16_t& aLevel)
+                        uint8_t& aProfile,
+                        uint8_t& aConstraint,
+                        uint8_t& aLevel)
 {
   // H.264 codecs parameters have a type defined as avcN.PPCCLL, where
-  // N = avc type. avc3 is avcc with SPS & PPS implicit (within stream)
+  // N = avc type. avc3 is avcc with SPS & PPS implicit (within stream)
   // PP = profile_idc, CC = constraint_set flags, LL = level_idc.
   // We ignore the constraint_set flags, as it's not clear from any
   // documentation what constraints the platform decoders support.
   // See http://blog.pearce.org.nz/2013/11/what-does-h264avc1-codecs-parameters.html
   // for more details.
@@ -435,32 +436,33 @@
   const nsAString& sample = Substring(aCodec, 0, 5);
   if (!sample.EqualsASCII("avc1.") && !sample.EqualsASCII("avc3.")) {
     return false;
   }
 
-  // Extract the profile_idc and level_idc.
+  // Extract the profile_idc, constraint_flags and level_idc.
   nsresult rv = NS_OK;
   aProfile = PromiseFlatString(Substring(aCodec, 5, 2)).ToInteger(&rv, 16);
   NS_ENSURE_SUCCESS(rv, false);
 
+  // Constraint flags are stored on the 6 most significant bits, first two bits
+  // are reserved_zero_2bits.
+  aConstraint = PromiseFlatString(Substring(aCodec, 7, 2)).ToInteger(&rv, 16);
+  NS_ENSURE_SUCCESS(rv, false);
+
   aLevel = PromiseFlatString(Substring(aCodec, 9, 2)).ToInteger(&rv, 16);
   NS_ENSURE_SUCCESS(rv, false);
 
   if (aLevel == 9) {
     aLevel = H264_LEVEL_1_b;
   } else if (aLevel <= 5) {
     aLevel *= 10;
   }
 
-  // Capture the constraint_set flag value for the purpose of Telemetry.
-  // We don't NS_ENSURE_SUCCESS here because ExtractH264CodecDetails doesn't
-  // care about this, but we make sure constraints is above 4 (constraint_set5_flag)
+  // We only make sure constraints is above 4 for collection perspective
   // otherwise collect 0 for unknown.
-  uint8_t constraints = PromiseFlatString(Substring(aCodec, 7, 2)).ToInteger(&rv, 16);
   Telemetry::Accumulate(Telemetry::VIDEO_CANPLAYTYPE_H264_CONSTRAINT_SET_FLAG,
-                        constraints >= 4 ? constraints : 0);
-
+                        aConstraint >= 4 ? aConstraint : 0);
   // 244 is the highest meaningful profile value (High 4:4:4 Intra Profile)
   // that can be represented as single hex byte, otherwise collect 0 for unknown.
   Telemetry::Accumulate(Telemetry::VIDEO_CANPLAYTYPE_H264_PROFILE,
                         aProfile <= 244 ? aProfile : 0);
 
@@ -657,13 +659,14 @@
 }
 
 bool
 IsH264CodecString(const nsAString& aCodec)
 {
-  int16_t profile = 0;
-  int16_t level = 0;
-  return ExtractH264CodecDetails(aCodec, profile, level);
+  uint8_t profile = 0;
+  uint8_t constraint = 0;
+  uint8_t level = 0;
+  return ExtractH264CodecDetails(aCodec, profile, constraint, level);
 }
 
 bool
 IsAACCodecString(const nsAString& aCodec)
 {
@@ -729,10 +732,22 @@
       }
       Maybe<int32_t> maybeHeight = aContainerType.ExtendedType().GetHeight();
       if (maybeHeight && *maybeHeight > 0) {
         videoInfo->mImage.height = *maybeHeight;
       }
+    } else if (trackInfo->GetAsAudioInfo()) {
+      AudioInfo* audioInfo = trackInfo->GetAsAudioInfo();
+      Maybe<int32_t> maybeChannels =
+        aContainerType.ExtendedType().GetChannels();
+      if (maybeChannels && *maybeChannels > 0) {
+        audioInfo->mChannels = *maybeChannels;
+      }
+      Maybe<int32_t> maybeSamplerate =
+        aContainerType.ExtendedType().GetSamplerate();
+      if (maybeSamplerate && *maybeSamplerate > 0) {
+        audioInfo->mRate = *maybeSamplerate;
+      }
     }
   }
   return trackInfo;
 }
 
diff --git a/dom/media/flac/FlacDecoder.h b/dom/media/flac/FlacDecoder.h
--- a/dom/media/flac/FlacDecoder.h
+++ b/dom/media/flac/FlacDecoder.h
@@ -5,21 +5,27 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef FLAC_DECODER_H_
 #define FLAC_DECODER_H_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class FlacDecoder
 {
 public:
   // Returns true if the Flac backend is pref'ed on, and we're running on a
   // platform that is likely to have decoders for the format.
   static bool IsEnabled();
   static bool IsSupportedType(const MediaContainerType& aContainerType);
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif // !FLAC_DECODER_H_
diff --git a/dom/media/flac/FlacDecoder.cpp b/dom/media/flac/FlacDecoder.cpp
--- a/dom/media/flac/FlacDecoder.cpp
+++ b/dom/media/flac/FlacDecoder.cpp
@@ -28,6 +28,21 @@
          (aContainerType.Type() == MEDIAMIMETYPE("audio/flac") ||
           aContainerType.Type() == MEDIAMIMETYPE("audio/x-flac") ||
           aContainerType.Type() == MEDIAMIMETYPE("application/x-flac"));
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+FlacDecoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (!IsSupportedType(aType)) {
+    return tracks;
+  }
+
+  tracks.AppendElement(
+    CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+      NS_LITERAL_CSTRING("audio/flac"), aType));
+
+  return tracks;
+}
+
 } // namespace mozilla
diff --git a/dom/media/gmp/ChromiumCDMAdapter.cpp b/dom/media/gmp/ChromiumCDMAdapter.cpp
--- a/dom/media/gmp/ChromiumCDMAdapter.cpp
+++ b/dom/media/gmp/ChromiumCDMAdapter.cpp
@@ -195,11 +195,12 @@
 
 typedef DWORD(WINAPI* QueryDosDeviceWFnPtr)(_In_opt_ LPCWSTR lpDeviceName,
                                             _Out_ LPWSTR lpTargetPath,
                                             _In_ DWORD ucchMax);
 
-static QueryDosDeviceWFnPtr sOriginalQueryDosDeviceWFnPtr = nullptr;
+static WindowsDllInterceptor::FuncHookType<QueryDosDeviceWFnPtr>
+  sOriginalQueryDosDeviceWFnPtr;
 
 static std::unordered_map<std::wstring, std::wstring>* sDeviceNames = nullptr;
 
 DWORD WINAPI
 QueryDosDeviceWHook(LPCWSTR lpDeviceName, LPWSTR lpTargetPath, DWORD ucchMax)
@@ -274,13 +275,12 @@
   for (const std::wstring& name : GetDosDeviceNames()) {
     sDeviceNames->emplace(name, GetDeviceMapping(name));
   }
 
   sKernel32Intercept.Init("kernelbase.dll");
-  sKernel32Intercept.AddHook("QueryDosDeviceW",
-                             reinterpret_cast<intptr_t>(QueryDosDeviceWHook),
-                             (void**)(&sOriginalQueryDosDeviceWFnPtr));
+  sOriginalQueryDosDeviceWFnPtr.Set(sKernel32Intercept, "QueryDosDeviceW",
+                                    &QueryDosDeviceWHook);
 }
 #endif
 
 HostFile::HostFile(HostFile&& aOther)
   : mPath(aOther.mPath)
diff --git a/dom/media/gtest/TestBitWriter.cpp b/dom/media/gtest/TestBitWriter.cpp
new file mode 100644
--- /dev/null
+++ b/dom/media/gtest/TestBitWriter.cpp
@@ -0,0 +1,72 @@
+/* -*- 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 "gtest/gtest.h"
+#include "BitReader.h"
+#include "BitWriter.h"
+#include "H264.h"
+
+using namespace mozilla;
+
+TEST(BitWriter, BitWriter)
+{
+  RefPtr<MediaByteBuffer> test = new MediaByteBuffer();
+  BitWriter b(test);
+  b.WriteBit(false);
+  b.WriteBits(~1ULL, 1); // ensure that extra bits don't modify byte buffer.
+  b.WriteBits(3, 1);
+  b.WriteUE(1280 / 16 - 1);
+  b.WriteUE(720 / 16 - 1);
+  b.WriteUE(1280);
+  b.WriteUE(720);
+  b.WriteBit(true);
+  b.WriteBit(false);
+  b.WriteBit(true);
+  b.WriteU8(7);
+  b.WriteU32(16356);
+  b.WriteU64(116356);
+  b.WriteBits(~(0ULL) & ~1ULL, 16);
+  const uint32_t length = b.BitCount();
+  b.CloseWithRbspTrailing();
+
+  BitReader c(test);
+
+  EXPECT_EQ(c.ReadBit(), false);
+  EXPECT_EQ(c.ReadBit(), false);
+  EXPECT_EQ(c.ReadBit(), true);
+  EXPECT_EQ(c.ReadUE(), 1280u / 16 - 1);
+  EXPECT_EQ(c.ReadUE(), 720u / 16 - 1);
+  EXPECT_EQ(c.ReadUE(), 1280u);
+  EXPECT_EQ(c.ReadUE(), 720u);
+  EXPECT_EQ(c.ReadBit(), true);
+  EXPECT_EQ(c.ReadBit(), false);
+  EXPECT_EQ(c.ReadBit(), true);
+  EXPECT_EQ(c.ReadBits(8), 7u);
+  EXPECT_EQ(c.ReadU32(), 16356u);
+  EXPECT_EQ(c.ReadU64(), 116356u);
+  EXPECT_EQ(c.ReadBits(16), 0xfffeu);
+  EXPECT_EQ(length, BitReader::GetBitLength(test));
+}
+
+TEST(BitWriter, SPS)
+{
+  uint8_t sps_pps[] = { 0x01, 0x4d, 0x40, 0x0c, 0xff, 0xe1, 0x00, 0x1b, 0x67,
+                        0x4d, 0x40, 0x0c, 0xe8, 0x80, 0x80, 0x9d, 0x80, 0xb5,
+                        0x01, 0x01, 0x01, 0x40, 0x00, 0x00, 0x03, 0x00, 0x40,
+                        0x00, 0x00, 0x0f, 0x03, 0xc5, 0x0a, 0x44, 0x80, 0x01,
+                        0x00, 0x04, 0x68, 0xeb, 0xef, 0x20 };
+
+  RefPtr<MediaByteBuffer> extraData = new MediaByteBuffer();
+  extraData->AppendElements(sps_pps, sizeof(sps_pps));
+  SPSData spsdata1;
+  bool success = H264::DecodeSPSFromExtraData(extraData, spsdata1);
+  EXPECT_EQ(success, true);
+
+  RefPtr<MediaByteBuffer> extraData2 =
+    H264::CreateExtraData(0x42, 0xc0, 0x1e, { 1280, 720 });
+  SPSData spsdata2;
+  success = H264::DecodeSPSFromExtraData(extraData2, spsdata2);
+  EXPECT_EQ(success, true);
+}
diff --git a/dom/media/gtest/TestMP4Demuxer.cpp b/dom/media/gtest/TestMP4Demuxer.cpp
--- a/dom/media/gtest/TestMP4Demuxer.cpp
+++ b/dom/media/gtest/TestMP4Demuxer.cpp
@@ -15,12 +15,10 @@
 #include "VideoUtils.h"
 
 using namespace mozilla;
 using media::TimeUnit;
 
-class AutoTaskQueue;
-
 #define DO_FAIL [binding]()->void { EXPECT_TRUE(false); binding->mTaskQueue->BeginShutdown(); }
 
 class MP4DemuxerBinding
 {
 public:
diff --git a/dom/media/gtest/moz.build b/dom/media/gtest/moz.build
--- a/dom/media/gtest/moz.build
+++ b/dom/media/gtest/moz.build
@@ -10,10 +10,11 @@
     'TestAudioCompactor.cpp',
     'TestAudioMixer.cpp',
     'TestAudioPacketizer.cpp',
     'TestAudioSegment.cpp',
     'TestAudioTrackEncoder.cpp',
+    'TestBitWriter.cpp',
     'TestBlankVideoDataCreator.cpp',
     'TestCDMStorage.cpp',
     'TestDataMutex.cpp',
     'TestGMPCrossOrigin.cpp',
     'TestGMPRemoveAndDelete.cpp',
diff --git a/dom/media/hls/HLSDemuxer.h b/dom/media/hls/HLSDemuxer.h
--- a/dom/media/hls/HLSDemuxer.h
+++ b/dom/media/hls/HLSDemuxer.h
@@ -5,19 +5,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if !defined(HLSDemuxer_h_)
 #define HLSDemuxer_h_
 
-#include "AutoTaskQueue.h"
 #include "GeneratedJNINatives.h"
 #include "GeneratedJNIWrappers.h"
 #include "MediaCodec.h"
 #include "MediaDataDemuxer.h"
 #include "MediaDecoder.h"
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/TaskQueue.h"
 
 #include "VideoUtils.h"
 
 namespace mozilla {
 
@@ -49,22 +49,22 @@
 
   bool ShouldComputeStartTime() const override { return true; }
 
   void NotifyDataArrived() override;
 
-  AutoTaskQueue* GetTaskQueue() const { return mTaskQueue; }
+  TaskQueue* GetTaskQueue() const { return mTaskQueue; }
   void OnInitialized(bool aHasAudio, bool aHasVideo);
   void OnError(int aErrorCode);
 
 private:
   media::TimeUnit GetNextKeyFrameTime();
 
   bool OnTaskQueue() const;
   ~HLSDemuxer();
   friend class HLSTrackDemuxer;
 
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   RefPtr<HLSTrackDemuxer> mAudioDemuxer;
   RefPtr<HLSTrackDemuxer> mVideoDemuxer;
 
   MozPromiseHolder<InitPromise> mInitPromise;
   RefPtr<HLSDemuxerCallbacksSupport> mCallbackSupport;
diff --git a/dom/media/hls/HLSDemuxer.cpp b/dom/media/hls/HLSDemuxer.cpp
--- a/dom/media/hls/HLSDemuxer.cpp
+++ b/dom/media/hls/HLSDemuxer.cpp
@@ -130,12 +130,12 @@
   HLSDemuxer* mDemuxer;
 
 };
 
 HLSDemuxer::HLSDemuxer(int aPlayerId)
-  : mTaskQueue(new AutoTaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
-                                 /* aSupportsTailDispatch = */ false))
+  : mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
+                             /* aSupportsTailDispatch = */ false))
 {
   MOZ_ASSERT(NS_IsMainThread());
   HLSDemuxerCallbacksSupport::Init();
   mJavaCallbacks = GeckoHLSDemuxerWrapper::Callbacks::New();
   MOZ_ASSERT(mJavaCallbacks);
diff --git a/dom/media/mediacapabilities/MediaCapabilities.h b/dom/media/mediacapabilities/MediaCapabilities.h
new file mode 100644
--- /dev/null
+++ b/dom/media/mediacapabilities/MediaCapabilities.h
@@ -0,0 +1,109 @@
+/* -*- 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_MediaCapabilities_h_
+#define mozilla_dom_MediaCapabilities_h_
+
+#include "DecoderDoctorLogger.h"
+#include "MediaContainerType.h"
+#include "js/TypeDecls.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/UniquePtr.h"
+#include "mozilla/dom/BindingUtils.h"
+#include "nsCOMPtr.h"
+#include "nsCycleCollectionNoteChild.h"
+#include "nsCycleCollectionParticipant.h"
+#include "nsIGlobalObject.h"
+#include "nsISupports.h"
+#include "nsWrapperCache.h"
+
+namespace mozilla {
+namespace layers {
+class KnowsCompositor;
+}
+namespace dom {
+class MediaCapabilities;
+} // namespace dom
+DDLoggedTypeName(dom::MediaCapabilities);
+
+namespace dom {
+
+struct MediaDecodingConfiguration;
+struct MediaEncodingConfiguration;
+struct AudioConfiguration;
+struct VideoConfiguration;
+class Promise;
+
+class MediaCapabilities final
+  : public nsISupports
+  , public nsWrapperCache
+{
+public:
+  // Ref counting and cycle collection
+  NS_DECL_CYCLE_COLLECTING_ISUPPORTS
+  NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaCapabilities)
+
+  // WebIDL Methods
+  already_AddRefed<Promise> DecodingInfo(
+    const MediaDecodingConfiguration& aConfiguration,
+    ErrorResult& aRv);
+  already_AddRefed<Promise> EncodingInfo(
+    const MediaEncodingConfiguration& aConfiguration,
+    ErrorResult& aRv);
+  // End WebIDL Methods
+
+  explicit MediaCapabilities(nsIGlobalObject* aParent);
+
+  nsIGlobalObject* GetParentObject() const { return mParent; }
+  JSObject* WrapObject(JSContext* aCx,
+                       JS::Handle<JSObject*> aGivenProto) override;
+
+  static bool Enabled(JSContext* aCx, JSObject* aGlobal);
+
+private:
+  virtual ~MediaCapabilities() = default;
+  Maybe<MediaContainerType> CheckVideoConfiguration(
+    const VideoConfiguration& aConfig) const;
+  Maybe<MediaContainerType> CheckAudioConfiguration(
+    const AudioConfiguration& aConfig) const;
+  bool CheckTypeForMediaSource(const nsAString& aType);
+  bool CheckTypeForFile(const nsAString& aType);
+  bool CheckTypeForEncoder(const nsAString& aType);
+  already_AddRefed<layers::KnowsCompositor> GetCompositor();
+  nsCOMPtr<nsIGlobalObject> mParent;
+};
+
+class MediaCapabilitiesInfo final : public NonRefcountedDOMObject
+{
+public:
+  // WebIDL methods
+  bool Supported() const { return mSupported; }
+  bool Smooth() const { return mSmooth; }
+  bool PowerEfficient() const { return mPowerEfficient; }
+  // End WebIDL methods
+
+  MediaCapabilitiesInfo(bool aSupported, bool aSmooth, bool aPowerEfficient)
+    : mSupported(aSupported)
+    , mSmooth(aSmooth)
+    , mPowerEfficient(aPowerEfficient)
+  {
+  }
+
+  bool WrapObject(JSContext* aCx,
+                  JS::Handle<JSObject*> aGivenProto,
+                  JS::MutableHandle<JSObject*> aReflector);
+
+private:
+  bool mSupported;
+  bool mSmooth;
+  bool mPowerEfficient;
+};
+
+} // namespace dom
+
+} // namespace mozilla
+
+#endif /* mozilla_dom_MediaCapabilities_h_ */
diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp
new file mode 100644
--- /dev/null
+++ b/dom/media/mediacapabilities/MediaCapabilities.cpp
@@ -0,0 +1,668 @@
+/* -*- 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 "MediaCapabilities.h"
+#include "Benchmark.h"
+#include "DecoderTraits.h"
+#include "Layers.h"
+#include "MediaInfo.h"
+#include "MediaRecorder.h"
+#include "PDMFactory.h"
+#include "VPXDecoder.h"
+#include "mozilla/Move.h"
+#include "mozilla/StaticPrefs.h"
+#include "mozilla/TaskQueue.h"
+#include "mozilla/dom/DOMMozPromiseRequestHolder.h"
+#include "mozilla/dom/MediaCapabilitiesBinding.h"
+#include "mozilla/dom/MediaSource.h"
+#include "mozilla/dom/Promise.h"
+#include "mozilla/dom/WorkerPrivate.h"
+#include "mozilla/dom/WorkerRef.h"
+#include "mozilla/layers/KnowsCompositor.h"
+#include "nsContentUtils.h"
+
+#include <inttypes.h>
+
+static mozilla::LazyLogModule sMediaCapabilitiesLog("MediaCapabilities");
+
+#define LOG(msg, ...)                                                          \
+  DDMOZ_LOG(sMediaCapabilitiesLog, LogLevel::Debug, msg, ##__VA_ARGS__)
+
+namespace mozilla {
+namespace dom {
+
+static nsCString
+VideoConfigurationToStr(const VideoConfiguration* aConfig)
+{
+  if (!aConfig) {
+    return nsCString();
+  }
+  auto str = nsPrintfCString(
+    "[contentType:%s width:%d height:%d bitrate:%" PRIu64 " framerate:%s]",
+    NS_ConvertUTF16toUTF8(aConfig->mContentType.Value()).get(),
+    aConfig->mWidth.Value(),
+    aConfig->mHeight.Value(),
+    aConfig->mBitrate.Value(),
+    NS_ConvertUTF16toUTF8(aConfig->mFramerate.Value()).get());
+  return std::move(str);
+}
+
+static nsCString
+AudioConfigurationToStr(const AudioConfiguration* aConfig)
+{
+  if (!aConfig) {
+    return nsCString();
+  }
+  auto str = nsPrintfCString(
+    "[contentType:%s channels:%s bitrate:%" PRIu64 " samplerate:%d]",
+    NS_ConvertUTF16toUTF8(aConfig->mContentType.Value()).get(),
+    aConfig->mChannels.WasPassed()
+      ? NS_ConvertUTF16toUTF8(aConfig->mChannels.Value()).get()
+      : "?",
+    aConfig->mBitrate.WasPassed() ? aConfig->mBitrate.Value() : 0,
+    aConfig->mSamplerate.WasPassed() ? aConfig->mSamplerate.Value() : 0);
+  return std::move(str);
+}
+
+static nsCString
+MediaCapabilitiesInfoToStr(const MediaCapabilitiesInfo* aInfo)
+{
+  if (!aInfo) {
+    return nsCString();
+  }
+  auto str = nsPrintfCString("[supported:%s smooth:%s powerEfficient:%s]",
+                             aInfo->Supported() ? "true" : "false",
+                             aInfo->Smooth() ? "true" : "false",
+                             aInfo->PowerEfficient() ? "true" : "false");
+  return std::move(str);
+}
+
+static nsCString
+MediaDecodingConfigurationToStr(const MediaDecodingConfiguration& aConfig)
+{
+  nsCString str;
+  str += NS_LITERAL_CSTRING("[");
+  if (aConfig.mVideo.IsAnyMemberPresent()) {
+    str +=
+      NS_LITERAL_CSTRING("video:") + VideoConfigurationToStr(&aConfig.mVideo);
+    if (aConfig.mAudio.IsAnyMemberPresent()) {
+      str += NS_LITERAL_CSTRING(" ");
+    }
+  }
+  if (aConfig.mAudio.IsAnyMemberPresent()) {
+    str +=
+      NS_LITERAL_CSTRING("audio:") + AudioConfigurationToStr(&aConfig.mAudio);
+  }
+  str += NS_LITERAL_CSTRING("]");
+  return str;
+}
+
+MediaCapabilities::MediaCapabilities(nsIGlobalObject* aParent)
+  : mParent(aParent)
+{
+}
+
+static void
+ThrowWithMemberName(ErrorResult& aRv,
+                    const char* aCategory,
+                    const char* aMember)
+{
+  auto str = nsPrintfCString("'%s' member of %s", aMember, aCategory);
+  aRv.ThrowTypeError<MSG_MISSING_REQUIRED_DICTIONARY_MEMBER>(
+    NS_ConvertUTF8toUTF16(str));
+}
+
+static void
+CheckVideoConfigurationSanity(const VideoConfiguration& aConfig,
+                              const char* aCategory,
+                              ErrorResult& aRv)
+{
+  if (!aConfig.mContentType.WasPassed()) {
+    ThrowWithMemberName(aRv, "contentType", aCategory);
+    return;
+  }
+  if (!aConfig.mWidth.WasPassed()) {
+    ThrowWithMemberName(aRv, "width", aCategory);
+    return;
+  }
+  if (!aConfig.mHeight.WasPassed()) {
+    ThrowWithMemberName(aRv, "height", aCategory);
+    return;
+  }
+  if (!aConfig.mBitrate.WasPassed()) {
+    ThrowWithMemberName(aRv, "bitrate", aCategory);
+    return;
+  }
+  if (!aConfig.mFramerate.WasPassed()) {
+    ThrowWithMemberName(aRv, "framerate", aCategory);
+    return;
+  }
+}
+
+static void
+CheckAudioConfigurationSanity(const AudioConfiguration& aConfig,
+                              const char* aCategory,
+                              ErrorResult& aRv)
+{
+  if (!aConfig.mContentType.WasPassed()) {
+    ThrowWithMemberName(aRv, "contentType", aCategory);
+    return;
+  }
+}
+
+already_AddRefed<Promise>
+MediaCapabilities::DecodingInfo(
+  const MediaDecodingConfiguration& aConfiguration,
+  ErrorResult& aRv)
+{
+  RefPtr<Promise> promise = Promise::Create(mParent, aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  // If configuration is not a valid MediaConfiguration, return a Promise
+  // rejected with a TypeError.
+  if (!aConfiguration.IsAnyMemberPresent() ||
+      (!aConfiguration.mVideo.IsAnyMemberPresent() &&
+       !aConfiguration.mAudio.IsAnyMemberPresent())) {
+    aRv.ThrowTypeError<MSG_MISSING_REQUIRED_DICTIONARY_MEMBER>(
+      NS_LITERAL_STRING("'audio' or 'video'"));
+    return nullptr;
+  }
+
+  // Here we will throw rather than rejecting a promise in order to simulate
+  // optional dictionaries with required members (see bug 1368949)
+  if (aConfiguration.mVideo.IsAnyMemberPresent()) {
+    // Check that all VideoConfiguration required members are present.
+    CheckVideoConfigurationSanity(
+      aConfiguration.mVideo, "MediaDecodingConfiguration", aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+  }
+  if (aConfiguration.mAudio.IsAnyMemberPresent()) {
+    // Check that all AudioConfiguration required members are present.
+    CheckAudioConfigurationSanity(
+      aConfiguration.mAudio, "MediaDecodingConfiguration", aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+  }
+
+  LOG("Processing %s", MediaDecodingConfigurationToStr(aConfiguration).get());
+
+  bool supported = true;
+  Maybe<MediaContainerType> videoContainer;
+  Maybe<MediaContainerType> audioContainer;
+
+  // If configuration.video is present and is not a valid video configuration,
+  // return a Promise rejected with a TypeError.
+  if (aConfiguration.mVideo.IsAnyMemberPresent()) {
+    videoContainer = CheckVideoConfiguration(aConfiguration.mVideo);
+    if (!videoContainer) {
+      aRv.ThrowTypeError<MSG_INVALID_MEDIA_VIDEO_CONFIGURATION>();
+      return nullptr;
+    }
+
+    // We have a video configuration and it is valid. Check if it is supported.
+    supported &=
+      aConfiguration.mType == MediaDecodingType::File
+        ? CheckTypeForFile(aConfiguration.mVideo.mContentType.Value())
+        : CheckTypeForMediaSource(aConfiguration.mVideo.mContentType.Value());
+  }
+  if (aConfiguration.mAudio.IsAnyMemberPresent()) {
+    audioContainer = CheckAudioConfiguration(aConfiguration.mAudio);
+    if (!audioContainer) {
+      aRv.ThrowTypeError<MSG_INVALID_MEDIA_AUDIO_CONFIGURATION>();
+      return nullptr;
+    }
+    // We have an audio configuration and it is valid. Check if it is supported.
+    supported &=
+      aConfiguration.mType == MediaDecodingType::File
+        ? CheckTypeForFile(aConfiguration.mAudio.mContentType.Value())
+        : CheckTypeForMediaSource(aConfiguration.mAudio.mContentType.Value());
+  }
+
+  if (!supported) {
+    auto info = MakeUnique<MediaCapabilitiesInfo>(
+      false /* supported */, false /* smooth */, false /* power efficient */);
+    LOG("%s -> %s",
+        MediaDecodingConfigurationToStr(aConfiguration).get(),
+        MediaCapabilitiesInfoToStr(info.get()).get());
+    promise->MaybeResolve(std::move(info));
+    return promise.forget();
+  }
+
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (aConfiguration.mVideo.IsAnyMemberPresent()) {
+    MOZ_ASSERT(videoContainer.isSome(), "configuration is valid and supported");
+    auto videoTracks = DecoderTraits::GetTracksInfo(*videoContainer);
+    // If the MIME type does not imply a codec, the string MUST
+    // also have one and only one parameter that is named codecs with a value
+    // describing a single media codec. Otherwise, it MUST contain no
+    // parameters.
+    if (videoTracks.Length() != 1) {
+      promise->MaybeReject(NS_ERROR_DOM_TYPE_ERR);
+      return promise.forget();
+    }
+    MOZ_DIAGNOSTIC_ASSERT(videoTracks.ElementAt(0),
+                          "must contain a valid trackinfo");
+    tracks.AppendElements(std::move(videoTracks));
+  }
+  if (aConfiguration.mAudio.IsAnyMemberPresent()) {
+    MOZ_ASSERT(audioContainer.isSome(), "configuration is valid and supported");
+    auto audioTracks = DecoderTraits::GetTracksInfo(*audioContainer);
+    // If the MIME type does not imply a codec, the string MUST
+    // also have one and only one parameter that is named codecs with a value
+    // describing a single media codec. Otherwise, it MUST contain no
+    // parameters.
+    if (audioTracks.Length() != 1) {
+      promise->MaybeReject(NS_ERROR_DOM_TYPE_ERR);
+      return promise.forget();
+    }
+    MOZ_DIAGNOSTIC_ASSERT(audioTracks.ElementAt(0),
+                          "must contain a valid trackinfo");
+    tracks.AppendElements(std::move(audioTracks));
+  }
+
+  typedef MozPromise<MediaCapabilitiesInfo,
+                     MediaResult,
+                     /* IsExclusive = */ true>
+    CapabilitiesPromise;
+  nsTArray<RefPtr<CapabilitiesPromise>> promises;
+
+  RefPtr<TaskQueue> taskQueue =
+    new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
+                  "MediaCapabilities::TaskQueue");
+  for (auto&& config : tracks) {
+    TrackInfo::TrackType type =
+      config->IsVideo() ? TrackInfo::kVideoTrack : TrackInfo::kAudioTrack;
+
+    MOZ_ASSERT(type == TrackInfo::kAudioTrack ||
+                 videoContainer->ExtendedType().GetFramerate().isSome(),
+               "framerate is a required member of VideoConfiguration");
+
+    if (type == TrackInfo::kAudioTrack) {
+      // There's no need to create an audio decoder has we only want to know if
+      // such codec is supported
+      RefPtr<PDMFactory> pdm = new PDMFactory();
+      if (!pdm->Supports(*config, nullptr /* decoder doctor */)) {
+        auto info =
+          MakeUnique<MediaCapabilitiesInfo>(false /* supported */,
+                                            false /* smooth */,
+                                            false /* power efficient */);
+        LOG("%s -> %s",
+            MediaDecodingConfigurationToStr(aConfiguration).get(),
+            MediaCapabilitiesInfoToStr(info.get()).get());
+        promise->MaybeResolve(std::move(info));
+        return promise.forget();
+      }
+      // We can assume that if we could create the decoder, then we can play it.
+      // We report that we can play it smoothly and in an efficient fashion.
+      promises.AppendElement(CapabilitiesPromise::CreateAndResolve(
+        MediaCapabilitiesInfo(
+          true /* supported */, true /* smooth */, true /* power efficient */),
+        __func__));
+      continue;
+    }
+
+    // On Windows, the MediaDataDecoder expects to be created on a thread
+    // supporting MTA, which the main thread doesn't. So we use our task queue
+    // to create such decoder and perform initialization.
+
+    RefPtr<layers::KnowsCompositor> compositor = GetCompositor();
+    double frameRate = videoContainer->ExtendedType().GetFramerate().ref();
+    promises.AppendElement(InvokeAsync(
+      taskQueue,
+      __func__,
+      [taskQueue, frameRate, compositor, config = std::move(config)]() mutable
+      -> RefPtr<CapabilitiesPromise> {
+        // MediaDataDecoder keeps a reference to the config object, so we must
+        // keep it alive until the decoder has been shutdown.
+        CreateDecoderParams params{ *config,
+                                    taskQueue,
+                                    compositor,
+                                    CreateDecoderParams::VideoFrameRate(
+                                      frameRate),
+                                    TrackInfo::kVideoTrack };
+
+        RefPtr<PDMFactory> pdm = new PDMFactory();
+        RefPtr<MediaDataDecoder> decoder = pdm->CreateDecoder(params);
+        if (!decoder) {
+          return CapabilitiesPromise::CreateAndReject(
+            MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR, "Can't create decoder"),
+            __func__);
+        }
+        // We now query the decoder to determine if it's power efficient.
+        return decoder->Init()->Then(
+          taskQueue,
+          __func__,
+          [taskQueue, decoder, frameRate, config = std::move(config)](
+            const MediaDataDecoder::InitPromise::ResolveOrRejectValue&
+              aValue) mutable {
+            RefPtr<CapabilitiesPromise> p;
+            if (aValue.IsReject()) {
+              p = CapabilitiesPromise::CreateAndReject(aValue.RejectValue(),
+                                                       __func__);
+            } else {
+              MOZ_ASSERT(config->IsVideo());
+              nsAutoCString reason;
+              bool powerEfficient = true;
+              bool smooth = true;
+              if (config->GetAsVideoInfo()->mImage.height > 480) {
+                // Assume that we can do stuff at 480p or less in a power
+                // efficient manner and smoothly. If greater than 480p we assume
+                // that if the video decoding is hardware accelerated it will be
+                // smooth and power efficient, otherwise we use the benchmark to
+                // estimate
+                powerEfficient = decoder->IsHardwareAccelerated(reason);
+                if (!powerEfficient && VPXDecoder::IsVP9(config->mMimeType)) {
+                  smooth = VP9Benchmark::IsVP9DecodeFast(true /* default */);
+                  uint32_t fps = StaticPrefs::MediaBenchmarkVp9Fps();
+                  if (!smooth && fps > 0) {
+                    // The VP9 estimizer decode a 1280x720 video. Let's adjust
+                    // the result for the resolution and frame rate of what we
+                    // actually want. If the result is twice that we need we
+                    // assume it will be smooth.
+                    const auto& videoConfig = *config->GetAsVideoInfo();
+                    double needed =
+                      ((1280.0 * 720.0) /
+                       (videoConfig.mImage.width * videoConfig.mImage.height) *
+                       fps) /
+                      frameRate;
+                    smooth = needed > 2;
+                  }
+                }
+              }
+              p = CapabilitiesPromise::CreateAndResolve(
+                MediaCapabilitiesInfo(
+                  true /* supported */, smooth, powerEfficient),
+                __func__);
+            }
+            MOZ_ASSERT(p.get(), "the promise has been created");
+            // Let's keep alive the decoder and the config object until the
+            // decoder has shutdown.
+            decoder->Shutdown()->Then(
+              taskQueue,
+              __func__,
+              [taskQueue, decoder, config = std::move(config)](
+                const ShutdownPromise::ResolveOrRejectValue& aValue) {});
+            return p;
+          });
+      }));
+  }
+
+  auto holder =
+    MakeRefPtr<DOMMozPromiseRequestHolder<CapabilitiesPromise::AllPromiseType>>(
+      mParent);
+  RefPtr<nsISerialEventTarget> targetThread;
+  RefPtr<StrongWorkerRef> workerRef;
+
+  if (NS_IsMainThread()) {
+    targetThread = mParent->AbstractMainThreadFor(TaskCategory::Other);
+  } else {
+    WorkerPrivate* wp = GetCurrentThreadWorkerPrivate();
+    MOZ_ASSERT(wp, "Must be called from a worker thread");
+    targetThread = wp->HybridEventTarget();
+    RefPtr<StrongWorkerRef> strongWorkerRef = StrongWorkerRef::Create(
+      wp, "MediaCapabilities", [holder, targetThread]() {
+        MOZ_ASSERT(targetThread->IsOnCurrentThread());
+        holder->DisconnectIfExists();
+      });
+    if (NS_WARN_IF(!workerRef)) {
+      // The worker is shutting down.
+      aRv.Throw(NS_ERROR_FAILURE);
+      return nullptr;
+    }
+  }
+
+  MOZ_ASSERT(targetThread);
+
+  // this is only captured for use with the LOG macro.
+  RefPtr<MediaCapabilities> self = this;
+
+  CapabilitiesPromise::All(targetThread, promises)
+    ->Then(
+      targetThread,
+      __func__,
+      [promise,
+       tracks = std::move(tracks),
+       workerRef,
+       holder,
+       aConfiguration,
+       self,
+       this](const CapabilitiesPromise::AllPromiseType::ResolveOrRejectValue&
+               aValue) {
+        holder->Complete();
+        if (aValue.IsReject()) {
+          auto info =
+            MakeUnique<MediaCapabilitiesInfo>(false /* supported */,
+                                              false /* smooth */,
+                                              false /* power efficient */);
+          LOG("%s -> %s",
+              MediaDecodingConfigurationToStr(aConfiguration).get(),
+              MediaCapabilitiesInfoToStr(info.get()).get());
+          promise->MaybeResolve(std::move(info));
+          return;
+        }
+        bool powerEfficient = true;
+        bool smooth = true;
+        for (auto&& capability : aValue.ResolveValue()) {
+          smooth &= capability.Smooth();
+          powerEfficient &= capability.PowerEfficient();
+        }
+        auto info = MakeUnique<MediaCapabilitiesInfo>(
+          true /* supported */, smooth, powerEfficient);
+        LOG("%s -> %s",
+            MediaDecodingConfigurationToStr(aConfiguration).get(),
+            MediaCapabilitiesInfoToStr(info.get()).get());
+        promise->MaybeResolve(std::move(info));
+      })
+    ->Track(*holder);
+
+  return promise.forget();
+}
+
+already_AddRefed<Promise>
+MediaCapabilities::EncodingInfo(
+  const MediaEncodingConfiguration& aConfiguration,
+  ErrorResult& aRv)
+{
+  RefPtr<Promise> promise = Promise::Create(mParent, aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  // If configuration is not a valid MediaConfiguration, return a Promise
+  // rejected with a TypeError.
+  if (!aConfiguration.IsAnyMemberPresent() ||
+      (!aConfiguration.mVideo.IsAnyMemberPresent() &&
+       !aConfiguration.mAudio.IsAnyMemberPresent())) {
+    aRv.ThrowTypeError<MSG_MISSING_REQUIRED_DICTIONARY_MEMBER>(
+      NS_LITERAL_STRING("'audio' or 'video'"));
+    return nullptr;
+  }
+
+  // Here we will throw rather than rejecting a promise in order to simulate
+  // optional dictionaries with required members (see bug 1368949)
+  if (aConfiguration.mVideo.IsAnyMemberPresent()) {
+    // Check that all VideoConfiguration required members are present.
+    CheckVideoConfigurationSanity(
+      aConfiguration.mVideo, "MediaDecodingConfiguration", aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+  }
+  if (aConfiguration.mAudio.IsAnyMemberPresent()) {
+    // Check that all AudioConfiguration required members are present.
+    CheckAudioConfigurationSanity(
+      aConfiguration.mAudio, "MediaDecodingConfiguration", aRv);
+    if (aRv.Failed()) {
+      return nullptr;
+    }
+  }
+
+  bool supported = true;
+
+  // If configuration.video is present and is not a valid video configuration,
+  // return a Promise rejected with a TypeError.
+  if (aConfiguration.mVideo.IsAnyMemberPresent()) {
+    if (!CheckVideoConfiguration(aConfiguration.mVideo)) {
+      aRv.ThrowTypeError<MSG_INVALID_MEDIA_VIDEO_CONFIGURATION>();
+      return nullptr;
+    }
+    // We have a video configuration and it is valid. Check if it is supported.
+    supported &=
+      CheckTypeForEncoder(aConfiguration.mVideo.mContentType.Value());
+  }
+  if (aConfiguration.mAudio.IsAnyMemberPresent()) {
+    if (!CheckAudioConfiguration(aConfiguration.mAudio)) {
+      aRv.ThrowTypeError<MSG_INVALID_MEDIA_AUDIO_CONFIGURATION>();
+      return nullptr;
+    }
+    // We have an audio configuration and it is valid. Check if it is supported.
+    supported &=
+      CheckTypeForEncoder(aConfiguration.mAudio.mContentType.Value());
+  }
+
+  auto info = MakeUnique<MediaCapabilitiesInfo>(supported, supported, false);
+  promise->MaybeResolve(std::move(info));
+
+  return promise.forget();
+}
+
+Maybe<MediaContainerType>
+MediaCapabilities::CheckVideoConfiguration(
+  const VideoConfiguration& aConfig) const
+{
+  Maybe<MediaExtendedMIMEType> container = MakeMediaExtendedMIMEType(aConfig);
+  if (!container) {
+    return Nothing();
+  }
+  // A valid video MIME type is a string that is a valid media MIME type and for
+  // which the type per [RFC7231] is either video or application.
+  if (!container->Type().HasVideoMajorType() &&
+      !container->Type().HasApplicationMajorType()) {
+    return Nothing();
+  }
+
+  // If the MIME type does not imply a codec, the string MUST also have one and
+  // only one parameter that is named codecs with a value describing a single
+  // media codec. Otherwise, it MUST contain no parameters.
+  // TODO (nsIMOMEHeaderParam doesn't provide backend to count number of
+  // parameters)
+
+  return Some(MediaContainerType(std::move(*container)));
+}
+
+Maybe<MediaContainerType>
+MediaCapabilities::CheckAudioConfiguration(
+  const AudioConfiguration& aConfig) const
+{
+  Maybe<MediaExtendedMIMEType> container = MakeMediaExtendedMIMEType(aConfig);
+  if (!container) {
+    return Nothing();
+  }
+  // A valid audio MIME type is a string that is valid media MIME type and for
+  // which the type per [RFC7231] is either audio or application.
+  if (!container->Type().HasAudioMajorType() &&
+      !container->Type().HasApplicationMajorType()) {
+    return Nothing();
+  }
+
+  // If the MIME type does not imply a codec, the string MUST also have one and
+  // only one parameter that is named codecs with a value describing a single
+  // media codec. Otherwise, it MUST contain no parameters.
+  // TODO (nsIMOMEHeaderParam doesn't provide backend to count number of
+  // parameters)
+
+  return Some(MediaContainerType(std::move(*container)));
+}
+
+bool
+MediaCapabilities::CheckTypeForMediaSource(const nsAString& aType)
+{
+  return NS_SUCCEEDED(MediaSource::IsTypeSupported(
+    aType, nullptr /* DecoderDoctorDiagnostics */));
+}
+
+bool
+MediaCapabilities::CheckTypeForFile(const nsAString& aType)
+{
+  Maybe<MediaContainerType> containerType = MakeMediaContainerType(aType);
+  if (!containerType) {
+    return false;
+  }
+
+  return DecoderTraits::CanHandleContainerType(
+           *containerType, nullptr /* DecoderDoctorDiagnostics */) !=
+         CANPLAY_NO;
+}
+
+bool
+MediaCapabilities::CheckTypeForEncoder(const nsAString& aType)
+{
+  return MediaRecorder::IsTypeSupported(aType);
+}
+
+already_AddRefed<layers::KnowsCompositor>
+MediaCapabilities::GetCompositor()
+{
+  nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(GetParentObject());
+  if (NS_WARN_IF(!window)) {
+    return nullptr;
+  }
+
+  nsCOMPtr<nsIDocument> doc = window->GetExtantDoc();
+  if (NS_WARN_IF(!doc)) {
+    return nullptr;
+  }
+  RefPtr<layers::LayerManager> layerManager =
+    nsContentUtils::LayerManagerForDocument(doc);
+  if (NS_WARN_IF(!layerManager)) {
+    return nullptr;
+  }
+  RefPtr<layers::KnowsCompositor> knows = layerManager->AsKnowsCompositor();
+  if (NS_WARN_IF(!knows)) {
+    return nullptr;
+  }
+  return knows->GetForMedia().forget();
+}
+
+bool
+MediaCapabilities::Enabled(JSContext* aCx, JSObject* aGlobal)
+{
+  return StaticPrefs::MediaCapabilitiesEnabled();
+}
+
+JSObject*
+MediaCapabilities::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+{
+  return MediaCapabilities_Binding::Wrap(aCx, this, aGivenProto);
+}
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(MediaCapabilities)
+  NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+NS_INTERFACE_MAP_END
+
+NS_IMPL_CYCLE_COLLECTING_ADDREF(MediaCapabilities)
+NS_IMPL_CYCLE_COLLECTING_RELEASE(MediaCapabilities)
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(MediaCapabilities, mParent)
+
+// MediaCapabilitiesInfo
+bool
+MediaCapabilitiesInfo::WrapObject(JSContext* aCx,
+                                  JS::Handle<JSObject*> aGivenProto,
+                                  JS::MutableHandle<JSObject*> aReflector)
+{
+  return MediaCapabilitiesInfo_Binding::Wrap(
+    aCx, this, aGivenProto, aReflector);
+}
+
+} // namespace dom
+} // namespace mozilla
diff --git a/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build b/dom/media/mediacapabilities/moz.build
copy from devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
copy to dom/media/mediacapabilities/moz.build
--- a/devtools/client/debugger/new/src/components/PrimaryPanes/moz.build
+++ b/dom/media/mediacapabilities/moz.build
@@ -1,14 +1,14 @@
 # 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/.
 
-DIRS += [
+EXPORTS.mozilla.dom += [
+    'MediaCapabilities.h',
+]
 
+UNIFIED_SOURCES += [
+    'MediaCapabilities.cpp',
 ]
 
-DevToolsModules(
-    'index.js',
-    'Outline.js',
-    'SourcesTree.js',
-)
+FINAL_LIBRARY = 'xul'
diff --git a/dom/media/mediasource/AutoTaskQueue.h b/dom/media/mediasource/AutoTaskQueue.h
deleted file mode 100644
--- a/dom/media/mediasource/AutoTaskQueue.h
+++ /dev/null
@@ -1,73 +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 MOZILLA_AUTOTASKQUEUE_H_
-#define MOZILLA_AUTOTASKQUEUE_H_
-
-#include "mozilla/RefPtr.h"
-#include "mozilla/SystemGroup.h"
-#include "mozilla/TaskQueue.h"
-
-class nsIEventTarget;
-
-namespace mozilla {
-
-// A convenience TaskQueue not requiring explicit shutdown.
-class AutoTaskQueue : public AbstractThread
-{
-public:
-  explicit AutoTaskQueue(already_AddRefed<nsIEventTarget> aPool,
-                         bool aSupportsTailDispatch = false)
-    : AbstractThread(aSupportsTailDispatch)
-    , mTaskQueue(new TaskQueue(std::move(aPool), aSupportsTailDispatch))
-    , mMonitor("AutoTaskQueue")
-  {
-  }
-
-  AutoTaskQueue(already_AddRefed<nsIEventTarget> aPool,
-                const char* aName,
-                bool aSupportsTailDispatch = false)
-    : AbstractThread(aSupportsTailDispatch)
-    , mTaskQueue(new TaskQueue(std::move(aPool), aName, aSupportsTailDispatch))
-    , mMonitor("AutoTaskQueue")
-  {
-  }
-
-  TaskDispatcher& TailDispatcher() override
-  {
-    return mTaskQueue->TailDispatcher();
-  }
-
-  MOZ_MUST_USE nsresult
-  Dispatch(already_AddRefed<nsIRunnable> aRunnable,
-           DispatchReason aReason = NormalDispatch) override
-  {
-    return mTaskQueue->Dispatch(std::move(aRunnable), aReason);
-  }
-
-  // Prevent a GCC warning about the other overload of Dispatch being hidden.
-  using AbstractThread::Dispatch;
-
-  // Blocks until all tasks finish executing.
-  void AwaitIdle() { mTaskQueue->AwaitIdle(); }
-
-  bool IsEmpty() { return mTaskQueue->IsEmpty(); }
-
-  // Returns true if the current thread is currently running a Runnable in
-  // the task queue.
-  bool IsCurrentThreadIn() override { return mTaskQueue->IsCurrentThreadIn(); }
-
-  mozilla::Monitor& Monitor() { return mMonitor; }
-
-private:
-  ~AutoTaskQueue() { mTaskQueue->BeginShutdown(); }
-  RefPtr<TaskQueue> mTaskQueue;
-  mozilla::Monitor mMonitor;
-};
-
-} // namespace mozilla
-
-#endif
diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp
--- a/dom/media/mediasource/MediaSource.cpp
+++ b/dom/media/mediasource/MediaSource.cpp
@@ -20,10 +20,11 @@
 #include "SourceBuffer.h"
 #include "SourceBufferList.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Preferences.h"
+#include "mozilla/StaticPrefs.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/dom/HTMLMediaElement.h"
 #include "mozilla/mozalloc.h"
 #include "nsDebug.h"
 #include "nsError.h"
@@ -128,10 +129,11 @@
     }
     return NS_OK;
   }
   if (mimeType == MEDIAMIMETYPE("video/webm")) {
     if (!(Preferences::GetBool("media.mediasource.webm.enabled", false) ||
+          StaticPrefs::MediaCapabilitiesEnabled() ||
           containerType->ExtendedType().Codecs().Contains(
             NS_LITERAL_STRING("vp8")) ||
 #ifdef MOZ_AV1
           // FIXME: Temporary comparison with the full codecs attribute.
           // See bug 1377015.
diff --git a/dom/media/mediasource/MediaSourceDemuxer.h b/dom/media/mediasource/MediaSourceDemuxer.h
--- a/dom/media/mediasource/MediaSourceDemuxer.h
+++ b/dom/media/mediasource/MediaSourceDemuxer.h
@@ -5,19 +5,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if !defined(MediaSourceDemuxer_h_)
 #define MediaSourceDemuxer_h_
 
-#include "mozilla/Atomics.h"
-#include "mozilla/Maybe.h"
-#include "mozilla/Monitor.h"
-#include "AutoTaskQueue.h"
-
 #include "MediaDataDemuxer.h"
 #include "MediaResource.h"
 #include "MediaSource.h"
 #include "TrackBuffersManager.h"
+#include "mozilla/Atomics.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/Monitor.h"
+#include "mozilla/TaskQueue.h"
+
 
 namespace mozilla {
 
 class AbstractThread;
 class MediaResult;
@@ -47,11 +47,11 @@
   bool ShouldComputeStartTime() const override { return false; }
 
   /* interface for TrackBuffersManager */
   void AttachSourceBuffer(RefPtr<TrackBuffersManager>& aSourceBuffer);
   void DetachSourceBuffer(RefPtr<TrackBuffersManager>& aSourceBuffer);
-  AutoTaskQueue* GetTaskQueue() { return mTaskQueue; }
+  TaskQueue* GetTaskQueue() { return mTaskQueue; }
   void NotifyInitDataArrived();
 
   // Returns a string describing the state of the MediaSource internal
   // buffered data. Used for debugging purposes.
   void GetMozDebugReaderData(nsACString& aString);
@@ -76,11 +76,11 @@
   bool OnTaskQueue()
   {
     return !GetTaskQueue() || GetTaskQueue()->IsCurrentThreadIn();
   }
 
-  RefPtr<AutoTaskQueue> mTaskQueue;
+  RefPtr<TaskQueue> mTaskQueue;
   nsTArray<RefPtr<MediaSourceTrackDemuxer>> mDemuxers;
 
   nsTArray<RefPtr<TrackBuffersManager>> mSourceBuffers;
 
   MozPromiseHolder<InitPromise> mInitPromise;
diff --git a/dom/media/mediasource/MediaSourceDemuxer.cpp b/dom/media/mediasource/MediaSourceDemuxer.cpp
--- a/dom/media/mediasource/MediaSourceDemuxer.cpp
+++ b/dom/media/mediasource/MediaSourceDemuxer.cpp
@@ -22,12 +22,12 @@
 typedef TrackInfo::TrackType TrackType;
 using media::TimeUnit;
 using media::TimeIntervals;
 
 MediaSourceDemuxer::MediaSourceDemuxer(AbstractThread* aAbstractMainThread)
-  : mTaskQueue(new AutoTaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
-                                 "MediaSourceDemuxer::mTaskQueue"))
+  : mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
+                             "MediaSourceDemuxer::mTaskQueue"))
   , mMonitor("MediaSourceDemuxer")
 {
   MOZ_ASSERT(NS_IsMainThread());
 }
 
diff --git a/dom/media/mediasource/TrackBuffersManager.h b/dom/media/mediasource/TrackBuffersManager.h
--- a/dom/media/mediasource/TrackBuffersManager.h
+++ b/dom/media/mediasource/TrackBuffersManager.h
@@ -9,11 +9,11 @@
 
 #include "mozilla/Atomics.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/Mutex.h"
 #include "mozilla/NotNull.h"
-#include "AutoTaskQueue.h"
+#include "mozilla/TaskQueue.h"
 
 #include "MediaContainerType.h"
 #include "MediaData.h"
 #include "MediaDataDemuxer.h"
 #include "MediaResult.h"
@@ -463,19 +463,19 @@
   }
   TrackData mVideoTracks;
   TrackData mAudioTracks;
 
   // TaskQueue methods and objects.
-  RefPtr<AutoTaskQueue> GetTaskQueueSafe() const
+  RefPtr<TaskQueue> GetTaskQueueSafe() const
   {
     MutexAutoLock mut(mMutex);
     return mTaskQueue;
   }
   NotNull<AbstractThread*> TaskQueueFromTaskQueue() const
   {
 #ifdef DEBUG
-    RefPtr<AutoTaskQueue> taskQueue = GetTaskQueueSafe();
+    RefPtr<TaskQueue> taskQueue = GetTaskQueueSafe();
     MOZ_ASSERT(taskQueue && taskQueue->IsCurrentThreadIn());
 #endif
     return WrapNotNull(mTaskQueue.get());
   }
   bool OnTaskQueue() const
@@ -531,11 +531,11 @@
   // Monitor to protect following objects accessed across multiple threads.
   mutable Mutex mMutex;
   // mTaskQueue is only ever written after construction on the task queue.
   // As such, it can be accessed while on task queue without the need for the
   // mutex.
-  RefPtr<AutoTaskQueue> mTaskQueue;
+  RefPtr<TaskQueue> mTaskQueue;
   // Stable audio and video track time ranges.
   media::TimeIntervals mVideoBufferedRanges;
   media::TimeIntervals mAudioBufferedRanges;
   // MediaInfo of the first init segment read.
   MediaInfo mInfo;
diff --git a/dom/media/mediasource/TrackBuffersManager.cpp b/dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -175,11 +175,11 @@
 TrackBuffersManager::QueueTask(SourceBufferTask* aTask)
 {
   // The source buffer is a wrapped native, it would be unlinked twice and so
   // the TrackBuffersManager::Detach() would also be called twice. Since the
   // detach task has been done before, we could ignore this task.
-  RefPtr<AutoTaskQueue> taskQueue = GetTaskQueueSafe();
+  RefPtr<TaskQueue> taskQueue = GetTaskQueueSafe();
   if (!taskQueue) {
     MOZ_ASSERT(aTask->GetType() == SourceBufferTask::Type::Detach,
                "only detach task could happen here!");
     MSE_DEBUG("Could not queue the task '%s' without task queue",
               aTask->GetTypeName());
diff --git a/dom/media/mediasource/moz.build b/dom/media/mediasource/moz.build
--- a/dom/media/mediasource/moz.build
+++ b/dom/media/mediasource/moz.build
@@ -5,11 +5,10 @@
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 EXPORTS += [
     'AsyncEventRunner.h',
-    'AutoTaskQueue.h',
     'MediaSourceDecoder.h',
     'MediaSourceDemuxer.h',
     'SourceBufferAttributes.h',
     'SourceBufferTask.h',
     'TrackBuffersManager.h',
diff --git a/dom/media/moz.build b/dom/media/moz.build
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -39,10 +39,11 @@
     'flac',
     'gmp',
     'gmp-plugin-openh264',
     'imagecapture',
     'ipc',
+    'mediacapabilities',
     'mediasink',
     'mediasource',
     'mp3',
     'ogg',
     'platforms',
@@ -102,10 +103,11 @@
     'AudioStream.h',
     'AutoplayPolicy.h',
     'BackgroundVideoDecodingPermissionObserver.h',
     'Benchmark.h',
     'BitReader.h',
+    'BitWriter.h',
     'BufferMediaResource.h',
     'BufferReader.h',
     'ByteWriter.h',
     'ChannelMediaDecoder.h',
     'CubebUtils.h',
@@ -221,10 +223,11 @@
     'AutoplayPolicy.cpp',
     'BackgroundVideoDecodingPermissionObserver.cpp',
     'BaseMediaResource.cpp',
     'Benchmark.cpp',
     'BitReader.cpp',
+    'BitWriter.cpp',
     'CanvasCaptureMediaStream.cpp',
     'ChannelMediaDecoder.cpp',
     'ChannelMediaResource.cpp',
     'CloneableWithRangeMediaResource.cpp',
     'DOMMediaStream.cpp',
diff --git a/dom/media/mp3/MP3Decoder.h b/dom/media/mp3/MP3Decoder.h
--- a/dom/media/mp3/MP3Decoder.h
+++ b/dom/media/mp3/MP3Decoder.h
@@ -4,21 +4,27 @@
  * License, v. 2.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 MP3Decoder_h_
 #define MP3Decoder_h_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class MP3Decoder
 {
 public:
   // Returns true if the MP3 backend is preffed on, and we're running on a
   // platform that is likely to have decoders for the format.
   static bool IsEnabled();
   static bool IsSupportedType(const MediaContainerType& aContainerType);
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/mp3/MP3Decoder.cpp b/dom/media/mp3/MP3Decoder.cpp
--- a/dom/media/mp3/MP3Decoder.cpp
+++ b/dom/media/mp3/MP3Decoder.cpp
@@ -27,6 +27,21 @@
                            aContainerType.ExtendedType().Codecs() == "mp3");
   }
   return false;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+MP3Decoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (!IsSupportedType(aType)) {
+    return tracks;
+  }
+
+  tracks.AppendElement(
+    CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+      NS_LITERAL_CSTRING("audio/mpeg"), aType));
+
+  return tracks;
+}
+
 } // namespace mozilla
diff --git a/dom/media/mp4/MP4Decoder.h b/dom/media/mp4/MP4Decoder.h
--- a/dom/media/mp4/MP4Decoder.h
+++ b/dom/media/mp4/MP4Decoder.h
@@ -4,16 +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/. */
 #if !defined(MP4Decoder_h_)
 #define MP4Decoder_h_
 
+#include "mozilla/UniquePtr.h"
 #include "nsStringFwd.h"
+#include "nsTArray.h"
 
 namespace mozilla {
 
 class MediaContainerType;
 class DecoderDoctorDiagnostics;
+class TrackInfo;
 
 // Decoder that uses a bundled MP4 demuxer and platform decoders to play MP4.
 class MP4Decoder
 {
 public:
@@ -37,10 +40,17 @@
   static bool IsAAC(const nsACString& aMimeType);
 
   // Returns true if the MP4 backend is preffed on.
   static bool IsEnabled();
 
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
+
+private:
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType,
+    MediaResult& aError);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/mp4/MP4Decoder.cpp b/dom/media/mp4/MP4Decoder.cpp
--- a/dom/media/mp4/MP4Decoder.cpp
+++ b/dom/media/mp4/MP4Decoder.cpp
@@ -3,25 +3,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/. */
 
 #include "MP4Decoder.h"
-#include "MediaContainerType.h"
+#include "H264.h"
 #include "MP4Demuxer.h"
-#include "nsMimeTypes.h"
-#include "VideoUtils.h"
+#include "MediaContainerType.h"
 #include "PDMFactory.h"
+#include "VideoUtils.h"
 #include "mozilla/StaticPrefs.h"
+#include "nsMimeTypes.h"
 
 namespace mozilla {
 
 static bool
 IsWhitelistedH264Codec(const nsAString& aCodec)
 {
-  int16_t profile = 0, level = 0;
+  uint8_t profile = 0, constraint = 0, level = 0;
 
-  if (!ExtractH264CodecDetails(aCodec, profile, level)) {
+  if (!ExtractH264CodecDetails(aCodec, profile, constraint, level)) {
     return false;
   }
 
   // Just assume what we can play on all platforms the codecs/formats that
   // WMF can play, since we don't have documentation about what other
@@ -47,103 +48,133 @@
   const MediaContainerType& aContainerType)
 {
   return IsSupportedType(aContainerType, nullptr);
 }
 
+static bool IsTypeValid(const MediaContainerType& aType)
+{
+  // Whitelist MP4 types, so they explicitly match what we encounter on
+  // the web, as opposed to what we use internally (i.e. what our demuxers
+  // etc output).
+  return aType.Type() == MEDIAMIMETYPE("audio/mp4") ||
+         aType.Type() == MEDIAMIMETYPE("audio/x-m4a") ||
+         aType.Type() == MEDIAMIMETYPE("video/mp4") ||
+         aType.Type() == MEDIAMIMETYPE("video/quicktime") ||
+         aType.Type() == MEDIAMIMETYPE("video/x-m4v");
+}
+
+/* statis */ nsTArray<UniquePtr<TrackInfo>>
+MP4Decoder::GetTracksInfo(const MediaContainerType& aType, MediaResult& aError)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+
+  if (!IsTypeValid(aType)) {
+    aError = MediaResult(
+      NS_ERROR_DOM_MEDIA_FATAL_ERR,
+      RESULT_DETAIL("Invalid type:%s", aType.Type().AsString().get()));
+    return tracks;
+  }
+
+  aError = NS_OK;
+
+  const MediaCodecs& codecs = aType.ExtendedType().Codecs();
+  if (codecs.IsEmpty()) {
+    return tracks;
+  }
+
+  const bool isVideo = aType.Type() == MEDIAMIMETYPE("video/mp4") ||
+                       aType.Type() == MEDIAMIMETYPE("video/quicktime") ||
+                       aType.Type() == MEDIAMIMETYPE("video/x-m4v");
+
+  for (const auto& codec : codecs.Range()) {
+    if (IsAACCodecString(codec)) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("audio/mp4a-latm"), aType));
+      continue;
+    }
+    if (codec.EqualsLiteral("mp3")) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("audio/mpeg"), aType));
+      continue;
+    }
+    if (codec.EqualsLiteral("opus") || codec.EqualsLiteral("flac")) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("audio/") + NS_ConvertUTF16toUTF8(codec), aType));
+      continue;
+    }
+    if (IsVP9CodecString(codec)) {
+      auto trackInfo =
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("video/vp9"), aType);
+      uint8_t profile = 0;
+      uint8_t level = 0;
+      uint8_t bitDepth = 0;
+      if (ExtractVPXCodecDetails(codec, profile, level, bitDepth)) {
+        trackInfo->GetAsVideoInfo()->mBitDepth = bitDepth;
+      }
+      tracks.AppendElement(std::move(trackInfo));
+      continue;
+    }
+    if (isVideo && IsWhitelistedH264Codec(codec)) {
+      auto trackInfo =
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("video/avc"), aType);
+      uint8_t profile = 0, constraint = 0, level = 0;
+      MOZ_ALWAYS_TRUE(
+        ExtractH264CodecDetails(codec, profile, constraint, level));
+      uint32_t width = aType.ExtendedType().GetWidth().refOr(1280);
+      uint32_t height = aType.ExtendedType().GetHeight().refOr(720);
+      trackInfo->GetAsVideoInfo()->mExtraData =
+        H264::CreateExtraData(profile, constraint, level, { width, height });
+      tracks.AppendElement(std::move(trackInfo));
+      continue;
+    }
+    // Unknown codec
+    aError =
+      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
+                  RESULT_DETAIL("Unknown codec:%s",
+                                NS_ConvertUTF16toUTF8(codec).get()));
+  }
+  return tracks;
+}
+
 /* static */
 bool
 MP4Decoder::IsSupportedType(const MediaContainerType& aType,
                             DecoderDoctorDiagnostics* aDiagnostics)
 {
   if (!IsEnabled()) {
     return false;
   }
 
-  // Whitelist MP4 types, so they explicitly match what we encounter on
-  // the web, as opposed to what we use internally (i.e. what our demuxers
-  // etc output).
-  const bool isAudio = aType.Type() == MEDIAMIMETYPE("audio/mp4") ||
-                       aType.Type() == MEDIAMIMETYPE("audio/x-m4a");
-  const bool isVideo = aType.Type() == MEDIAMIMETYPE("video/mp4") ||
-                       aType.Type() == MEDIAMIMETYPE("video/quicktime") ||
-                       aType.Type() == MEDIAMIMETYPE("video/x-m4v");
-
-  if (!isAudio && !isVideo) {
+  MediaResult rv = NS_OK;
+  auto tracks = GetTracksInfo(aType, rv);
+  if (NS_FAILED(rv)) {
     return false;
   }
 
-  nsTArray<UniquePtr<TrackInfo>> trackInfos;
-  if (aType.ExtendedType().Codecs().IsEmpty()) {
-    // No codecs specified. Assume H.264
-    if (isAudio) {
-      trackInfos.AppendElement(
+  if (tracks.IsEmpty()) {
+    // No codecs specified. Assume H.264 or AAC
+    if (aType.Type() == MEDIAMIMETYPE("audio/mp4") ||
+        aType.Type() == MEDIAMIMETYPE("audio/x-m4a")) {
+      tracks.AppendElement(
         CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
           NS_LITERAL_CSTRING("audio/mp4a-latm"), aType));
     } else {
-      MOZ_ASSERT(isVideo);
-      trackInfos.AppendElement(
+      tracks.AppendElement(
         CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
           NS_LITERAL_CSTRING("video/avc"), aType));
     }
-  } else {
-    // Verify that all the codecs specified are ones that we expect that
-    // we can play.
-    for (const auto& codec : aType.ExtendedType().Codecs().Range()) {
-      if (IsAACCodecString(codec)) {
-        trackInfos.AppendElement(
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("audio/mp4a-latm"), aType));
-        continue;
-      }
-      if (codec.EqualsLiteral("mp3")) {
-        trackInfos.AppendElement(
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("audio/mpeg"), aType));
-        continue;
-      }
-      if (codec.EqualsLiteral("opus")) {
-        trackInfos.AppendElement(
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("audio/opus"), aType));
-        continue;
-      }
-      if (codec.EqualsLiteral("flac")) {
-        trackInfos.AppendElement(
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("audio/flac"), aType));
-        continue;
-      }
-      if (IsVP9CodecString(codec)) {
-        auto trackInfo =
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("video/vp9"), aType);
-        uint8_t profile = 0;
-        uint8_t level = 0;
-        uint8_t bitDepth = 0;
-        if (ExtractVPXCodecDetails(codec, profile, level, bitDepth)) {
-          trackInfo->GetAsVideoInfo()->mBitDepth = bitDepth;
-        }
-        trackInfos.AppendElement(std::move(trackInfo));
-        continue;
-      }
-      // Note: Only accept H.264 in a video content type, not in an audio
-      // content type.
-      if (IsWhitelistedH264Codec(codec) && isVideo) {
-        trackInfos.AppendElement(
-          CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-            NS_LITERAL_CSTRING("video/avc"), aType));
-        continue;
-      }
-      // Some unsupported codec.
-      return false;
-    }
   }
 
   // Verify that we have a PDM that supports the whitelisted types.
   RefPtr<PDMFactory> platform = new PDMFactory();
-  for (const auto& trackInfo : trackInfos) {
-    if (!trackInfo || !platform->Supports(*trackInfo, aDiagnostics)) {
+  for (const auto& track : tracks) {
+    if (!track || !platform->Supports(*track, aDiagnostics)) {
       return false;
     }
   }
 
   return true;
@@ -169,6 +200,13 @@
 MP4Decoder::IsEnabled()
 {
   return StaticPrefs::mediaMp4Enabled();
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+MP4Decoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  MediaResult rv = NS_OK;
+  return GetTracksInfo(aType, rv);
+}
+
 } // namespace mozilla
diff --git a/dom/media/mp4/MoofParser.cpp b/dom/media/mp4/MoofParser.cpp
--- a/dom/media/mp4/MoofParser.cpp
+++ b/dom/media/mp4/MoofParser.cpp
@@ -51,11 +51,10 @@
 
 bool
 MoofParser::RebuildFragmentedIndex(BoxContext& aContext)
 {
   bool foundValidMoof = false;
-  bool foundMdat = false;
 
   for (Box box(&aContext, mOffset); box.IsAvailable(); box = box.Next()) {
     if (box.IsType("moov") && mInitRange.IsEmpty()) {
       mInitRange = MediaByteRange(0, box.Range().mEnd);
       ParseMoov(box);
@@ -604,11 +603,10 @@
     LOG(Moof, "Incomplete Box (missing flags)");
     return Err(NS_ERROR_FAILURE);
   }
   uint32_t flags;
   MOZ_TRY_VAR(flags, reader->ReadU32());
-  uint8_t version = flags >> 24;
 
   if (!reader->CanReadType<uint32_t>()) {
     LOG(Moof, "Incomplete Box (missing sampleCount)");
     return Err(NS_ERROR_FAILURE);
   }
diff --git a/dom/media/ogg/OggDecoder.h b/dom/media/ogg/OggDecoder.h
--- a/dom/media/ogg/OggDecoder.h
+++ b/dom/media/ogg/OggDecoder.h
@@ -4,21 +4,27 @@
  * License, v. 2.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 !defined(OggDecoder_h_)
 #define OggDecoder_h_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class OggDecoder
 {
 public:
   // Returns true if aContainerType is an Ogg type that we think we can render
   // with an enabled platform decoder backend.
   // If provided, codecs are checked for support.
   static bool IsSupportedType(const MediaContainerType& aContainerType);
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/ogg/OggDecoder.cpp b/dom/media/ogg/OggDecoder.cpp
--- a/dom/media/ogg/OggDecoder.cpp
+++ b/dom/media/ogg/OggDecoder.cpp
@@ -28,20 +28,19 @@
 
   const bool isOggVideo = (aContainerType.Type() != MEDIAMIMETYPE(AUDIO_OGG));
 
   const MediaCodecs& codecs = aContainerType.ExtendedType().Codecs();
   if (codecs.IsEmpty()) {
-    // WebM guarantees that the only codecs it contained are vp8, vp9, opus or vorbis.
+    // Ogg guarantees that the only codecs it contained are supported.
     return true;
   }
   // Verify that all the codecs specified are ones that we expect that
   // we can play.
   for (const auto& codec : codecs.Range()) {
     if ((MediaDecoder::IsOpusEnabled() && codec.EqualsLiteral("opus")) ||
         codec.EqualsLiteral("vorbis") ||
-        (StaticPrefs::MediaOggFlacEnabled() &&
-         codec.EqualsLiteral("flac"))) {
+        codec.EqualsLiteral("flac")) {
       continue;
     }
     // Note: Only accept Theora in a video container type, not in an audio
     // container type.
     if (isOggVideo && codec.EqualsLiteral("theora")) {
@@ -51,6 +50,36 @@
     return false;
   }
   return true;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+OggDecoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (!IsSupportedType(aType)) {
+    return tracks;
+  }
+
+  const MediaCodecs& codecs = aType.ExtendedType().Codecs();
+  if (codecs.IsEmpty()) {
+    // Codecs must be specified for ogg as it can't be implied.
+    return tracks;
+  }
+
+  for (const auto& codec : codecs.Range()) {
+    if (codec.EqualsLiteral("opus") || codec.EqualsLiteral("vorbis") ||
+        codec.EqualsLiteral("flac")) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("audio/") + NS_ConvertUTF16toUTF8(codec), aType));
+    } else {
+      MOZ_ASSERT(codec.EqualsLiteral("theora"));
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("video/") + NS_ConvertUTF16toUTF8(codec), aType));
+    }
+  }
+  return tracks;
+}
+
 } // namespace mozilla
diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp
--- a/dom/media/ogg/OggDemuxer.cpp
+++ b/dom/media/ogg/OggDemuxer.cpp
@@ -536,12 +536,11 @@
           }
         } else {
           NS_WARNING("Opus decoding disabled."
                      " See media.opus.enabled in about:config");
         }
-      } else if (StaticPrefs::MediaOggFlacEnabled() &&
-                 s->GetType() == OggCodecState::TYPE_FLAC &&
+      } else if (s->GetType() == OggCodecState::TYPE_FLAC &&
                  ReadHeaders(TrackInfo::kAudioTrack, s)) {
         if (!mFlacState) {
           SetupTarget(&mFlacState, s);
         } else {
           s->Deactivate();
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -292,11 +292,12 @@
       NS_ERROR_DOM_MEDIA_FATAL_ERR,
       RESULT_DETAIL("Decoder configuration error, expected audio or video."));
     return nullptr;
   }
 
-  if (MP4Decoder::IsH264(config.mMimeType) && !aParams.mUseNullDecoder.mUse) {
+  if (MP4Decoder::IsH264(config.mMimeType) && !aParams.mUseNullDecoder.mUse &&
+      !aParams.mNoWrapper.mDontUseWrapper) {
     RefPtr<H264Converter> h = new H264Converter(aPDM, aParams);
     const MediaResult result = h->GetLastError();
     if (NS_SUCCEEDED(result) || result == NS_ERROR_NOT_INITIALIZED) {
       // The H264Converter either successfully created the wrapped decoder,
       // or there wasn't enough AVCC data to do so. Otherwise, there was some
diff --git a/dom/media/platforms/PlatformDecoderModule.h b/dom/media/platforms/PlatformDecoderModule.h
--- a/dom/media/platforms/PlatformDecoderModule.h
+++ b/dom/media/platforms/PlatformDecoderModule.h
@@ -58,10 +58,21 @@
     UseNullDecoder() = default;
     explicit UseNullDecoder(bool aUseNullDecoder) : mUse(aUseNullDecoder) { }
     bool mUse = false;
   };
 
+  // Do not wrap H264 decoder in a H264Converter.
+  struct NoWrapper
+  {
+    NoWrapper() = default;
+    explicit NoWrapper(bool aDontUseWrapper)
+      : mDontUseWrapper(aDontUseWrapper)
+    {
+    }
+    bool mDontUseWrapper = false;
+  };
+
   struct VideoFrameRate
   {
     VideoFrameRate() = default;
     explicit VideoFrameRate(float aFramerate) : mValue(aFramerate) { }
     float mValue = 0.0f;
@@ -100,10 +111,11 @@
   layers::ImageContainer* mImageContainer = nullptr;
   MediaResult* mError = nullptr;
   RefPtr<layers::KnowsCompositor> mKnowsCompositor;
   RefPtr<GMPCrashHelper> mCrashHelper;
   UseNullDecoder mUseNullDecoder;
+  NoWrapper mNoWrapper;
   TrackInfo::TrackType mType = TrackInfo::kUndefinedTrack;
   MediaEventProducer<TrackInfo::TrackType>* mOnWaitingForKeyEvent = nullptr;
   OptionSet mOptions = OptionSet(Option::Default);
   VideoFrameRate mRate;
 
@@ -118,10 +130,11 @@
     mImageContainer = aImageContainer;
   }
   void Set(MediaResult* aError) { mError = aError; }
   void Set(GMPCrashHelper* aCrashHelper) { mCrashHelper = aCrashHelper; }
   void Set(UseNullDecoder aUseNullDecoder) { mUseNullDecoder = aUseNullDecoder; }
+  void Set(NoWrapper aNoWrapper) { mNoWrapper = aNoWrapper; }
   void Set(OptionSet aOptions) { mOptions = aOptions; }
   void Set(VideoFrameRate aRate) { mRate = aRate; }
   void Set(layers::KnowsCompositor* aKnowsCompositor)
   {
     if (aKnowsCompositor) {
diff --git a/dom/media/platforms/agnostic/bytestreams/H264.h b/dom/media/platforms/agnostic/bytestreams/H264.h
--- a/dom/media/platforms/agnostic/bytestreams/H264.h
+++ b/dom/media/platforms/agnostic/bytestreams/H264.h
@@ -471,19 +471,28 @@
   };
 
   // Returns the frame type. Returns I_FRAME if the sample is an IDR
   // (Instantaneous Decoding Refresh) Picture.
   static FrameType GetFrameType(const mozilla::MediaRawData* aSample);
+  // Create a dummy extradata, useful to create a decoder and test the
+  // capabilities of the decoder.
+  static already_AddRefed<mozilla::MediaByteBuffer> CreateExtraData(
+    uint8_t aProfile,
+    uint8_t aConstraints,
+    uint8_t aLevel,
+    const gfx::IntSize& aSize);
 
 private:
   friend class SPSNAL;
   /* Extract RAW BYTE SEQUENCE PAYLOAD from NAL content.
      Returns nullptr if invalid content.
      This is compliant to ITU H.264 7.3.1 Syntax in tabular form NAL unit syntax
    */
   static already_AddRefed<mozilla::MediaByteBuffer> DecodeNALUnit(
     const uint8_t* aNAL, size_t aLength);
+  static already_AddRefed<mozilla::MediaByteBuffer> EncodeNALUnit(
+    const uint8_t* aNAL, size_t aLength);
   /* Decode SPS NAL RBSP and fill SPSData structure */
   static bool DecodeSPS(const mozilla::MediaByteBuffer* aSPS, SPSData& aDest);
   static bool vui_parameters(mozilla::BitReader& aBr, SPSData& aDest);
   // Read HRD parameters, all data is ignored.
   static void hrd_parameters(mozilla::BitReader& aBr);
diff --git a/dom/media/platforms/agnostic/bytestreams/H264.cpp b/dom/media/platforms/agnostic/bytestreams/H264.cpp
--- a/dom/media/platforms/agnostic/bytestreams/H264.cpp
+++ b/dom/media/platforms/agnostic/bytestreams/H264.cpp
@@ -4,10 +4,11 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/ResultExtensions.h"
 #include "BitReader.h"
+#include "BitWriter.h"
 #include "BufferReader.h"
 #include "ByteWriter.h"
 #include "AnnexB.h"
 #include "H264.h"
 #include <limits>
@@ -118,56 +119,10 @@
 scaling_list(BitReader& aBr, uint8_t (&aScalingList)[N], const uint8_t (&aDefaultList)[N])
 {
   detail::scaling_list(aBr, aScalingList, N, aDefaultList, nullptr);
 }
 
-static uint32_t
-GetBitLength(const mozilla::MediaByteBuffer* aNAL)
-{
-  size_t size = aNAL->Length();
-
-  while (size > 0 && aNAL->ElementAt(size - 1) == 0) {
-    size--;
-  }
-
-  if (!size) {
-    return 0;
-  }
-
-  if (size > UINT32_MAX / 8) {
-    // We can't represent it, we'll use as much as we can.
-    return UINT32_MAX;
-  }
-
-  uint8_t v = aNAL->ElementAt(size - 1);
-  size *= 8;
-
-  // Remove the stop bit and following trailing zeros.
-  if (v) {
-    // Count the consecutive zero bits (trailing) on the right by binary search.
-    // Adapted from Matt Whitlock algorithm to only bother with 8 bits integers.
-    uint32_t c;
-    if (v & 1) {
-      // Special case for odd v (assumed to happen half of the time).
-      c = 0;
-    } else {
-      c = 1;
-      if ((v & 0xf) == 0) {
-        v >>= 4;
-        c += 4;
-      }
-      if ((v & 0x3) == 0) {
-        v >>= 2;
-        c += 2;
-      }
-      c -= v & 0x1;
-    }
-    size -= c + 1;
-  }
-  return size;
-}
-
 SPSData::SPSData()
 {
   PodZero(this);
   // Default values when they aren't defined as per ITU-T H.264 (2014/02).
   chroma_format_idc = 1;
@@ -203,11 +158,11 @@
     if (aLength == 0 || (*aPtr & 0x1f) != H264_NAL_SPS) {
       return;
     }
     mDecodedNAL = H264::DecodeNALUnit(aPtr, aLength);
     if (mDecodedNAL) {
-      mLength = GetBitLength(mDecodedNAL);
+      mLength = BitReader::GetBitLength(mDecodedNAL);
     }
   }
 
   SPSNAL() { }
 
@@ -388,10 +343,44 @@
     lastbytes = (lastbytes << 8) | byte;
   }
   return rbsp.forget();
 }
 
+// The reverse of DecodeNALUnit. To allow the distinction between Annex B (that
+// uses 0x000001 as marker) and AVCC, the pattern 0x00 0x00 0x0n (where n is
+// between 0 and 3) can't be found in the bytestream. A 0x03 byte is inserted
+// after the second 0. Eg. 0x00 0x00 0x00 becomes 0x00 0x00 0x03 0x00
+/* static */ already_AddRefed<mozilla::MediaByteBuffer>
+H264::EncodeNALUnit(const uint8_t* aNAL, size_t aLength)
+{
+  MOZ_ASSERT(aNAL);
+  RefPtr<MediaByteBuffer> rbsp = new MediaByteBuffer();
+  BufferReader reader(aNAL, aLength);
+
+  auto res = reader.ReadU8();
+  if (res.isErr()) {
+    return rbsp.forget();
+  }
+  rbsp->AppendElement(res.unwrap());
+
+  res = reader.ReadU8();
+  if (res.isErr()) {
+    return rbsp.forget();
+  }
+  rbsp->AppendElement(res.unwrap());
+
+  while((res = reader.ReadU8()).isOk()) {
+    uint8_t val = res.unwrap();
+    if (val <= 0x03 && rbsp->ElementAt(rbsp->Length() - 2) == 0 &&
+        rbsp->ElementAt(rbsp->Length() - 1) == 0) {
+      rbsp->AppendElement(0x03);
+    }
+    rbsp->AppendElement(val);
+  }
+  return rbsp.forget();
+}
+
 static int32_t
 ConditionDimension(float aValue)
 {
   // This will exclude NaNs and too-big values.
   if (aValue > 1.0 && aValue <= INT32_MAX)
@@ -403,11 +392,11 @@
 H264::DecodeSPS(const mozilla::MediaByteBuffer* aSPS, SPSData& aDest)
 {
   if (!aSPS) {
     return false;
   }
-  BitReader br(aSPS, GetBitLength(aSPS));
+  BitReader br(aSPS, BitReader::GetBitLength(aSPS));
 
   aDest.profile_idc = br.ReadBits(8);
   aDest.constraint_set0_flag = br.ReadBit();
   aDest.constraint_set1_flag = br.ReadBit();
   aDest.constraint_set2_flag = br.ReadBit();
@@ -1063,9 +1052,104 @@
   } while(br.PeekU8().isOk() && br.PeekU8().unwrap() != 0x80); // more_rbsp_data() msg[offset] != 0x80
   // ignore the trailing bits rbsp_trailing_bits();
   return false;
 }
 
+/*static */ already_AddRefed<mozilla::MediaByteBuffer>
+H264::CreateExtraData(uint8_t aProfile,
+                      uint8_t aConstraints,
+                      uint8_t aLevel,
+                      const gfx::IntSize& aSize)
+{
+  // SPS of a 144p video.
+  const uint8_t originSPS[] = { 0x4d, 0x40, 0x0c, 0xe8, 0x80, 0x80, 0x9d,
+                                0x80, 0xb5, 0x01, 0x01, 0x01, 0x40, 0x00,
+                                0x00, 0x00, 0x40, 0x00, 0x00, 0x0f, 0x03,
+                                0xc5, 0x0a, 0x44, 0x80 };
+
+  RefPtr<MediaByteBuffer> extraData = new MediaByteBuffer();
+  extraData->AppendElements(originSPS, sizeof(originSPS));
+  BitReader br(extraData, BitReader::GetBitLength(extraData));
+
+  RefPtr<MediaByteBuffer> sps = new MediaByteBuffer();
+  BitWriter bw(sps);
+
+  br.ReadBits(8); // Skip original profile_idc
+  bw.WriteU8(aProfile);
+  br.ReadBits(8); // Skip original constraint flags && reserved_zero_2bits
+  aConstraints = aConstraints & ~0x3; // Ensure reserved_zero_2bits are set to 0
+  bw.WriteBits(aConstraints, 8);
+  br.ReadBits(8); // Skip original level_idc
+  bw.WriteU8(aLevel);
+  bw.WriteUE(br.ReadUE()); // seq_parameter_set_id (0 stored on 1 bit)
+
+  if (aProfile == 100 || aProfile == 110 || aProfile == 122 ||
+      aProfile == 244 || aProfile == 44 || aProfile == 83 || aProfile == 86 ||
+      aProfile == 118 || aProfile == 128 || aProfile == 138 ||
+      aProfile == 139 || aProfile == 134) {
+    bw.WriteUE(1); // chroma_format_idc -> always set to 4:2:0 chroma format
+    bw.WriteUE(0); // bit_depth_luma_minus8 -> always 8 bits here
+    bw.WriteUE(0); // bit_depth_chroma_minus8 -> always 8 bits here
+  }
+
+  bw.WriteBits(br.ReadBits(11),
+               11); // log2_max_frame_num to gaps_in_frame_num_allowed_flag
+
+  // skip over original exp-golomb encoded width/height
+  br.ReadUE(); // skip width
+  br.ReadUE(); // skip height
+  uint32_t width = aSize.width;
+  uint32_t widthNeeded = width % 16 != 0 ? (width / 16 + 1) * 16 : width;
+  uint32_t height = aSize.height;
+  uint32_t heightNeeded = height % 16 != 0 ? (height / 16 + 1) * 16 : height;
+  bw.WriteUE(widthNeeded / 16 - 1);
+  bw.WriteUE(heightNeeded / 16 - 1);
+  bw.WriteBit(br.ReadBit()); // write frame_mbs_only_flag
+  bw.WriteBit(br.ReadBit()); // write direct_8x8_inference_flag;
+  if (widthNeeded != width || heightNeeded != height) {
+    // Write cropping value
+    bw.WriteBit(true);                       // skip frame_cropping_flag
+    bw.WriteUE(0);                           // frame_crop_left_offset
+    bw.WriteUE((widthNeeded - width) / 2);   // frame_crop_right_offset
+    bw.WriteUE(0);                           // frame_crop_top_offset
+    bw.WriteUE((heightNeeded - height) / 2); // frame_crop_bottom_offset
+  } else {
+    bw.WriteBit(false); // skip frame_cropping_flag
+  }
+  br.ReadBit(); // skip frame_cropping_flag;
+  // Write the remainings of the original sps (vui_parameters which sets an
+  // aspect ration of 1.0)
+  while (br.BitsLeft()) {
+    bw.WriteBit(br.ReadBit());
+  }
+  bw.CloseWithRbspTrailing();
+
+  RefPtr<MediaByteBuffer> encodedSPS =
+    EncodeNALUnit(sps->Elements(), sps->Length());
+  extraData->Clear();
+  extraData->AppendElement(1);
+  extraData->AppendElement(aProfile);
+  extraData->AppendElement(aConstraints);
+  extraData->AppendElement(aLevel);
+  extraData->AppendElement(3); // nalLENSize-1
+  extraData->AppendElement(1); // numPPS
+  uint8_t c[2];
+  mozilla::BigEndian::writeUint16(&c[0], encodedSPS->Length() + 1);
+  extraData->AppendElements(c, 2);
+  extraData->AppendElement((0x00 << 7) | (0x3 << 5 ) | H264_NAL_SPS);
+  extraData->AppendElements(*encodedSPS);
+
+  const uint8_t PPS[] = { 0xeb, 0xef, 0x20 };
+
+  extraData->AppendElement(1); // numPPS
+  mozilla::BigEndian::writeUint16(&c[0], sizeof(PPS) + 1);
+  extraData->AppendElements(c, 2);
+  extraData->AppendElement((0x00 << 7) | (0x3 << 5 ) | H264_NAL_PPS);
+  extraData->AppendElements(PPS, sizeof(PPS));
+
+  return extraData.forget();
+}
+
 #undef READUE
 #undef READSE
 
 } // namespace mozilla
diff --git a/dom/media/platforms/wmf/DXVA2Manager.cpp b/dom/media/platforms/wmf/DXVA2Manager.cpp
--- a/dom/media/platforms/wmf/DXVA2Manager.cpp
+++ b/dom/media/platforms/wmf/DXVA2Manager.cpp
@@ -650,11 +650,11 @@
   RefPtr<layers::SyncObjectClient> mSyncObject;
   GUID mDecoderGUID;
   uint32_t mWidth = 0;
   uint32_t mHeight = 0;
   UINT mDeviceManagerToken = 0;
-  bool mConfiuredForSize = false;
+  bool mConfiguredForSize = false;
 };
 
 bool
 D3D11DXVA2Manager::SupportsConfig(IMFMediaType* aType, float aFramerate)
 {
@@ -1090,11 +1090,11 @@
 }
 
 HRESULT
 D3D11DXVA2Manager::ConfigureForSize(uint32_t aWidth, uint32_t aHeight)
 {
-  if (mConfiuredForSize && aWidth == mWidth && aHeight == mHeight) {
+  if (mConfiguredForSize && aWidth == mWidth && aHeight == mHeight) {
     // If the size hasn't changed, don't reconfigure.
     return S_OK;
   }
 
   mWidth = aWidth;
@@ -1146,11 +1146,11 @@
     hr =
       mTransform->SetMediaTypes(inputType, outputType, ConfigureOutput, &size);
   });
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
 
-  mConfiuredForSize = true;
+  mConfiguredForSize = true;
 
   return S_OK;
 }
 
 bool
diff --git a/dom/media/platforms/wmf/WMFDecoderModule.cpp b/dom/media/platforms/wmf/WMFDecoderModule.cpp
--- a/dom/media/platforms/wmf/WMFDecoderModule.cpp
+++ b/dom/media/platforms/wmf/WMFDecoderModule.cpp
@@ -29,10 +29,12 @@
 #include "nsServiceManagerUtils.h"
 #include "nsWindowsHelpers.h"
 #include "prsystem.h"
 #include "nsIXULRuntime.h"
 #include "mozilla/mscom/EnsureMTA.h"
+#include <algorithm>
+#include <vector>
 
 extern const GUID CLSID_WebmMfVpxDec;
 extern const GUID CLSID_AMDWebmMfVp9Dec;
 
 namespace mozilla {
@@ -202,10 +204,21 @@
   }
 
   if ((aTrackInfo.mMimeType.EqualsLiteral("audio/mp4a-latm") ||
        aTrackInfo.mMimeType.EqualsLiteral("audio/mp4")) &&
        WMFDecoderModule::HasAAC()) {
+    const auto audioInfo = aTrackInfo.GetAsAudioInfo();
+    if (audioInfo && audioInfo->mRate > 0) {
+      // Supported sampling rates per:
+      // https://msdn.microsoft.com/en-us/library/windows/desktop/dd742784(v=vs.85).aspx
+      const std::vector<uint32_t> frequencies = {
+        8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000,
+      };
+      return std::find(frequencies.begin(),
+                       frequencies.end(),
+                       audioInfo->mRate) != frequencies.end();
+    }
     return true;
   }
   if (MP4Decoder::IsH264(aTrackInfo.mMimeType) && WMFDecoderModule::HasH264()) {
     return true;
   }
diff --git a/dom/media/platforms/wrappers/H264Converter.cpp b/dom/media/platforms/wrappers/H264Converter.cpp
--- a/dom/media/platforms/wrappers/H264Converter.cpp
+++ b/dom/media/platforms/wrappers/H264Converter.cpp
@@ -227,11 +227,18 @@
 H264Converter::IsHardwareAccelerated(nsACString& aFailureReason) const
 {
   if (mDecoder) {
     return mDecoder->IsHardwareAccelerated(aFailureReason);
   }
+#ifdef MOZ_APPLEMEDIA
+  // On mac, we can assume H264 is hardware accelerated for now.
+  // This allows MediaCapabilities to report that playback will be smooth.
+  // Which will always be.
+  return true;
+#else
   return MediaDataDecoder::IsHardwareAccelerated(aFailureReason);
+#endif
 }
 
 void
 H264Converter::SetSeekThreshold(const media::TimeUnit& aTime)
 {
diff --git a/dom/media/systemservices/MediaUtils.h b/dom/media/systemservices/MediaUtils.h
--- a/dom/media/systemservices/MediaUtils.h
+++ b/dom/media/systemservices/MediaUtils.h
@@ -5,16 +5,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_MediaUtils_h
 #define mozilla_MediaUtils_h
 
-#include "AutoTaskQueue.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/SharedThreadPool.h"
+#include "mozilla/TaskQueue.h"
 #include "mozilla/UniquePtr.h"
 #include "nsCOMPtr.h"
 #include "nsIAsyncShutdown.h"
 #include "nsISupportsImpl.h"
 #include "nsThreadUtils.h"
@@ -436,14 +436,13 @@
   already_AddRefed<nsIEventTarget> aPool,
   RefPtr<MozPromise<ResolveValueType, RejectValueType, true>> aPromise,
   ResolveFunction&& aResolveFunction,
   RejectFunction&& aRejectFunction)
 {
-  RefPtr<AutoTaskQueue> taskQueue =
-    new AutoTaskQueue(std::move(aPool), "MozPromiseAwait");
-  // We can't use a Monitor allocated on the stack (see bug 1426067)
-  Monitor& mon = taskQueue->Monitor();
+  RefPtr<TaskQueue> taskQueue =
+    new TaskQueue(std::move(aPool), "MozPromiseAwait");
+  Monitor mon(__func__);
   bool done = false;
 
   aPromise->Then(taskQueue,
                  __func__,
                  [&](ResolveValueType&& aResolveValue) {
@@ -469,14 +468,13 @@
 typename MozPromise<ResolveValueType, RejectValueType, Excl>::
   ResolveOrRejectValue
 Await(already_AddRefed<nsIEventTarget> aPool,
       RefPtr<MozPromise<ResolveValueType, RejectValueType, Excl>> aPromise)
 {
-  RefPtr<AutoTaskQueue> taskQueue =
-    new AutoTaskQueue(std::move(aPool), "MozPromiseAwait");
-  // We can't use a Monitor allocated on the stack (see bug 1426067)
-  Monitor& mon = taskQueue->Monitor();
+  RefPtr<TaskQueue> taskQueue =
+    new TaskQueue(std::move(aPool), "MozPromiseAwait");
+  Monitor mon(__func__);
   bool done = false;
 
   typename MozPromise<ResolveValueType, RejectValueType, Excl>::ResolveOrRejectValue val;
   aPromise->Then(taskQueue,
                  __func__,
@@ -516,14 +514,16 @@
          ResolveFunction&& aResolveFunction,
          RejectFunction&& aRejectFunction)
 {
   typedef MozPromise<ResolveValueType, RejectValueType, true> Promise;
   RefPtr<nsIEventTarget> pool = aPool;
-  RefPtr<AutoTaskQueue> taskQueue =
-    new AutoTaskQueue(do_AddRef(pool), "MozPromiseAwaitAll");
-  RefPtr<typename Promise::AllPromiseType> p = Promise::All(taskQueue, aPromises);
-  Await(pool.forget(), p, std::move(aResolveFunction), std::move(aRejectFunction));
+  RefPtr<TaskQueue> taskQueue =
+    new TaskQueue(do_AddRef(pool), "MozPromiseAwaitAll");
+  RefPtr<typename Promise::AllPromiseType> p =
+    Promise::All(taskQueue, aPromises);
+  Await(
+    pool.forget(), p, std::move(aResolveFunction), std::move(aRejectFunction));
 }
 
 // Note: only works with exclusive MozPromise, as Promise::All would attempt
 // to perform copy of nsTArrays which are disallowed.
 template<typename ResolveValueType, typename RejectValueType>
@@ -534,12 +534,12 @@
          nsTArray<RefPtr<MozPromise<ResolveValueType, RejectValueType, true>>>&
            aPromises)
 {
   typedef MozPromise<ResolveValueType, RejectValueType, true> Promise;
   RefPtr<nsIEventTarget> pool = aPool;
-  RefPtr<AutoTaskQueue> taskQueue =
-    new AutoTaskQueue(do_AddRef(pool), "MozPromiseAwaitAll");
+  RefPtr<TaskQueue> taskQueue =
+    new TaskQueue(do_AddRef(pool), "MozPromiseAwaitAll");
   RefPtr<typename Promise::AllPromiseType> p =
     Promise::All(taskQueue, aPromises);
   return Await(pool.forget(), p);
 }
 
diff --git a/dom/media/wave/WaveDecoder.h b/dom/media/wave/WaveDecoder.h
--- a/dom/media/wave/WaveDecoder.h
+++ b/dom/media/wave/WaveDecoder.h
@@ -4,20 +4,26 @@
  * License, v. 2.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 !defined(WaveDecoder_h_)
 #define WaveDecoder_h_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class WaveDecoder
 {
 public:
   // Returns true if the Wave backend is pref'ed on, and we're running on a
   // platform that is likely to have decoders for the format.
   static bool IsSupportedType(const MediaContainerType& aContainerType);
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/wave/WaveDecoder.cpp b/dom/media/wave/WaveDecoder.cpp
--- a/dom/media/wave/WaveDecoder.cpp
+++ b/dom/media/wave/WaveDecoder.cpp
@@ -27,6 +27,31 @@
   }
 
   return false;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+WaveDecoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  if (!IsSupportedType(aType)) {
+    return tracks;
+  }
+
+  const MediaCodecs& codecs = aType.ExtendedType().Codecs();
+  if (codecs.IsEmpty()) {
+    tracks.AppendElement(
+      CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+        NS_LITERAL_CSTRING("audio/x-wav"), aType));
+    return tracks;
+  }
+
+  for (const auto& codec : codecs.Range()) {
+    tracks.AppendElement(
+      CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+        NS_LITERAL_CSTRING("audio/wave; codecs=") + NS_ConvertUTF16toUTF8(codec),
+        aType));
+  }
+  return tracks;
+}
+
 } // namespace mozilla
diff --git a/dom/media/webm/WebMDecoder.h b/dom/media/webm/WebMDecoder.h
--- a/dom/media/webm/WebMDecoder.h
+++ b/dom/media/webm/WebMDecoder.h
@@ -4,23 +4,33 @@
  * License, v. 2.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 !defined(WebMDecoder_h_)
 #define WebMDecoder_h_
 
+#include "mozilla/UniquePtr.h"
+#include "nsTArray.h"
+
 namespace mozilla {
 
 class MediaContainerType;
+class TrackInfo;
 
 class WebMDecoder
 {
 public:
 
   // Returns true if aContainerType is a WebM type that we think we can render
   // with an enabled platform decoder backend.
   // If provided, codecs are checked for support.
   static bool IsSupportedType(const MediaContainerType& aContainerType);
 
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType);
+private:
+  static nsTArray<UniquePtr<TrackInfo>> GetTracksInfo(
+    const MediaContainerType& aType,
+    MediaResult& aError);
 };
 
 } // namespace mozilla
 
 #endif
diff --git a/dom/media/webm/WebMDecoder.cpp b/dom/media/webm/WebMDecoder.cpp
--- a/dom/media/webm/WebMDecoder.cpp
+++ b/dom/media/webm/WebMDecoder.cpp
@@ -3,10 +3,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/. */
 
 #include "WebMDecoder.h"
+#include "mozilla/Move.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/StaticPrefs.h"
 #ifdef MOZ_AV1
 #include "AOMDecoder.h"
 #endif
@@ -14,72 +15,110 @@
 #include "PDMFactory.h"
 #include "VideoUtils.h"
 
 namespace mozilla {
 
-/* static */
-bool
-WebMDecoder::IsSupportedType(const MediaContainerType& aContainerType)
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+WebMDecoder::GetTracksInfo(const MediaContainerType& aType, MediaResult& aError)
 {
-  if (!Preferences::GetBool("media.webm.enabled")) {
-    return false;
-  }
+  nsTArray<UniquePtr<TrackInfo>> tracks;
+  const bool isVideo = aType.Type() == MEDIAMIMETYPE("video/webm");
 
-  bool isVideo = aContainerType.Type() == MEDIAMIMETYPE("video/webm");
-  if (aContainerType.Type() != MEDIAMIMETYPE("audio/webm") && !isVideo) {
-    return false;
+  if (aType.Type() != MEDIAMIMETYPE("audio/webm") && !isVideo) {
+    aError = MediaResult(
+      NS_ERROR_DOM_MEDIA_FATAL_ERR,
+      RESULT_DETAIL("Invalid type:%s", aType.Type().AsString().get()));
+    return tracks;
   }
 
-  const MediaCodecs& codecs = aContainerType.ExtendedType().Codecs();
+  aError = NS_OK;
+
+  const MediaCodecs& codecs = aType.ExtendedType().Codecs();
   if (codecs.IsEmpty()) {
-    // WebM guarantees that the only codecs it contained are vp8, vp9, opus or vorbis.
-    return true;
+    return tracks;
   }
-  // Verify that all the codecs specified are ones that we expect that
-  // we can play.
+
   for (const auto& codec : codecs.Range()) {
     if (codec.EqualsLiteral("opus") || codec.EqualsLiteral("vorbis")) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("audio/") + NS_ConvertUTF16toUTF8(codec), aType));
       continue;
     }
-    // Note: Only accept VP8/VP9 in a video container type, not in an audio
-    // container type.
-
     if (isVideo) {
       UniquePtr<TrackInfo> trackInfo;
-      if (IsVP9CodecString(codec))  {
+      if (IsVP9CodecString(codec)) {
         trackInfo = CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-          NS_LITERAL_CSTRING("video/vp9"), aContainerType);
+          NS_LITERAL_CSTRING("video/vp9"), aType);
       } else if (IsVP8CodecString(codec)) {
         trackInfo = CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
-          NS_LITERAL_CSTRING("video/vp8"), aContainerType);
+          NS_LITERAL_CSTRING("video/vp8"), aType);
       }
-      // If it is vp8 or vp9, check the bit depth.
       if (trackInfo) {
         uint8_t profile = 0;
         uint8_t level = 0;
         uint8_t bitDepth = 0;
         if (ExtractVPXCodecDetails(codec, profile, level, bitDepth)) {
           trackInfo->GetAsVideoInfo()->mBitDepth = bitDepth;
-
-          // Verify that we have a PDM that supports this bit depth.
-          RefPtr<PDMFactory> platform = new PDMFactory();
-          if (!platform->Supports(*trackInfo, nullptr)) {
-            return false;
-          }
         }
+        tracks.AppendElement(std::move(trackInfo));
         continue;
       }
     }
 #ifdef MOZ_AV1
-    if (isVideo && StaticPrefs::MediaAv1Enabled() &&
-        AOMDecoder::IsSupportedCodec(codec)) {
+    if (AOMDecoder::IsSupportedCodec(codec)) {
+      tracks.AppendElement(
+        CreateTrackInfoWithMIMETypeAndContainerTypeExtraParameters(
+          NS_LITERAL_CSTRING("video/av1"), aType));
       continue;
     }
 #endif
-    // Some unsupported codec.
+    // Unknown codec
+    aError =
+      MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
+                  RESULT_DETAIL("Unknown codec:%s",
+                                NS_ConvertUTF16toUTF8(codec).get()));
+  }
+  return tracks;
+}
+
+/* static */
+bool
+WebMDecoder::IsSupportedType(const MediaContainerType& aContainerType)
+{
+  if (!Preferences::GetBool("media.webm.enabled")) {
     return false;
   }
+
+  MediaResult rv = NS_OK;
+  auto tracks = GetTracksInfo(aContainerType, rv);
+
+  if (NS_FAILED(rv)) {
+    return false;
+  }
+
+  if (tracks.IsEmpty()) {
+    // WebM guarantees that the only codecs it contained are vp8, vp9, opus or vorbis.
+    return true;
+  }
+
+  // Verify that we have a PDM that supports the whitelisted types, include
+  // bitdepth
+  RefPtr<PDMFactory> platform = new PDMFactory();
+  for (const auto& track : tracks) {
+    if (!track || !platform->Supports(*track, nullptr /* diagnostic */)) {
+      return false;
+    }
+  }
+
   return true;
 }
 
+/* static */ nsTArray<UniquePtr<TrackInfo>>
+WebMDecoder::GetTracksInfo(const MediaContainerType& aType)
+{
+  MediaResult rv = NS_OK;
+  return GetTracksInfo(aType, rv);
+}
+
 } // namespace mozilla
 
diff --git a/dom/moz.build b/dom/moz.build
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -37,10 +37,11 @@
     'bindings',
     'battery',
     'browser-element',
     'cache',
     'canvas',
+    'webgpu',
     'chrome-webidl',
     'clients',
     'commandhandler',
     'credentialmanagement',
     'crypto',
diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h
--- a/dom/plugins/base/npapi.h
+++ b/dom/plugins/base/npapi.h
@@ -277,10 +277,22 @@
                                  // to NPPSetValue.
 } NPAudioDeviceChangeDetails;
 
 #endif /* XP_WIN */
 
+/*
+ * This is the value of the NPNVaudioDeviceStateChanged variable.
+ */
+typedef struct _NPAudioDeviceStateChanged
+{
+  /* Name of device that changed state.  This string is only valid during
+   * the call to NPPSetValue.
+   */
+  const wchar_t* device;
+  uint32_t newState;
+} NPAudioDeviceStateChanged;
+
 typedef enum {
   NPDrawingModelDUMMY
 #if defined(XP_MACOSX)
 #ifndef NP_NO_QUICKDRAW
   , NPDrawingModelQuickDraw = 0
@@ -466,10 +478,11 @@
                                                     Cocoa text input specification. */
 #endif
   , NPNVmuteAudioBool = 4000 /* Request that the browser wants to mute or unmute the plugin */
 #if defined(XP_WIN)
   , NPNVaudioDeviceChangeDetails = 4001 /* Provides information about the new default audio device */
+  , NPNVaudioDeviceStateChanged = 4002 /* Provides information if any audio device changes state */
 #endif
 #if defined(XP_MACOSX)
   , NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
                                                                CA model compositing */
 #endif
diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp
--- a/dom/plugins/base/nsPluginInstanceOwner.cpp
+++ b/dom/plugins/base/nsPluginInstanceOwner.cpp
@@ -417,11 +417,11 @@
 
   if (content->IsEditable()) {
     return NS_OK;
   }
 
-  nsIDocument *doc = content->GetUncomposedDoc();
+  nsIDocument *doc = content->GetComposedDoc();
   if (!doc) {
     return NS_ERROR_FAILURE;
   }
 
   nsPresContext* presContext = doc->GetPresContext();
diff --git a/dom/plugins/base/nsPluginNativeWindowWin.cpp b/dom/plugins/base/nsPluginNativeWindowWin.cpp
--- a/dom/plugins/base/nsPluginNativeWindowWin.cpp
+++ b/dom/plugins/base/nsPluginNativeWindowWin.cpp
@@ -355,23 +355,27 @@
                                     LONG_PTR dwNewLong);
 typedef LONG_PTR
   (WINAPI *User32SetWindowLongPtrW)(HWND hWnd,
                                     int nIndex,
                                     LONG_PTR dwNewLong);
-static User32SetWindowLongPtrA sUser32SetWindowLongAHookStub = nullptr;
-static User32SetWindowLongPtrW sUser32SetWindowLongWHookStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongPtrA>
+  sUser32SetWindowLongAHookStub;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongPtrW>
+  sUser32SetWindowLongWHookStub;
 #else
 typedef LONG
 (WINAPI *User32SetWindowLongA)(HWND hWnd,
                                int nIndex,
                                LONG dwNewLong);
 typedef LONG
 (WINAPI *User32SetWindowLongW)(HWND hWnd,
                                int nIndex,
                                LONG dwNewLong);
-static User32SetWindowLongA sUser32SetWindowLongAHookStub = nullptr;
-static User32SetWindowLongW sUser32SetWindowLongWHookStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongA>
+  sUser32SetWindowLongAHookStub;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongW>
+  sUser32SetWindowLongWHookStub;
 #endif
 static inline bool
 SetWindowLongHookCheck(HWND hWnd,
                        int nIndex,
                        LONG_PTR newLong)
@@ -446,27 +450,19 @@
 static void
 HookSetWindowLongPtr()
 {
   sUser32Intercept.Init("user32.dll");
 #ifdef _WIN64
-  if (!sUser32SetWindowLongAHookStub)
-    sUser32Intercept.AddHook("SetWindowLongPtrA",
-                             reinterpret_cast<intptr_t>(SetWindowLongPtrAHook),
-                             (void**) &sUser32SetWindowLongAHookStub);
-  if (!sUser32SetWindowLongWHookStub)
-    sUser32Intercept.AddHook("SetWindowLongPtrW",
-                             reinterpret_cast<intptr_t>(SetWindowLongPtrWHook),
-                             (void**) &sUser32SetWindowLongWHookStub);
+  sUser32SetWindowLongAHookStub.Set(sUser32Intercept, "SetWindowLongPtrA",
+                                    &SetWindowLongPtrAHook);
+  sUser32SetWindowLongWHookStub.Set(sUser32Intercept, "SetWindowLongPtrW",
+                                    &SetWindowLongPtrWHook);
 #else
-  if (!sUser32SetWindowLongAHookStub)
-    sUser32Intercept.AddHook("SetWindowLongA",
-                             reinterpret_cast<intptr_t>(SetWindowLongAHook),
-                             (void**) &sUser32SetWindowLongAHookStub);
-  if (!sUser32SetWindowLongWHookStub)
-    sUser32Intercept.AddHook("SetWindowLongW",
-                             reinterpret_cast<intptr_t>(SetWindowLongWHook),
-                             (void**) &sUser32SetWindowLongWHookStub);
+  sUser32SetWindowLongAHookStub.Set(sUser32Intercept, "SetWindowLongA",
+                                    &SetWindowLongAHook);
+  sUser32SetWindowLongWHookStub.Set(sUser32Intercept, "SetWindowLongW",
+                                    &SetWindowLongWHook);
 #endif
 }
 
 /**
  *   nsPluginNativeWindowWin implementation
diff --git a/dom/plugins/ipc/FunctionHook.h b/dom/plugins/ipc/FunctionHook.h
--- a/dom/plugins/ipc/FunctionHook.h
+++ b/dom/plugins/ipc/FunctionHook.h
@@ -7,10 +7,11 @@
 #ifndef dom_plugins_ipc_functionhook_h
 #define dom_plugins_ipc_functionhook_h 1
 
 #include "IpdlTuple.h"
 #include "base/process.h"
+#include "mozilla/Atomics.h"
 
 #if defined(XP_WIN)
 #include "nsWindowsDllInterceptor.h"
 #endif
 
@@ -94,16 +95,23 @@
 typedef bool(ShouldHookFunc)(int aQuirks);
 
 template<FunctionHookId functionId, typename FunctionType>
 class BasicFunctionHook : public FunctionHook
 {
+#if defined(XP_WIN)
+  using FuncHookType = WindowsDllInterceptor::FuncHookType<FunctionType*>;
+#endif // defined(XP_WIN)
+
 public:
   BasicFunctionHook(const char* aModuleName,
                     const char* aFunctionName, FunctionType* aOldFunction,
-                    FunctionType* aNewFunction) :
-    mOldFunction(aOldFunction), mRegistration(UNREGISTERED), mModuleName(aModuleName),
-    mFunctionName(aFunctionName), mNewFunction(aNewFunction)
+                    FunctionType* aNewFunction)
+    : mOldFunction(aOldFunction)
+    , mRegistration(UNREGISTERED)
+    , mModuleName(aModuleName)
+    , mFunctionName(aFunctionName)
+    , mNewFunction(aNewFunction)
   {
     MOZ_ASSERT(mOldFunction);
     MOZ_ASSERT(mNewFunction);
   }
 
@@ -126,11 +134,14 @@
 
 protected:
   // Once the function is hooked, this field will take the value of a pointer to
   // a function that performs the old behavior.  Before that, it is a pointer to
   // the original function.
-  FunctionType* mOldFunction;
+  Atomic<FunctionType*> mOldFunction;
+#if defined(XP_WIN)
+  FuncHookType mStub;
+#endif // defined(XP_WIN)
 
   enum RegistrationStatus { UNREGISTERED, FAILED, SUCCEEDED };
   RegistrationStatus mRegistration;
 
   // The name of the module containing the function to hook.  E.g. "user32.dll".
@@ -168,18 +179,20 @@
     FunctionHook::GetDllInterceptorFor(mModuleName.Data());
   if (!dllInterceptor) {
     return false;
   }
 
-  isHooked =
-    dllInterceptor->AddHook(mFunctionName.Data(), reinterpret_cast<intptr_t>(mNewFunction),
-                            reinterpret_cast<void**>(&mOldFunction));
+  isHooked = mStub.Set(*dllInterceptor, mFunctionName.Data(), mNewFunction);
 #endif
 
   if (isHooked) {
+#if defined(XP_WIN)
+    mOldFunction = mStub.GetStub();
+#endif
     mRegistration = SUCCEEDED;
   }
+
   HOOK_LOG(LogLevel::Debug,
            ("Registering to intercept function '%s' : '%s'", mFunctionName.Data(),
             SuccessMsg(isHooked)));
 
   return isHooked;
diff --git a/dom/plugins/ipc/FunctionHook.cpp b/dom/plugins/ipc/FunctionHook.cpp
--- a/dom/plugins/ipc/FunctionHook.cpp
+++ b/dom/plugins/ipc/FunctionHook.cpp
@@ -166,17 +166,17 @@
 typedef HANDLE (WINAPI *CreateFileWPtr)(LPCWSTR aFname, DWORD aAccess,
                                         DWORD aShare,
                                         LPSECURITY_ATTRIBUTES aSecurity,
                                         DWORD aCreation, DWORD aFlags,
                                         HANDLE aFTemplate);
-static CreateFileWPtr sCreateFileWStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<CreateFileWPtr> sCreateFileWStub;
 typedef HANDLE (WINAPI *CreateFileAPtr)(LPCSTR aFname, DWORD aAccess,
                                         DWORD aShare,
                                         LPSECURITY_ATTRIBUTES aSecurity,
                                         DWORD aCreation, DWORD aFlags,
                                         HANDLE aFTemplate);
-static CreateFileAPtr sCreateFileAStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<CreateFileAPtr> sCreateFileAStub;
 
 // Windows 8 RTM (kernelbase's version is 6.2.9200.16384) doesn't call
 // CreateFileW from CreateFileA.
 // So we hook CreateFileA too to use CreateFileW hook.
 static HANDLE WINAPI
@@ -261,11 +261,11 @@
     HANDLE replacement =
       sCreateFileWStub(tempFile, GENERIC_READ | GENERIC_WRITE, aShare,
                        aSecurity, TRUNCATE_EXISTING,
                        FILE_ATTRIBUTE_TEMPORARY |
                          FILE_FLAG_DELETE_ON_CLOSE,
-                       NULL);
+                       nullptr);
     if (replacement == INVALID_HANDLE_VALUE) {
       break;
     }
 
     HANDLE original = sCreateFileWStub(aFname, aAccess, aShare, aSecurity,
@@ -298,27 +298,16 @@
                           aFTemplate);
 }
 
 void FunctionHook::HookProtectedMode()
 {
-  // Make sure we only do this once.
-  static bool sRunOnce = false;
-  if (sRunOnce) {
-    return;
-  }
-  sRunOnce = true;
-
   // Legacy code.  Uses the nsWindowsDLLInterceptor directly instead of
   // using the FunctionHook
   sKernel32Intercept.Init("kernel32.dll");
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Plugin);
-  sKernel32Intercept.AddHook("CreateFileW",
-                             reinterpret_cast<intptr_t>(CreateFileWHookFn),
-                             (void**) &sCreateFileWStub);
-  sKernel32Intercept.AddHook("CreateFileA",
-                             reinterpret_cast<intptr_t>(CreateFileAHookFn),
-                             (void**) &sCreateFileAStub);
+  sCreateFileWStub.Set(sKernel32Intercept, "CreateFileW", &CreateFileWHookFn);
+  sCreateFileAStub.Set(sKernel32Intercept, "CreateFileA", &CreateFileAHookFn);
 }
 
 #endif // defined(XP_WIN)
 
 #define FUN_HOOK(x) static_cast<FunctionHook*>(x)
diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl
--- a/dom/plugins/ipc/PPluginModule.ipdl
+++ b/dom/plugins/ipc/PPluginModule.ipdl
@@ -13,10 +13,11 @@
 using NPNVariable from "npapi.h";
 using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 using class mac_plugin_interposing::NSCursorInfo from "mozilla/plugins/PluginMessageUtils.h";
 using struct nsID from "nsID.h";
 using struct mozilla::plugins::NPAudioDeviceChangeDetailsIPC from "mozilla/plugins/PluginMessageUtils.h";
+using struct mozilla::plugins::NPAudioDeviceStateChangedIPC from "mozilla/plugins/PluginMessageUtils.h";
 
 namespace mozilla {
 namespace plugins {
 
 struct PluginSettings
@@ -91,10 +92,11 @@
     returns (NativeThreadId tid);
 
   async SettingChanged(PluginSettings settings);
 
   async NPP_SetValue_NPNVaudioDeviceChangeDetails(NPAudioDeviceChangeDetailsIPC changeDetails);
+  async NPP_SetValue_NPNVaudioDeviceStateChanged(NPAudioDeviceStateChangedIPC deviceState);
 
   async InitPluginModuleChild(Endpoint<PPluginModuleChild> endpoint);
 
   async InitPluginFunctionBroker(Endpoint<PFunctionBrokerChild> endpoint);
 
diff --git a/dom/plugins/ipc/PluginInstanceChild.h b/dom/plugins/ipc/PluginInstanceChild.h
--- a/dom/plugins/ipc/PluginInstanceChild.h
+++ b/dom/plugins/ipc/PluginInstanceChild.h
@@ -254,10 +254,11 @@
         const NativeEventData& aKeyEventData,
         const bool& aIsConsumed) override;
 
 #if defined(XP_WIN)
     NPError DefaultAudioDeviceChanged(NPAudioDeviceChangeDetails& details);
+    NPError AudioDeviceStateChanged(NPAudioDeviceStateChanged& aDeviceState);
 #endif
 
 private:
     friend class PluginModuleChild;
 
diff --git a/dom/plugins/ipc/PluginInstanceChild.cpp b/dom/plugins/ipc/PluginInstanceChild.cpp
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -71,25 +71,21 @@
                                             int nReserved,
                                             HWND hWnd,
                                             CONST RECT *prcRect);
 static WindowsDllInterceptor sUser32Intercept;
 static HWND sWinlessPopupSurrogateHWND = nullptr;
-static User32TrackPopupMenu sUser32TrackPopupMenuStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<User32TrackPopupMenu> sUser32TrackPopupMenuStub;
 
 static WindowsDllInterceptor sImm32Intercept;
-static decltype(ImmGetContext)* sImm32ImmGetContextStub = nullptr;
-static decltype(ImmGetCompositionStringW)* sImm32ImmGetCompositionStringStub =
-                                             nullptr;
-static decltype(ImmSetCandidateWindow)* sImm32ImmSetCandidateWindowStub =
-                                          nullptr;
-static decltype(ImmNotifyIME)* sImm32ImmNotifyIME = nullptr;
-static decltype(ImmAssociateContextEx)* sImm32ImmAssociateContextExStub =
-                                          nullptr;
+static WindowsDllInterceptor::FuncHookType<decltype(&ImmGetContext)> sImm32ImmGetContextStub;
+static WindowsDllInterceptor::FuncHookType<decltype(&ImmGetCompositionStringW)> sImm32ImmGetCompositionStringStub;
+static WindowsDllInterceptor::FuncHookType<decltype(&ImmSetCandidateWindow)> sImm32ImmSetCandidateWindowStub;
+static WindowsDllInterceptor::FuncHookType<decltype(&ImmNotifyIME)> sImm32ImmNotifyIME;
+static WindowsDllInterceptor::FuncHookType<decltype(&ImmAssociateContextEx)> sImm32ImmAssociateContextExStub;
+
 static PluginInstanceChild* sCurrentPluginInstance = nullptr;
 static const HIMC sHookIMC = (const HIMC)0xefefefef;
-static bool sPopupMenuHookSet;
-static bool sSetWindowLongHookSet;
 
 using mozilla::gfx::SharedDIB;
 
 // Flash WM_USER message delay time for PostDelayedTask. Borrowed
 // from Chromium's web plugin delegate src. See 'flash msg throttling
@@ -810,12 +806,20 @@
     if (!mPluginIface->setvalue) {
         return NPERR_GENERIC_ERROR;
     }
     return mPluginIface->setvalue(GetNPP(), NPNVaudioDeviceChangeDetails, (void*)&details);
 }
-#endif
 
+NPError
+PluginInstanceChild::AudioDeviceStateChanged(NPAudioDeviceStateChanged& aDeviceState)
+{
+  if (!mPluginIface->setvalue) {
+    return NPERR_GENERIC_ERROR;
+  }
+  return mPluginIface->setvalue(GetNPP(), NPNVaudioDeviceStateChanged, (void*)&aDeviceState);
+}
+#endif
 
 mozilla::ipc::IPCResult
 PluginInstanceChild::AnswerNPP_HandleEvent(const NPRemoteEvent& event,
                                            int16_t* handled)
 {
@@ -1783,23 +1787,23 @@
                                     LONG_PTR dwNewLong);
 typedef LONG_PTR
   (WINAPI *User32SetWindowLongPtrW)(HWND hWnd,
                                     int nIndex,
                                     LONG_PTR dwNewLong);
-static User32SetWindowLongPtrA sUser32SetWindowLongAHookStub = nullptr;
-static User32SetWindowLongPtrW sUser32SetWindowLongWHookStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongPtrA> sUser32SetWindowLongAHookStub;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongPtrW> sUser32SetWindowLongWHookStub;
 #else
 typedef LONG
 (WINAPI *User32SetWindowLongA)(HWND hWnd,
                                int nIndex,
                                LONG dwNewLong);
 typedef LONG
 (WINAPI *User32SetWindowLongW)(HWND hWnd,
                                int nIndex,
                                LONG dwNewLong);
-static User32SetWindowLongA sUser32SetWindowLongAHookStub = nullptr;
-static User32SetWindowLongW sUser32SetWindowLongWHookStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongA> sUser32SetWindowLongAHookStub;
+static WindowsDllInterceptor::FuncHookType<User32SetWindowLongW> sUser32SetWindowLongWHookStub;
 #endif
 
 extern LRESULT CALLBACK
 NeuteredWindowProc(HWND hwnd,
                    UINT uMsg,
@@ -1905,31 +1909,21 @@
 {
     if (!(GetQuirks() & QUIRK_FLASH_HOOK_SETLONGPTR)) {
         return;
     }
 
-    // Only pass through here once
-    if (sSetWindowLongHookSet) {
-        return;
-    }
-    sSetWindowLongHookSet = true;
-
     sUser32Intercept.Init("user32.dll");
 #ifdef _WIN64
-    if (!sUser32SetWindowLongAHookStub)
-        sUser32Intercept.AddHook("SetWindowLongPtrA", reinterpret_cast<intptr_t>(SetWindowLongPtrAHook),
-                                 (void**) &sUser32SetWindowLongAHookStub);
-    if (!sUser32SetWindowLongWHookStub)
-        sUser32Intercept.AddHook("SetWindowLongPtrW", reinterpret_cast<intptr_t>(SetWindowLongPtrWHook),
-                                 (void**) &sUser32SetWindowLongWHookStub);
+    sUser32SetWindowLongAHookStub.Set(sUser32Intercept, "SetWindowLongPtrA",
+                                      &SetWindowLongPtrAHook);
+    sUser32SetWindowLongWHookStub.Set(sUser32Intercept, "SetWindowLongPtrW",
+                                      &SetWindowLongPtrWHook);
 #else
-    if (!sUser32SetWindowLongAHookStub)
-        sUser32Intercept.AddHook("SetWindowLongA", reinterpret_cast<intptr_t>(SetWindowLongAHook),
-                                 (void**) &sUser32SetWindowLongAHookStub);
-    if (!sUser32SetWindowLongWHookStub)
-        sUser32Intercept.AddHook("SetWindowLongW", reinterpret_cast<intptr_t>(SetWindowLongWHook),
-                                 (void**) &sUser32SetWindowLongWHookStub);
+    sUser32SetWindowLongAHookStub.Set(sUser32Intercept, "SetWindowLongA",
+                                      &SetWindowLongAHook);
+    sUser32SetWindowLongWHookStub.Set(sUser32Intercept, "SetWindowLongW",
+                                      &SetWindowLongWHook);
 #endif
 }
 
 /* windowless track popup menu helpers */
 
@@ -1993,23 +1987,17 @@
 {
     if (!(GetQuirks() & QUIRK_WINLESS_TRACKPOPUP_HOOK)) {
         return;
     }
 
-    // Only pass through here once
-    if (sPopupMenuHookSet) {
-        return;
-    }
-    sPopupMenuHookSet = true;
-
     // Note, once WindowsDllInterceptor is initialized for a module,
     // it remains initialized for that particular module for it's
     // lifetime. Additional instances are needed if other modules need
     // to be hooked.
     sUser32Intercept.Init("user32.dll");
-    sUser32Intercept.AddHook("TrackPopupMenu", reinterpret_cast<intptr_t>(TrackPopupHookProc),
-                             (void**) &sUser32TrackPopupMenuStub);
+    sUser32TrackPopupMenuStub.Set(sUser32Intercept, "TrackPopupMenu",
+                                  &TrackPopupHookProc);
 }
 
 void
 PluginInstanceChild::CreateWinlessPopupSurrogate()
 {
@@ -2147,40 +2135,27 @@
 {
     if (!(GetQuirks() & QUIRK_WINLESS_HOOK_IME)) {
         return;
     }
 
-    if (sImm32ImmGetContextStub) {
-        return;
-    }
-
     // When using windowless plugin, IMM API won't work due ot OOP.
     //
     // ImmReleaseContext on Windows 7+ just returns TRUE only, so we don't
     // need to hook this.
 
     sImm32Intercept.Init("imm32.dll");
-    sImm32Intercept.AddHook(
-        "ImmGetContext",
-        reinterpret_cast<intptr_t>(ImmGetContextProc),
-        (void**)&sImm32ImmGetContextStub);
-    sImm32Intercept.AddHook(
-        "ImmGetCompositionStringW",
-        reinterpret_cast<intptr_t>(ImmGetCompositionStringProc),
-        (void**)&sImm32ImmGetCompositionStringStub);
-    sImm32Intercept.AddHook(
-        "ImmSetCandidateWindow",
-        reinterpret_cast<intptr_t>(ImmSetCandidateWindowProc),
-        (void**)&sImm32ImmSetCandidateWindowStub);
-    sImm32Intercept.AddHook(
-        "ImmNotifyIME",
-        reinterpret_cast<intptr_t>(ImmNotifyIME),
-        (void**)&sImm32ImmNotifyIME);
-    sImm32Intercept.AddHook(
-        "ImmAssociateContextEx",
-        reinterpret_cast<intptr_t>(ImmAssociateContextExProc),
-        (void**)&sImm32ImmAssociateContextExStub);
+    sImm32ImmGetContextStub.Set(sImm32Intercept, "ImmGetContext",
+                                &ImmGetContextProc);
+    sImm32ImmGetCompositionStringStub.Set(sImm32Intercept,
+                                          "ImmGetCompositionStringW",
+                                          &ImmGetCompositionStringProc);
+    sImm32ImmSetCandidateWindowStub.Set(sImm32Intercept,
+                                        "ImmSetCandidateWindow",
+                                        &ImmSetCandidateWindowProc);
+    sImm32ImmNotifyIME.Set(sImm32Intercept, "ImmNotifyIME", &ImmNotifyIME);
+    sImm32ImmAssociateContextExStub.Set(sImm32Intercept, "ImmAssociateContextEx",
+                                        &ImmAssociateContextExProc);
 }
 
 void
 PluginInstanceChild::DestroyWinlessPopupSurrogate()
 {
diff --git a/dom/plugins/ipc/PluginMessageUtils.h b/dom/plugins/ipc/PluginMessageUtils.h
--- a/dom/plugins/ipc/PluginMessageUtils.h
+++ b/dom/plugins/ipc/PluginMessageUtils.h
@@ -108,10 +108,16 @@
   int32_t flow;
   int32_t role;
   std::wstring defaultDevice;
 };
 
+struct NPAudioDeviceStateChangedIPC
+{
+  std::wstring device;
+  uint32_t state;
+};
+
 #ifdef XP_WIN
 typedef HWND NativeWindowHandle;
 #elif defined(MOZ_X11)
 typedef XID NativeWindowHandle;
 #elif defined(XP_DARWIN) || defined(ANDROID)
@@ -650,10 +656,39 @@
     aLog->append(StringPrintf(L"[%d, %d, %S]", aParam.flow, aParam.role,
                               aParam.defaultDevice.c_str()));
   }
 };
 
+
+template <>
+struct ParamTraits<mozilla::plugins::NPAudioDeviceStateChangedIPC>
+{
+  typedef mozilla::plugins::NPAudioDeviceStateChangedIPC paramType;
+
+  static void Write(Message* aMsg, const paramType& aParam)
+  {
+    WriteParam(aMsg, aParam.device);
+    WriteParam(aMsg, aParam.state);
+  }
+
+  static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
+  {
+    int32_t state;
+    std::wstring device;
+    if (ReadParam(aMsg, aIter, &device) && ReadParam(aMsg, aIter, &state)) {
+      aResult->device = device;
+      aResult->state = state;
+      return true;
+    }
+    return false;
+  }
+
+  static void Log(const paramType& aParam, std::wstring* aLog)
+  {
+    aLog->append(StringPrintf(L"[%S,%d]", aParam.device.c_str(), aParam.state));
+  }
+};
 } /* namespace IPC */
 
 
 // Serializing NPEvents is completely platform-specific and can be rather
 // intricate depending on the platform.  So for readability we split it
diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h
--- a/dom/plugins/ipc/PluginModuleChild.h
+++ b/dom/plugins/ipc/PluginModuleChild.h
@@ -209,10 +209,12 @@
 
     NPError PluginRequiresAudioDeviceChanges(PluginInstanceChild* aInstance,
                                              NPBool aShouldRegister);
     mozilla::ipc::IPCResult RecvNPP_SetValue_NPNVaudioDeviceChangeDetails(
         const NPAudioDeviceChangeDetailsIPC& detailsIPC) override;
+    mozilla::ipc::IPCResult RecvNPP_SetValue_NPNVaudioDeviceStateChanged(
+      const NPAudioDeviceStateChangedIPC& aDeviceStateIPC) override;
 
 private:
     NPError DoNP_Initialize(const PluginSettings& aSettings);
     void AddQuirk(PluginQuirks quirk) {
       if (mQuirks == QUIRKS_NOT_INITIALIZED)
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -2235,5 +2235,23 @@
     return IPC_OK();
 #else
     MOZ_CRASH("NPP_SetValue_NPNVaudioDeviceChangeDetails is a Windows-only message");
 #endif
 }
+
+mozilla::ipc::IPCResult
+PluginModuleChild::RecvNPP_SetValue_NPNVaudioDeviceStateChanged(
+                          const NPAudioDeviceStateChangedIPC& aDeviceStateIPC)
+{
+#if defined(XP_WIN)
+  NPAudioDeviceStateChanged stateChange;
+  stateChange.newState = aDeviceStateIPC.state;
+  stateChange.device = aDeviceStateIPC.device.c_str();
+  for (auto iter = mAudioNotificationSet.ConstIter(); !iter.Done(); iter.Next()) {
+    PluginInstanceChild* pluginInst = iter.Get()->GetKey();
+    pluginInst->AudioDeviceStateChanged(stateChange);
+  }
+  return IPC_OK();
+#else
+  MOZ_CRASH("NPP_SetValue_NPNVaudioDeviceRemoved is a Windows-only message");
+#endif
+}
diff --git a/dom/plugins/ipc/PluginUtilsWin.cpp b/dom/plugins/ipc/PluginUtilsWin.cpp
--- a/dom/plugins/ipc/PluginUtilsWin.cpp
+++ b/dom/plugins/ipc/PluginUtilsWin.cpp
@@ -15,17 +15,26 @@
 namespace PluginUtilsWin {
 
 typedef nsTHashtable<nsPtrHashKey<PluginModuleParent>> PluginModuleSet;
 StaticMutex sMutex;
 
-class AudioDeviceChangedRunnable : public Runnable
+class AudioDeviceMessageRunnable : public Runnable
 {
 public:
-  explicit AudioDeviceChangedRunnable(const PluginModuleSet* aAudioNotificationSet,
+  explicit AudioDeviceMessageRunnable(const PluginModuleSet* aAudioNotificationSet,
                                       NPAudioDeviceChangeDetailsIPC aChangeDetails) :
-    Runnable("AudioDeviceChangedRunnable")
+    Runnable("AudioDeviceMessageRunnableCD")
     , mChangeDetails(aChangeDetails)
+    , mMessageType(DEFAULT_DEVICE_CHANGED)
+    , mAudioNotificationSet(aAudioNotificationSet)
+  {}
+
+  explicit AudioDeviceMessageRunnable(const PluginModuleSet* aAudioNotificationSet,
+                                      NPAudioDeviceStateChangedIPC aDeviceState) :
+    Runnable("AudioDeviceMessageRunnableSC")
+    , mDeviceState(aDeviceState)
+    , mMessageType(DEVICE_STATE_CHANGED)
     , mAudioNotificationSet(aAudioNotificationSet)
   {}
 
   NS_IMETHOD Run() override
   {
@@ -33,19 +42,34 @@
     PLUGIN_LOG_DEBUG(("Notifying %d plugins of audio device change.",
                                             mAudioNotificationSet->Count()));
 
     for (auto iter = mAudioNotificationSet->ConstIter(); !iter.Done(); iter.Next()) {
       PluginModuleParent* pluginModule = iter.Get()->GetKey();
-      if(!pluginModule->SendNPP_SetValue_NPNVaudioDeviceChangeDetails(mChangeDetails)) {
+      bool success = false;
+      switch (mMessageType) {
+      case DEFAULT_DEVICE_CHANGED:
+        success = pluginModule->SendNPP_SetValue_NPNVaudioDeviceChangeDetails(mChangeDetails);
+        break;
+      case DEVICE_STATE_CHANGED:
+        success = pluginModule->SendNPP_SetValue_NPNVaudioDeviceStateChanged(mDeviceState);
+        break;
+      default:
+        MOZ_ASSERT_UNREACHABLE("bad AudioDeviceMessageRunnable state");
+      }
+      if(!success) {
         return NS_ERROR_FAILURE;
       }
     }
     return NS_OK;
   }
 
 protected:
+  // The potential payloads for the message.  Type determined by mMessageType.
   NPAudioDeviceChangeDetailsIPC mChangeDetails;
+  NPAudioDeviceStateChangedIPC mDeviceState;
+  enum { DEFAULT_DEVICE_CHANGED, DEVICE_STATE_CHANGED } mMessageType;
+
   const PluginModuleSet* mAudioNotificationSet;
 };
 
 class AudioNotification final : public IMMNotificationClient
 {
@@ -80,12 +104,12 @@
     changeDetails.flow = (int32_t)flow;
     changeDetails.role = (int32_t)role;
     changeDetails.defaultDevice = device_id ? std::wstring(device_id) : L"";
 
     // Make sure that plugin is notified on the main thread.
-    RefPtr<AudioDeviceChangedRunnable> runnable =
-      new AudioDeviceChangedRunnable(&mAudioNotificationSet, changeDetails);
+    RefPtr<AudioDeviceMessageRunnable> runnable =
+      new AudioDeviceMessageRunnable(&mAudioNotificationSet, changeDetails);
     NS_DispatchToMainThread(runnable);
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
@@ -101,10 +125,18 @@
   }
 
   HRESULT STDMETHODCALLTYPE
   OnDeviceStateChanged(LPCWSTR device_id, DWORD new_state) override
   {
+    NPAudioDeviceStateChangedIPC deviceStateIPC;
+    deviceStateIPC.device = device_id ? std::wstring(device_id) : L"";
+    deviceStateIPC.state = (uint32_t)new_state;
+
+    // Make sure that plugin is notified on the main thread.
+    RefPtr<AudioDeviceMessageRunnable> runnable =
+      new AudioDeviceMessageRunnable(&mAudioNotificationSet, deviceStateIPC);
+    NS_DispatchToMainThread(runnable);
     return S_OK;
   }
 
   HRESULT STDMETHODCALLTYPE
   OnPropertyValueChanged(LPCWSTR device_id, const PROPERTYKEY key) override
diff --git a/dom/serviceworkers/ServiceWorkerRegistration.cpp b/dom/serviceworkers/ServiceWorkerRegistration.cpp
--- a/dom/serviceworkers/ServiceWorkerRegistration.cpp
+++ b/dom/serviceworkers/ServiceWorkerRegistration.cpp
@@ -286,31 +286,33 @@
 }
 
 already_AddRefed<Promise>
 ServiceWorkerRegistration::Unregister(ErrorResult& aRv)
 {
-  if (!mInner) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return nullptr;
-  }
-
   nsIGlobalObject* global = GetParentObject();
-  if (!global) {
+  if (NS_WARN_IF(!global)) {
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return nullptr;
   }
 
   RefPtr<Promise> outer = Promise::Create(global, aRv);
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
   }
 
+  if (!mInner) {
+    outer->MaybeResolve(false);
+    return outer.forget();
+  }
+
   mInner->Unregister(
     [outer] (bool aSuccess) {
       outer->MaybeResolve(aSuccess);
     }, [outer] (ErrorResult& aRv) {
-      outer->MaybeReject(aRv);
+      // register() should be resilient and resolve false instead
+      // of rejecting in most cases.
+      outer->MaybeResolve(false);
     });
 
   return outer.forget();
 }
 
diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -55,10 +55,14 @@
 [browser_largeAllocation_non_win32.js]
 skip-if = !e10s || (os == "win" && processor == "x86") || (verify && debug && (os == 'linux')) # Large-Allocation requires e10s
 [browser_localStorage_e10s.js]
 skip-if = !e10s || verify # This is a test of e10s functionality.
 [browser_localStorage_privatestorageevent.js]
+[browser_persist_cookies.js]
+support-files =
+  set-samesite-cookies-and-redirect.sjs
+  mimeme.sjs
 [browser_test_focus_after_modal_state.js]
 skip-if = verify
 support-files =
   focus_after_prompt.html
 [browser_test_new_window_from_content.js]
diff --git a/dom/tests/browser/browser_persist_cookies.js b/dom/tests/browser/browser_persist_cookies.js
new file mode 100644
--- /dev/null
+++ b/dom/tests/browser/browser_persist_cookies.js
@@ -0,0 +1,94 @@
+/* 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.org");
+const TEST_PATH2 = getRootDirectory(gTestPath).replace("chrome://mochitests/content", "https://example.com");
+
+var MockFilePicker = SpecialPowers.MockFilePicker;
+MockFilePicker.init(window);
+
+registerCleanupFunction(async function() {
+  info("Running the cleanup code");
+  MockFilePicker.cleanup();
+  Services.obs.removeObserver(checkRequest, "http-on-modify-request");
+  if (gTestDir && gTestDir.exists()) {
+    // On Windows, sometimes nsIFile.remove() throws, probably because we're
+    // still writing to the directory we're trying to remove, despite
+    // waiting for the download to complete. Just retry a bit later...
+    let succeeded = false;
+    while (!succeeded) {
+      try {
+        gTestDir.remove(true);
+        succeeded = true;
+      } catch (ex) {
+        await new Promise(requestAnimationFrame);
+      }
+    }
+  }
+});
+
+let gTestDir = null;
+
+
+function checkRequest(subject) {
+  let httpChannel = subject.QueryInterface(Ci.nsIHttpChannel);
+  let spec = httpChannel.URI.spec;
+  // Ignore initial requests for page that sets cookies and its favicon, which may not have
+  // cookies.
+  if (httpChannel.URI.host == "example.org" && !spec.endsWith("favicon.ico") && !spec.includes("redirect.sjs")) {
+    let cookie = httpChannel.getRequestHeader("cookie");
+    is(cookie.trim(), "normalCookie=true", "Should have correct cookie in request for " + spec);
+  }
+}
+
+function createTemporarySaveDirectory() {
+  var saveDir = Services.dirsvc.get("TmpD", Ci.nsIFile);
+  saveDir.append("testsavedir");
+  if (!saveDir.exists()) {
+    info("create testsavedir!");
+    saveDir.create(Ci.nsIFile.DIRECTORY_TYPE, 0o755);
+  }
+  info("return from createTempSaveDir: " + saveDir.path);
+  return saveDir;
+}
+
+add_task(async function() {
+  await BrowserTestUtils.withNewTab("about:blank", async function(browser) {
+    Services.obs.addObserver(checkRequest, "http-on-modify-request");
+    BrowserTestUtils.loadURI(browser, TEST_PATH + "set-samesite-cookies-and-redirect.sjs");
+    // Test that the original document load doesn't send same-site cookies.
+    await BrowserTestUtils.browserLoaded(browser, true, TEST_PATH2 + "set-samesite-cookies-and-redirect.sjs");
+    // Now check the saved page.
+    // Create the folder the link will be saved into.
+    gTestDir = createTemporarySaveDirectory();
+    let destFile = gTestDir.clone();
+
+    MockFilePicker.displayDirectory = gTestDir;
+    let fileName;
+    MockFilePicker.showCallback = function(fp) {
+      info("showCallback");
+      fileName = fp.defaultString;
+      info("fileName: " + fileName);
+      destFile.append(fileName);
+      info("path: " + destFile.path);
+      MockFilePicker.setFiles([destFile]);
+      MockFilePicker.filterIndex = 0; // kSaveAsType_Complete
+      info("done showCallback");
+    };
+    saveBrowser(browser);
+    await new Promise(async (resolve) => {
+      let dls = await Downloads.getList(Downloads.PUBLIC);
+      dls.addView({
+        onDownloadChanged(download) {
+          if (download.succeeded) {
+            dls.removeView(this);
+            dls.removeFinished();
+            resolve();
+          }
+        }
+      });
+    });
+  });
+});
diff --git a/dom/tests/browser/mimeme.sjs b/dom/tests/browser/mimeme.sjs
new file mode 100644
--- /dev/null
+++ b/dom/tests/browser/mimeme.sjs
@@ -0,0 +1,26 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function handleRequest(request, response) {
+  let mimeType = request.queryString.match(/type=([a-z]*)/)[1];
+  switch (mimeType) {
+    case "css":
+      response.setHeader("Content-Type", "text/css");
+      response.write("#hi {color: red}");
+      break;
+    case "js":
+      response.setHeader("Content-Type", "application/javascript");
+      response.write("var foo;");
+      break;
+    case "png":
+      response.setHeader("Content-Type", "image/png");
+      response.write("");
+      break;
+    case "html":
+      response.setHeader("Content-Type", "text/html");
+      response.write("<body>I am a subframe</body>");
+      break;
+  }
+}
diff --git a/dom/tests/browser/set-samesite-cookies-and-redirect.sjs b/dom/tests/browser/set-samesite-cookies-and-redirect.sjs
new file mode 100644
--- /dev/null
+++ b/dom/tests/browser/set-samesite-cookies-and-redirect.sjs
@@ -0,0 +1,33 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+function handleRequest(request, response) {
+  // Set cookies and redirect for .org:
+  if (request.host.endsWith(".org")) {
+    response.setHeader("Set-Cookie", "normalCookie=true; path=/;", true);
+    response.setHeader("Set-Cookie", "laxHeader=true; path=/; SameSite=Lax", true);
+    response.setHeader("Set-Cookie", "strictHeader=true; path=/; SameSite=Strict", true);
+    response.write(`
+      <head>
+        <meta http-equiv='set-cookie' content='laxMeta=true; path=/; SameSite=Lax'>
+        <meta http-equiv='set-cookie' content='strictMeta=true; path=/; SameSite=Strict'>
+      </head>
+      <body>
+        <script>
+        document.cookie = 'laxScript=true; path=/; SameSite=Lax';
+        document.cookie = 'strictScript=true; path=/; SameSite=Strict';
+        location.href = location.href.replace(/\.org/, ".com");
+        </script>
+      </body>`);
+  } else {
+    let baseURI = "https://example.org/" + request.path.replace(/[a-z-]*\.sjs/, "mimeme.sjs?type=");
+    response.write(`
+      <link rel="stylesheet" type="text/css" href="${baseURI}css">
+      <iframe src="${baseURI}html"></iframe>
+      <script src="${baseURI}js"></script>
+      <img src="${baseURI}png">
+    `);
+  }
+}
diff --git a/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl b/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
--- a/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
+++ b/dom/webbrowserpersist/PWebBrowserPersistDocument.ipdl
@@ -8,10 +8,11 @@
 include protocol PWebBrowserPersistSerialize;
 include protocol PFileDescriptorSet;
 include protocol PChildToParentStream; //FIXME: bug #792908
 include protocol PParentToChildStream; //FIXME: bug #792908
 
+include PBackgroundSharedTypes;
 include IPCStream;
 
 namespace mozilla {
 
 // nsIWebBrowserPersistDocument has attributes which can be read
@@ -27,10 +28,11 @@
   nsString title;
   nsString referrer;
   nsString contentDisposition;
   uint32_t cacheKey;
   uint32_t persistFlags;
+  PrincipalInfo principal;
 };
 
 // IPDL doesn't have tuples, so this gives the pair of strings from
 // nsIWebBrowserPersistURIMap::getURIMapping a name.
 struct WebBrowserPersistURIMapEntry {
diff --git a/dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp b/dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
--- a/dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
+++ b/dom/webbrowserpersist/WebBrowserPersistDocumentChild.cpp
@@ -39,10 +39,11 @@
     if (!aDocument) {
         SendInitFailure(NS_ERROR_FAILURE);
         return;
     }
 
+    nsCOMPtr<nsIPrincipal> principal;
     WebBrowserPersistDocumentAttrs attrs;
     nsCOMPtr<nsIInputStream> postDataStream;
 #define ENSURE(e) do {           \
         nsresult rv = (e);       \
         if (NS_FAILED(rv)) {     \
@@ -58,10 +59,14 @@
     ENSURE(aDocument->GetTitle(attrs.title()));
     ENSURE(aDocument->GetReferrer(attrs.referrer()));
     ENSURE(aDocument->GetContentDisposition(attrs.contentDisposition()));
     ENSURE(aDocument->GetCacheKey(&(attrs.cacheKey())));
     ENSURE(aDocument->GetPersistFlags(&(attrs.persistFlags())));
+
+    ENSURE(aDocument->GetPrincipal(getter_AddRefs(principal)));
+    ENSURE(ipc::PrincipalToPrincipalInfo(principal, &(attrs.principal())));
+
     ENSURE(aDocument->GetPostData(getter_AddRefs(postDataStream)));
 #undef ENSURE
 
     mozilla::ipc::AutoIPCStream autoStream;
     autoStream.Serialize(postDataStream,
diff --git a/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp b/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
--- a/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
+++ b/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp
@@ -182,10 +182,18 @@
         return NS_OK;
     }
     return history->GetPostData(aStream);
 }
 
+NS_IMETHODIMP
+WebBrowserPersistLocalDocument::GetPrincipal(nsIPrincipal** aPrincipal)
+{
+  nsCOMPtr<nsIPrincipal> nodePrincipal = mDocument->NodePrincipal();
+  nodePrincipal.forget(aPrincipal);
+  return NS_OK;
+}
+
 already_AddRefed<nsISHEntry>
 WebBrowserPersistLocalDocument::GetHistory()
 {
     nsCOMPtr<nsPIDOMWindowOuter> window = mDocument->GetDefaultView();
     if (NS_WARN_IF(!window)) {
diff --git a/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h b/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
--- a/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
+++ b/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.h
@@ -11,10 +11,12 @@
 #include "mozilla/PWebBrowserPersistDocumentParent.h"
 #include "nsCOMPtr.h"
 #include "nsIWebBrowserPersistDocument.h"
 #include "nsIInputStream.h"
 
+class nsIPrincipal;
+
 // This class is the XPCOM half of the glue between the
 // nsIWebBrowserPersistDocument interface and a remote document; it is
 // created by WebBrowserPersistDocumentParent when (and if) it
 // receives the information needed to populate the interface's
 // properties.
@@ -38,10 +40,11 @@
 private:
     using Attrs = WebBrowserPersistDocumentAttrs;
     WebBrowserPersistDocumentParent* mActor;
     Attrs mAttrs;
     nsCOMPtr<nsIInputStream> mPostData;
+    nsCOMPtr<nsIPrincipal> mPrincipal;
 
     friend class WebBrowserPersistDocumentParent;
     WebBrowserPersistRemoteDocument(WebBrowserPersistDocumentParent* aActor,
                                     const Attrs& aAttrs,
                                     nsIInputStream* aPostData);
diff --git a/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp b/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
--- a/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
+++ b/dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
@@ -7,10 +7,13 @@
 #include "WebBrowserPersistRemoteDocument.h"
 #include "WebBrowserPersistDocumentParent.h"
 #include "WebBrowserPersistResourcesParent.h"
 #include "WebBrowserPersistSerializeParent.h"
 #include "mozilla/Unused.h"
+#include "mozilla/ipc/BackgroundUtils.h"
+
+#include "nsIPrincipal.h"
 
 namespace mozilla {
 
 NS_IMPL_ISUPPORTS(WebBrowserPersistRemoteDocument,
                   nsIWebBrowserPersistDocument)
@@ -21,10 +24,12 @@
                                   nsIInputStream* aPostData)
 : mActor(aActor)
 , mAttrs(aAttrs)
 , mPostData(aPostData)
 {
+  nsresult rv;
+  mPrincipal = ipc::PrincipalInfoToPrincipal(mAttrs.principal(), &rv);
 }
 
 WebBrowserPersistRemoteDocument::~WebBrowserPersistRemoteDocument()
 {
     if (mActor) {
@@ -130,10 +135,18 @@
     nsCOMPtr<nsIInputStream> stream = mPostData;
     stream.forget(aStream);
     return NS_OK;
 }
 
+NS_IMETHODIMP
+WebBrowserPersistRemoteDocument::GetPrincipal(nsIPrincipal** aPrincipal)
+{
+    nsCOMPtr<nsIPrincipal> nodePrincipal = mPrincipal;
+    nodePrincipal.forget(aPrincipal);
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 WebBrowserPersistRemoteDocument::ReadResources(nsIWebBrowserPersistResourceVisitor* aVisitor)
 {
     if (!mActor) {
         return NS_ERROR_FAILURE;
diff --git a/dom/webbrowserpersist/nsIWebBrowserPersist.idl b/dom/webbrowserpersist/nsIWebBrowserPersist.idl
--- a/dom/webbrowserpersist/nsIWebBrowserPersist.idl
+++ b/dom/webbrowserpersist/nsIWebBrowserPersist.idl
@@ -10,10 +10,11 @@
 interface nsIInputStream;
 interface nsIWebProgressListener;
 interface nsIFile;
 interface nsIChannel;
 interface nsILoadContext;
+interface nsIPrincipal;
 
 /**
  * Interface for persisting DOM documents and URIs to local or remote storage.
  */
 [scriptable, uuid(8cd752a4-60b1-42c3-a819-65c7a1138a28)]
@@ -63,16 +64,10 @@
    * Append the downloaded data to the target file.
    * This can only be used when persisting to a local file.
    */
   const unsigned long PERSIST_FLAGS_APPEND_TO_FILE = 32768;
 
-  /**
-   * Force relevant cookies to be sent with this load even if normally they
-   * wouldn't be.
-   */
-  const unsigned long PERSIST_FLAGS_FORCE_ALLOW_COOKIES = 65536;
-
   /**
    * Flags governing how data is fetched and saved from the network.
    * It is best to set this value explicitly unless you are prepared
    * to accept the default values.
    */
@@ -114,10 +109,12 @@
    * Save the specified URI to file.
    *
    * @param aURI       URI to save to file. Some implementations of this interface
    *                   may also support <CODE>nullptr</CODE> to imply the currently
    *                   loaded URI.
+   * @param aTriggeringPrincipal
+   *                   The triggering principal for the URI we're saving.
    * @param aCacheKey  The necko cache key integer.
    * @param aReferrer  The referrer URI to pass with an HTTP request or
    *                   <CODE>nullptr</CODE>.
    * @param aReferrerPolicy  The referrer policy for when and what to send via
    *                   HTTP Referer header.  Ignored if aReferrer is
@@ -140,11 +137,12 @@
    * @see nsIURI
    * @see nsIInputStream
    *
    * @throws NS_ERROR_INVALID_ARG One or more arguments was invalid.
    */
-  void saveURI(in nsIURI aURI, in unsigned long aCacheKey,
+  void saveURI(in nsIURI aURI, in nsIPrincipal aTriggeringPrincipal,
+      in unsigned long aCacheKey,
       in nsIURI aReferrer, in unsigned long aReferrerPolicy,
       in nsIInputStream aPostData,
       in string aExtraHeaders, in nsISupports aFile,
       in nsILoadContext aPrivacyContext);
 
@@ -152,11 +150,12 @@
    * @param aIsPrivate Treat the save operation as private (ie. with
    *                   regards to networking operations and persistence
    *                   of intermediate data, etc.)
    * @see saveURI for all other parameter descriptions
    */
-  void savePrivacyAwareURI(in nsIURI aURI, in unsigned long aCacheKey,
+  void savePrivacyAwareURI(in nsIURI aURI,
+      in nsIPrincipal aTriggeringPrincipal, in unsigned long aCacheKey,
       in nsIURI aReferrer, in unsigned long aReferrerPolicy,
       in nsIInputStream aPostData,
       in string aExtraHeaders, in nsISupports aFile,
       in boolean aIsPrivate);
 
diff --git a/dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl b/dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
--- a/dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
+++ b/dom/webbrowserpersist/nsIWebBrowserPersistDocument.idl
@@ -6,10 +6,11 @@
 
 #include "nsISupports.idl"
 
 interface nsIInputStream;
 interface nsIOutputStream;
+interface nsIPrincipal;
 interface nsITabParent;
 interface nsIWebBrowserPersistResourceVisitor;
 interface nsIWebBrowserPersistWriteCompletion;
 
 /**
@@ -58,10 +59,11 @@
   readonly attribute ACString characterSet;
   readonly attribute AString title;
   readonly attribute AString referrer;
   readonly attribute AString contentDisposition;
   readonly attribute nsIInputStream postData;
+  readonly attribute nsIPrincipal principal;
 
   /**
    * The cache key.  Unlike in nsISHEntry, where it's wrapped in an
    * nsISupportsPRUint32, this is just the integer.
    */
diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.h b/dom/webbrowserpersist/nsWebBrowserPersist.h
--- a/dom/webbrowserpersist/nsWebBrowserPersist.h
+++ b/dom/webbrowserpersist/nsWebBrowserPersist.h
@@ -55,11 +55,12 @@
 
 // Private members
 private:
     virtual ~nsWebBrowserPersist();
     nsresult SaveURIInternal(
-        nsIURI *aURI, uint32_t aCacheKey, nsIURI *aReferrer,
+        nsIURI *aURI, nsIPrincipal* aTriggeringPrincipal,
+        uint32_t aCacheKey, nsIURI *aReferrer,
         uint32_t aReferrerPolicy, nsIInputStream *aPostData,
         const char *aExtraHeaders, nsIURI *aFile,
         bool aCalcFileExt, bool aIsPrivate);
     nsresult SaveChannelInternal(
         nsIChannel *aChannel, nsIURI *aFile, bool aCalcFileExt);
diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp
--- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp
+++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp
@@ -81,10 +81,11 @@
 struct nsWebBrowserPersist::DocData
 {
     nsCOMPtr<nsIURI> mBaseURI;
     nsCOMPtr<nsIWebBrowserPersistDocument> mDocument;
     nsCOMPtr<nsIURI> mFile;
+    nsCOMPtr<nsIPrincipal> mPrincipal;
     nsCString mCharset;
 };
 
 // Information about a URI
 struct nsWebBrowserPersist::URIData
@@ -411,22 +412,24 @@
     mEventSink = do_GetInterface(aProgressListener);
     return NS_OK;
 }
 
 NS_IMETHODIMP nsWebBrowserPersist::SaveURI(
-    nsIURI *aURI, uint32_t aCacheKey,
+    nsIURI *aURI, nsIPrincipal *aPrincipal, uint32_t aCacheKey,
     nsIURI *aReferrer, uint32_t aReferrerPolicy,
     nsIInputStream *aPostData, const char *aExtraHeaders,
     nsISupports *aFile, nsILoadContext* aPrivacyContext)
 {
-    return SavePrivacyAwareURI(aURI, aCacheKey, aReferrer, aReferrerPolicy,
-                               aPostData, aExtraHeaders, aFile,
-                               aPrivacyContext && aPrivacyContext->UsePrivateBrowsing());
+    bool isPrivate =
+      aPrivacyContext && aPrivacyContext->UsePrivateBrowsing();
+    return SavePrivacyAwareURI(aURI, aPrincipal, aCacheKey,
+                               aReferrer, aReferrerPolicy,
+                               aPostData, aExtraHeaders, aFile, isPrivate);
 }
 
 NS_IMETHODIMP nsWebBrowserPersist::SavePrivacyAwareURI(
-    nsIURI *aURI, uint32_t aCacheKey,
+    nsIURI *aURI, nsIPrincipal *aPrincipal, uint32_t aCacheKey,
     nsIURI *aReferrer, uint32_t aReferrerPolicy,
     nsIInputStream *aPostData, const char *aExtraHeaders,
     nsISupports *aFile, bool aIsPrivate)
 {
     NS_ENSURE_TRUE(mFirstAndOnlyUse, NS_ERROR_FAILURE);
@@ -437,12 +440,14 @@
     rv = GetValidURIFromObject(aFile, getter_AddRefs(fileAsURI));
     NS_ENSURE_SUCCESS(rv, NS_ERROR_INVALID_ARG);
 
     // SaveURI doesn't like broken uris.
     mPersistFlags |= PERSIST_FLAGS_FAIL_ON_BROKEN_LINKS;
-    rv = SaveURIInternal(aURI, aCacheKey, aReferrer, aReferrerPolicy,
-                         aPostData, aExtraHeaders, fileAsURI, false, aIsPrivate);
+    rv = SaveURIInternal(aURI, aPrincipal, aCacheKey,
+                         aReferrer, aReferrerPolicy,
+                         aPostData, aExtraHeaders, fileAsURI,
+                         false, aIsPrivate);
     return NS_FAILED(rv) ? rv : NS_OK;
 }
 
 NS_IMETHODIMP nsWebBrowserPersist::SaveChannel(
     nsIChannel *aChannel, nsISupports *aFile)
@@ -597,21 +602,26 @@
             }
         }
     }
 
     if (urisToPersist > 0) {
+        nsCOMPtr<nsIPrincipal> docPrincipal;
+        //XXXgijs I *think* this is already always true, but let's be sure.
+        MOZ_ASSERT(mDocList.Length() > 0,
+            "Should have the document for any walked URIs to persist!");
+        nsresult rv = mDocList.ElementAt(0)->mDocument->
+            GetPrincipal(getter_AddRefs(docPrincipal));
+        NS_ENSURE_SUCCESS_VOID(rv);
         // Persist each file in the uri map. The document(s)
         // will be saved after the last one of these is saved.
         for (auto iter = mURIMap.Iter(); !iter.Done(); iter.Next()) {
             URIData *data = iter.UserData();
 
             if (!data->mNeedsPersisting || data->mSaved) {
                 continue;
             }
 
-            nsresult rv;
-
             // Create a URI from the key.
             nsCOMPtr<nsIURI> uri;
             rv = NS_NewURI(getter_AddRefs(uri), iter.Key(),
                            data->mCharset.get());
             if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -625,11 +635,11 @@
                 break;
             }
 
             // The Referrer Policy doesn't matter here since the referrer is
             // nullptr.
-            rv = SaveURIInternal(uri, 0, nullptr,
+            rv = SaveURIInternal(uri, docPrincipal, 0, nullptr,
                                  mozilla::net::RP_Unset, nullptr, nullptr,
                                  fileAsURI, true, mIsPrivate);
             // If SaveURIInternal fails, then it will have called EndDownload,
             // which means that |data| is no longer valid memory. We MUST bail.
             if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -1322,11 +1332,12 @@
              .SetPathQueryRef(newPath)
              .Finalize(aOutURI);
 }
 
 nsresult nsWebBrowserPersist::SaveURIInternal(
-    nsIURI *aURI, uint32_t aCacheKey, nsIURI *aReferrer,
+    nsIURI *aURI, nsIPrincipal* aTriggeringPrincipal,
+    uint32_t aCacheKey, nsIURI *aReferrer,
     uint32_t aReferrerPolicy, nsIInputStream *aPostData,
     const char *aExtraHeaders, nsIURI *aFile,
     bool aCalcFileExt, bool aIsPrivate)
 {
     NS_ENSURE_ARG_POINTER(aURI);
@@ -1348,11 +1359,11 @@
 
     // Open a channel to the URI
     nsCOMPtr<nsIChannel> inputChannel;
     rv = NS_NewChannel(getter_AddRefs(inputChannel),
                        aURI,
-                       nsContentUtils::GetSystemPrincipal(),
+                       aTriggeringPrincipal,
                        nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
                        nsIContentPolicy::TYPE_OTHER,
                        nullptr,  // aPerformanceStorage
                        nullptr,  // aLoadGroup
                        static_cast<nsIInterfaceRequestor*>(this),
@@ -1378,20 +1389,10 @@
         {
             encodedChannel->SetApplyConversion(false);
         }
     }
 
-    if (mPersistFlags & PERSIST_FLAGS_FORCE_ALLOW_COOKIES)
-    {
-        nsCOMPtr<nsIHttpChannelInternal> httpChannelInternal =
-                do_QueryInterface(inputChannel);
-        if (httpChannelInternal) {
-            rv = httpChannelInternal->SetThirdPartyFlags(nsIHttpChannelInternal::THIRD_PARTY_FORCE_ALLOW);
-            MOZ_ASSERT(NS_SUCCEEDED(rv));
-        }
-    }
-
     // Set the referrer, post data and headers if any
     nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(inputChannel));
     if (httpChannel)
     {
         // Referrer
diff --git a/dom/webgpu/Adapter.h b/dom/webgpu/Adapter.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Adapter.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_Adapter_H_
+#define WEBGPU_Adapter_H_
+
+#include "mozilla/AlreadyAddRefed.h"
+#include "nsString.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+struct WebGPUDeviceDescriptor;
+struct WebGPUExtensions;
+struct WebGPUFeatures;
+} // namespace dom
+
+namespace webgpu {
+class Device;
+class Instance;
+
+class Adapter final
+    : public ChildOf<Instance>
+{
+public:
+    WEBGPU_DECL_GOOP(Adapter)
+
+    const nsString mName;
+
+private:
+    Adapter() = delete;
+    virtual ~Adapter();
+
+public:
+    void GetName(nsString& out) const {
+        out = mName;
+    }
+
+    void Extensions(dom::WebGPUExtensions& out) const;
+    void Features(dom::WebGPUFeatures& out) const;
+    already_AddRefed<Device> CreateDevice(const dom::WebGPUDeviceDescriptor& desc) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_Adapter_H_
diff --git a/dom/webgpu/Adapter.cpp b/dom/webgpu/Adapter.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Adapter.cpp
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Adapter.h"
+
+#include "Instance.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Adapter::~Adapter() = default;
+
+void
+Adapter::Extensions(dom::WebGPUExtensions& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+Adapter::Features(dom::WebGPUFeatures& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Device>
+Adapter::CreateDevice(const dom::WebGPUDeviceDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(Adapter)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/AttachmentState.h b/dom/webgpu/AttachmentState.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/AttachmentState.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_AttachmentState_H_
+#define WEBGPU_AttachmentState_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class AttachmentState final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(AttachmentState)
+
+private:
+    AttachmentState() = delete;
+    virtual ~AttachmentState();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_AttachmentState_H_
diff --git a/dom/webgpu/AttachmentState.cpp b/dom/webgpu/AttachmentState.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/AttachmentState.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "AttachmentState.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+AttachmentState::~AttachmentState() = default;
+
+WEBGPU_IMPL_GOOP_0(AttachmentState)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/BindGroup.h b/dom/webgpu/BindGroup.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BindGroup.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_BindGroup_H_
+#define WEBGPU_BindGroup_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class BindGroup final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(BindGroup)
+
+private:
+    BindGroup() = delete;
+    virtual ~BindGroup();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_BindGroup_H_
diff --git a/dom/webgpu/BindGroup.cpp b/dom/webgpu/BindGroup.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BindGroup.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "BindGroup.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+BindGroup::~BindGroup() = default;
+
+WEBGPU_IMPL_GOOP_0(BindGroup)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/BindGroupLayout.h b/dom/webgpu/BindGroupLayout.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BindGroupLayout.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_BindGroupLayout_H_
+#define WEBGPU_BindGroupLayout_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class BindGroupLayout final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(BindGroupLayout)
+
+private:
+    BindGroupLayout() = delete;
+    virtual ~BindGroupLayout();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_BindGroupLayout_H_
diff --git a/dom/webgpu/BindGroupLayout.cpp b/dom/webgpu/BindGroupLayout.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BindGroupLayout.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "BindGroupLayout.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+BindGroupLayout::~BindGroupLayout() = default;
+
+WEBGPU_IMPL_GOOP_0(BindGroupLayout)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/BlendState.h b/dom/webgpu/BlendState.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BlendState.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_BlendState_H_
+#define WEBGPU_BlendState_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class BlendState final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(BlendState)
+
+private:
+    BlendState() = delete;
+    virtual ~BlendState();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_BlendState_H_
diff --git a/dom/webgpu/BlendState.cpp b/dom/webgpu/BlendState.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/BlendState.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "BlendState.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+BlendState::~BlendState() = default;
+
+WEBGPU_IMPL_GOOP_0(BlendState)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Buffer.h b/dom/webgpu/Buffer.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Buffer.h
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_BUFFER_H_
+#define WEBGPU_BUFFER_H_
+
+#include "mozilla/dom/Nullable.h"
+#include "mozilla/dom/TypedArray.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class Buffer final
+    : public ChildOf<Device>
+{
+public:
+    JS::Heap<JSObject*> mMapping;
+
+    WEBGPU_DECL_GOOP(Buffer)
+
+private:
+    explicit Buffer(Device* parent);
+    virtual ~Buffer();
+
+public:
+    void GetMapping(JSContext* cx, JS::MutableHandle<JSObject*> out) const;
+    void Unmap() const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_BUFFER_H_
diff --git a/dom/webgpu/Buffer.cpp b/dom/webgpu/Buffer.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Buffer.cpp
@@ -0,0 +1,62 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Buffer.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Buffer::Buffer(Device* const parent)
+    : ChildOf(parent)
+{
+    mozilla::HoldJSObjects(this); // Mimed from PushSubscriptionOptions
+}
+
+Buffer::~Buffer()
+{
+    mMapping = nullptr;
+    mozilla::DropJSObjects(this);
+}
+
+void
+Buffer::GetMapping(JSContext*, JS::MutableHandle<JSObject*> out) const
+{
+    out.set(mMapping);
+}
+
+void
+Buffer::Unmap() const
+{
+    MOZ_CRASH("todo");
+}
+
+JSObject*
+webgpu::Buffer::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
+{
+    return dom::WebGPUBuffer_Binding::Wrap(cx, this, givenProto);
+}
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(Buffer)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Buffer)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mParent)
+  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  tmp->mMapping = nullptr;
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Buffer)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParent)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(Buffer)
+  NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
+  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mMapping)
+NS_IMPL_CYCLE_COLLECTION_TRACE_END
+
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(Buffer, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(Buffer, Release)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/CommandBuffer.h b/dom/webgpu/CommandBuffer.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/CommandBuffer.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_CommandBuffer_H_
+#define WEBGPU_CommandBuffer_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class CommandBuffer final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(CommandBuffer)
+
+private:
+    CommandBuffer() = delete;
+    virtual ~CommandBuffer();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_CommandBuffer_H_
diff --git a/dom/webgpu/CommandBuffer.cpp b/dom/webgpu/CommandBuffer.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/CommandBuffer.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "CommandBuffer.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+CommandBuffer::~CommandBuffer() = default;
+
+WEBGPU_IMPL_GOOP_0(CommandBuffer)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/CommandEncoder.h b/dom/webgpu/CommandEncoder.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/CommandEncoder.h
@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_CommandEncoder_H_
+#define WEBGPU_CommandEncoder_H_
+
+#include "mozilla/dom/TypedArray.h"
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+template<typename T> class Sequence;
+class WebGPUComputePipelineOrWebGPURenderPipeline;
+struct WebGPURenderPassDescriptor;
+} // namespace dom
+namespace webgpu {
+
+class BindGroup;
+class Buffer;
+class CommandBuffer;
+class Device;
+
+class CommandEncoder final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(CommandEncoder)
+
+private:
+    CommandEncoder() = delete;
+    virtual ~CommandEncoder();
+
+public:
+    already_AddRefed<CommandBuffer> FinishEncoding() const;
+
+    // Commands allowed outside of "passes"
+    void CopyBufferToBuffer(const Buffer& src, uint32_t srcOffset, const Buffer& dst,
+                            uint32_t dstOffset, uint32_t size) const;
+    // TODO figure out all the arguments required for these
+    void CopyBufferToTexture() const;
+    void CopyTextureToBuffer() const;
+    void CopyTextureToTexture() const;
+    void Blit() const;
+
+    void TransitionBuffer(const Buffer& b, uint32_t flags) const;
+
+    // Allowed in both compute and render passes
+    void SetPushConstants(uint32_t stageFlags,
+                          uint32_t offset,
+                          uint32_t count,
+                          const dom::ArrayBuffer& data) const;
+    void SetBindGroup(uint32_t index, const BindGroup& bindGroup) const;
+    void SetPipeline(const dom::WebGPUComputePipelineOrWebGPURenderPipeline& pipeline) const;
+
+    // Compute pass commands
+    void BeginComputePass() const;
+    void EndComputePass() const;
+
+    void Dispatch(uint32_t x, uint32_t y, uint32_t z) const;
+
+    // Render pass commands
+    void BeginRenderPass(const dom::WebGPURenderPassDescriptor& desc) const;
+    void EndRenderPass() const;
+
+    void SetBlendColor(float r, float g, float b, float a) const;
+    void SetIndexBuffer(const Buffer& buffer, uint32_t offset) const;
+    void SetVertexBuffers(uint32_t startSlot,
+                          const dom::Sequence<OwningNonNull<Buffer>>& buffers,
+                          const dom::Sequence<uint32_t>& offsets) const;
+
+    void Draw(uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex,
+              uint32_t firstInstance) const;
+    void DrawIndexed(uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex,
+                     uint32_t firstInstance, uint32_t firstVertex) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_CommandEncoder_H_
diff --git a/dom/webgpu/CommandEncoder.cpp b/dom/webgpu/CommandEncoder.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/CommandEncoder.cpp
@@ -0,0 +1,147 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "CommandEncoder.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+CommandEncoder::~CommandEncoder() = default;
+
+already_AddRefed<CommandBuffer>
+CommandEncoder::FinishEncoding() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::CopyBufferToBuffer(const Buffer& src, const uint32_t srcOffset,
+                                   const Buffer& dst, const uint32_t dstOffset,
+                                   const uint32_t size) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::CopyBufferToTexture() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::CopyTextureToBuffer() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::CopyTextureToTexture() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::Blit() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::TransitionBuffer(const Buffer& b, const uint32_t flags) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetPushConstants(const uint32_t stageFlags, const uint32_t offset,
+                                 const uint32_t count, const dom::ArrayBuffer& data) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetBindGroup(const uint32_t index, const BindGroup& bindGroup) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetPipeline(const dom::WebGPUComputePipelineOrWebGPURenderPipeline& pipeline) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::BeginComputePass() const
+{
+    MOZ_CRASH("todo");
+}
+void
+CommandEncoder::EndComputePass() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::Dispatch(const uint32_t x, const uint32_t y, const uint32_t z) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::BeginRenderPass(const dom::WebGPURenderPassDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::EndRenderPass() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetBlendColor(const float r, const float g, const float b,
+                              const float a) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetIndexBuffer(const Buffer& buffer, const uint32_t offset) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::SetVertexBuffers(const uint32_t startSlot,
+                                 const dom::Sequence<OwningNonNull<Buffer>>& buffers,
+                                 const dom::Sequence<uint32_t>& offsets) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::Draw(const uint32_t vertexCount, const uint32_t instanceCount,
+                     const uint32_t firstVertex, const uint32_t firstInstance) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+CommandEncoder::DrawIndexed(const uint32_t indexCount, const uint32_t instanceCount,
+                            const uint32_t firstIndex, const uint32_t firstInstance,
+                            const uint32_t firstVertex) const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(CommandEncoder)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/ComputePipeline.h b/dom/webgpu/ComputePipeline.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ComputePipeline.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_ComputePipeline_H_
+#define WEBGPU_ComputePipeline_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class ComputePipeline final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(ComputePipeline)
+
+private:
+    ComputePipeline() = delete;
+    virtual ~ComputePipeline();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_ComputePipeline_H_
diff --git a/dom/webgpu/ComputePipeline.cpp b/dom/webgpu/ComputePipeline.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ComputePipeline.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ComputePipeline.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+ComputePipeline::~ComputePipeline() = default;
+
+WEBGPU_IMPL_GOOP_0(ComputePipeline)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/DepthStencilState.h b/dom/webgpu/DepthStencilState.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/DepthStencilState.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_DepthStencilState_H_
+#define WEBGPU_DepthStencilState_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class DepthStencilState final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(DepthStencilState)
+
+private:
+    DepthStencilState() = delete;
+    virtual ~DepthStencilState();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_DepthStencilState_H_
diff --git a/dom/webgpu/DepthStencilState.cpp b/dom/webgpu/DepthStencilState.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/DepthStencilState.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "DepthStencilState.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+DepthStencilState::~DepthStencilState() = default;
+
+WEBGPU_IMPL_GOOP_0(DepthStencilState)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Device.h b/dom/webgpu/Device.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Device.h
@@ -0,0 +1,103 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_DEVICE_H_
+#define WEBGPU_DEVICE_H_
+
+#include "mozilla/RefPtr.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+struct WebGPUExtensions;
+struct WebGPUFeatures;
+struct WebGPULimits;
+
+struct WebGPUBufferDescriptor;
+struct WebGPUTextureDescriptor;
+struct WebGPUSamplerDescriptor;
+struct WebGPUBindGroupLayoutDescriptor;
+struct WebGPUPipelineLayoutDescriptor;
+struct WebGPUBindGroupDescriptor;
+struct WebGPUBlendStateDescriptor;
+struct WebGPUDepthStencilStateDescriptor;
+struct WebGPUInputStateDescriptor;
+struct WebGPUShaderModuleDescriptor;
+struct WebGPUAttachmentStateDescriptor;
+struct WebGPUComputePipelineDescriptor;
+struct WebGPURenderPipelineDescriptor;
+struct WebGPUCommandEncoderDescriptor;
+
+class Promise;
+class WebGPUBufferOrWebGPUTexture;
+class WebGPULogCallback;
+} // namespace dom
+
+namespace webgpu {
+class Adapter;
+class AttachmentState;
+class BindGroup;
+class BindGroupLayout;
+class BlendState;
+class Buffer;
+class CommandEncoder;
+class ComputePipeline;
+class DepthStencilState;
+class Fence;
+class InputState;
+class PipelineLayout;
+class Queue;
+class RenderPipeline;
+class Sampler;
+class ShaderModule;
+class Texture;
+
+class Device final
+    : public ChildOf<Adapter>
+{
+public:
+    WEBGPU_DECL_GOOP(Device)
+
+private:
+    Device() = delete;
+    virtual ~Device();
+
+public:
+    already_AddRefed<webgpu::Adapter> Adapter() const;
+
+    void Extensions(dom::WebGPUExtensions& out) const;
+    void Features(dom::WebGPUFeatures& out) const;
+    void Limits(dom::WebGPULimits& out) const;
+
+    already_AddRefed<Buffer> CreateBuffer(const dom::WebGPUBufferDescriptor& desc) const;
+    already_AddRefed<Texture> CreateTexture(const dom::WebGPUTextureDescriptor& desc) const;
+    already_AddRefed<Sampler> CreateSampler(const dom::WebGPUSamplerDescriptor& desc) const;
+
+    already_AddRefed<BindGroupLayout> CreateBindGroupLayout(const dom::WebGPUBindGroupLayoutDescriptor& desc) const;
+    already_AddRefed<PipelineLayout> CreatePipelineLayout(const dom::WebGPUPipelineLayoutDescriptor& desc) const;
+    already_AddRefed<BindGroup> CreateBindGroup(const dom::WebGPUBindGroupDescriptor& desc) const;
+
+    already_AddRefed<BlendState> CreateBlendState(const dom::WebGPUBlendStateDescriptor& desc) const;
+    already_AddRefed<DepthStencilState> CreateDepthStencilState(const dom::WebGPUDepthStencilStateDescriptor& desc) const;
+    already_AddRefed<InputState> CreateInputState(const dom::WebGPUInputStateDescriptor& desc) const;
+    already_AddRefed<ShaderModule> CreateShaderModule(const dom::WebGPUShaderModuleDescriptor& desc) const;
+    already_AddRefed<AttachmentState> CreateAttachmentState(const dom::WebGPUAttachmentStateDescriptor& desc) const;
+    already_AddRefed<ComputePipeline> CreateComputePipeline(const dom::WebGPUComputePipelineDescriptor& desc) const;
+    already_AddRefed<RenderPipeline> CreateRenderPipeline(const dom::WebGPURenderPipelineDescriptor& desc) const;
+
+    already_AddRefed<CommandEncoder> CreateCommandEncoder(const dom::WebGPUCommandEncoderDescriptor& desc) const;
+
+    already_AddRefed<Queue> GetQueue() const;
+
+    RefPtr<dom::WebGPULogCallback> OnLog() const;
+    void SetOnLog(const dom::WebGPULogCallback& callback) const;
+
+    already_AddRefed<dom::Promise> GetObjectStatus(const dom::WebGPUBufferOrWebGPUTexture& obj) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_DEVICE_H_
diff --git a/dom/webgpu/Device.cpp b/dom/webgpu/Device.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Device.cpp
@@ -0,0 +1,153 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Device.h"
+
+#include "Adapter.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Device::~Device() = default;
+
+already_AddRefed<webgpu::Adapter>
+Device::Adapter() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+Device::Extensions(dom::WebGPUExtensions& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+Device::Features(dom::WebGPUFeatures& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+Device::Limits(dom::WebGPULimits& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Buffer>
+Device::CreateBuffer(const dom::WebGPUBufferDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Texture>
+Device::CreateTexture(const dom::WebGPUTextureDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Sampler>
+Device::CreateSampler(const dom::WebGPUSamplerDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+
+already_AddRefed<BindGroupLayout>
+Device::CreateBindGroupLayout(const dom::WebGPUBindGroupLayoutDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<PipelineLayout>
+Device::CreatePipelineLayout(const dom::WebGPUPipelineLayoutDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<BindGroup>
+Device::CreateBindGroup(const dom::WebGPUBindGroupDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+
+already_AddRefed<BlendState>
+Device::CreateBlendState(const dom::WebGPUBlendStateDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<DepthStencilState>
+Device::CreateDepthStencilState(const dom::WebGPUDepthStencilStateDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<InputState>
+Device::CreateInputState(const dom::WebGPUInputStateDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<ShaderModule>
+Device::CreateShaderModule(const dom::WebGPUShaderModuleDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<AttachmentState>
+Device::CreateAttachmentState(const dom::WebGPUAttachmentStateDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<ComputePipeline>
+Device::CreateComputePipeline(const dom::WebGPUComputePipelineDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<RenderPipeline>
+Device::CreateRenderPipeline(const dom::WebGPURenderPipelineDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<CommandEncoder>
+Device::CreateCommandEncoder(const dom::WebGPUCommandEncoderDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Queue>
+Device::GetQueue() const
+{
+    MOZ_CRASH("todo");
+}
+
+RefPtr<dom::WebGPULogCallback>
+Device::OnLog() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+Device::SetOnLog(const dom::WebGPULogCallback& callback) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<dom::Promise>
+Device::GetObjectStatus(const dom::WebGPUBufferOrWebGPUTexture& obj) const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(Device)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Fence.h b/dom/webgpu/Fence.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Fence.h
@@ -0,0 +1,38 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_Fence_H_
+#define WEBGPU_Fence_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+class Promise;
+} // namespace dom
+namespace webgpu {
+
+class Device;
+
+class Fence final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(Fence)
+
+private:
+    Fence() = delete;
+    virtual ~Fence();
+
+public:
+    bool Wait(double milliseconds) const;
+    already_AddRefed<dom::Promise> Promise() const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_Fence_H_
diff --git a/dom/webgpu/Fence.cpp b/dom/webgpu/Fence.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Fence.cpp
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Fence.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Fence::~Fence() = default;
+
+bool
+Fence::Wait(const double milliseconds) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<dom::Promise>
+Fence::Promise() const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(Fence)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/InputState.h b/dom/webgpu/InputState.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/InputState.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_InputState_H_
+#define WEBGPU_InputState_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class InputState final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(InputState)
+
+private:
+    InputState() = delete;
+    virtual ~InputState();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_InputState_H_
diff --git a/dom/webgpu/InputState.cpp b/dom/webgpu/InputState.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/InputState.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "InputState.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+InputState::~InputState() = default;
+
+WEBGPU_IMPL_GOOP_0(InputState)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Instance.h b/dom/webgpu/Instance.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Instance.h
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_INSTANCE_H_
+#define WEBGPU_INSTANCE_H_
+
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/RefPtr.h"
+#include "nsCOMPtr.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+struct WebGPUAdapterDescriptor;
+} // namespace dom
+
+namespace webgpu {
+class Adapter;
+class InstanceProvider;
+
+class Instance final
+    : public nsWrapperCache
+{
+public:
+    WEBGPU_DECL_GOOP(Instance)
+
+    const nsCOMPtr<nsIGlobalObject> mParent;
+
+    static RefPtr<Instance> Create(nsIGlobalObject* parent);
+
+private:
+    explicit Instance(nsIGlobalObject* parent);
+    virtual ~Instance();
+
+public:
+    nsIGlobalObject* GetParentObject() const { return mParent.get(); }
+
+    already_AddRefed<Adapter> GetAdapter(const dom::WebGPUAdapterDescriptor& desc) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_INSTANCE_H_
diff --git a/dom/webgpu/Instance.cpp b/dom/webgpu/Instance.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Instance.cpp
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Instance.h"
+
+#include "Adapter.h"
+#include "InstanceProvider.h"
+#include "mozilla/dom/WebGPUBinding.h"
+#include "nsIGlobalObject.h"
+
+namespace mozilla {
+namespace webgpu {
+
+/*static*/ RefPtr<Instance>
+Instance::Create(nsIGlobalObject* parent)
+{
+    return new Instance(parent);
+}
+
+Instance::Instance(nsIGlobalObject* parent)
+    : mParent(parent)
+{
+}
+
+Instance::~Instance() = default;
+
+already_AddRefed<Adapter>
+Instance::GetAdapter(const dom::WebGPUAdapterDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+template<typename T>
+void
+ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& callback,
+                            const nsCOMPtr<T>& field,
+                            const char* name, uint32_t flags)
+{
+    CycleCollectionNoteChild(callback, field.get(), name, flags);
+}
+
+template<typename T>
+void
+ImplCycleCollectionUnlink(const nsCOMPtr<T>& field)
+{
+    const auto mut = const_cast<nsCOMPtr<T>*>(&field);
+    *mut = nullptr;
+}
+
+JSObject*
+Instance::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto)
+{
+    return dom::WebGPU_Binding::Wrap(cx, this, givenProto);
+}
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(Instance, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(Instance, Release)
+
+NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(Instance, mParent)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/InstanceProvider.h b/dom/webgpu/InstanceProvider.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/InstanceProvider.h
@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_INSTANCE_PROVIDER_H_
+#define WEBGPU_INSTANCE_PROVIDER_H_
+
+#include "mozilla/AlreadyAddRefed.h"
+#include "mozilla/Maybe.h"
+#include "mozilla/RefPtr.h"
+
+class nsCycleCollectionTraversalCallback;
+class nsIGlobalObject;
+
+namespace mozilla {
+namespace webgpu {
+class Instance;
+
+class InstanceProvider
+{
+private:
+    nsIGlobalObject* const mGlobal;
+    mutable Maybe<RefPtr<Instance>> mInstance;
+
+protected:
+    explicit InstanceProvider(nsIGlobalObject* global);
+    virtual ~InstanceProvider();
+
+public:
+    already_AddRefed<Instance> Webgpu() const;
+
+    nsIGlobalObject* GetParentObject() const { return mGlobal; }
+
+    void CcTraverse(nsCycleCollectionTraversalCallback&) const;
+    void CcUnlink();
+};
+
+template<typename T>
+void
+ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& callback,
+                            const Maybe<T>& field,
+                            const char* name, uint32_t flags)
+{
+    if (field) {
+        CycleCollectionNoteChild(callback, field.value(), name, flags);
+    }
+}
+
+template<typename T>
+void
+ImplCycleCollectionUnlink(Maybe<T>& field)
+{
+    field = Nothing();
+}
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_INSTANCE_PROVIDER_H_
diff --git a/dom/webgpu/InstanceProvider.cpp b/dom/webgpu/InstanceProvider.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/InstanceProvider.cpp
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "InstanceProvider.h"
+
+#include "Instance.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+InstanceProvider::InstanceProvider(nsIGlobalObject* const global)
+    : mGlobal(global)
+{ }
+
+InstanceProvider::~InstanceProvider() = default;
+
+already_AddRefed<Instance>
+InstanceProvider::Webgpu() const
+{
+    if (!mInstance) {
+        const auto inst = Instance::Create(mGlobal);
+        mInstance = Some(inst);
+    }
+    auto ret = mInstance.value();
+    return ret.forget();
+}
+
+void
+InstanceProvider::CcTraverse(nsCycleCollectionTraversalCallback& callback) const
+{
+    if (mInstance) {
+        CycleCollectionNoteChild(callback, mInstance.ref().get(),
+                                 "webgpu::InstanceProvider::mInstance", 0);
+    }
+}
+
+void
+InstanceProvider::CcUnlink()
+{
+    mInstance = Some(nullptr);
+}
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/LogEntry.h b/dom/webgpu/LogEntry.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/LogEntry.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_LogEntry_H_
+#define WEBGPU_LogEntry_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+enum class WebGPULogEntryType : uint8_t;
+} // namespace dom
+namespace webgpu {
+
+class Device;
+
+class LogEntry final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(LogEntry)
+
+private:
+    LogEntry() = delete;
+    virtual ~LogEntry();
+
+public:
+    dom::WebGPULogEntryType Type() const;
+    void GetObj(JSContext* cx, JS::MutableHandleValue out) const;
+    void GetReason(nsString& out) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_LogEntry_H_
diff --git a/dom/webgpu/LogEntry.cpp b/dom/webgpu/LogEntry.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/LogEntry.cpp
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "LogEntry.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+LogEntry::~LogEntry() = default;
+
+dom::WebGPULogEntryType
+LogEntry::Type() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+LogEntry::GetObj(JSContext* cx, JS::MutableHandleValue out) const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+LogEntry::GetReason(nsString& out) const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(LogEntry)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/ObjectModel.h b/dom/webgpu/ObjectModel.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ObjectModel.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_OBJECT_MODEL_H_
+#define WEBGPU_OBJECT_MODEL_H_
+
+#include "nsWrapperCache.h"
+
+class nsIGlobalObject;
+
+namespace mozilla {
+namespace webgpu {
+
+template<typename T>
+class ChildOf
+    : public nsWrapperCache
+{
+public:
+    const RefPtr<T> mParent;
+
+    explicit ChildOf(T* parent = nullptr); // TODO: This can't be nullptr eventually.
+protected:
+    virtual ~ChildOf();
+
+public:
+    nsIGlobalObject* GetParentObject() const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#define WEBGPU_DECL_GOOP(T) \
+    NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(T) \
+    NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(T) \
+    virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) override;
+
+#define WEBGPU_IMPL_GOOP_INTERNAL(T) \
+    JSObject* \
+    T::WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) \
+    { \
+        return dom::WebGPU ## T ## _Binding::Wrap(cx, this, givenProto); \
+    } \
+    NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(T, AddRef) \
+    NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(T, Release)
+
+#define WEBGPU_IMPL_GOOP(T,...) \
+    WEBGPU_IMPL_GOOP_INTERNAL(T) \
+    NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(T, mParent, __VA_ARGS__)
+
+#define WEBGPU_IMPL_GOOP_0(T) \
+    WEBGPU_IMPL_GOOP_INTERNAL(T) \
+    NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(T, mParent)
+
+template<typename T>
+void
+ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& callback,
+                            const RefPtr<T>& field,
+                            const char* name, uint32_t flags)
+{
+    CycleCollectionNoteChild(callback, field.get(), name, flags);
+}
+
+template<typename T>
+void
+ImplCycleCollectionUnlink(const RefPtr<T>& field)
+{
+    const auto mutPtr = const_cast< RefPtr<T>* >(&field);
+    ImplCycleCollectionUnlink(*mutPtr);
+}
+
+#endif // WEBGPU_OBJECT_MODEL_H_
diff --git a/dom/webgpu/ObjectModel.cpp b/dom/webgpu/ObjectModel.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ObjectModel.cpp
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ObjectModel.h"
+
+#include "Adapter.h"
+#include "Device.h"
+#include "Instance.h"
+
+namespace mozilla {
+namespace webgpu {
+
+template<typename T>
+ChildOf<T>::ChildOf(T* const parent)
+    : mParent(parent)
+{ }
+
+template<typename T>
+ChildOf<T>::~ChildOf() = default;
+
+template<typename T>
+nsIGlobalObject*
+ChildOf<T>::GetParentObject() const
+{
+    return mParent->GetParentObject();
+}
+
+template class ChildOf<Adapter>;
+template class ChildOf<Device>;
+template class ChildOf<Instance>;
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/PipelineLayout.h b/dom/webgpu/PipelineLayout.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/PipelineLayout.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_PipelineLayout_H_
+#define WEBGPU_PipelineLayout_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class PipelineLayout final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(PipelineLayout)
+
+private:
+    PipelineLayout() = delete;
+    virtual ~PipelineLayout();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_PipelineLayout_H_
diff --git a/dom/webgpu/PipelineLayout.cpp b/dom/webgpu/PipelineLayout.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/PipelineLayout.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "PipelineLayout.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+PipelineLayout::~PipelineLayout() = default;
+
+WEBGPU_IMPL_GOOP_0(PipelineLayout)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Queue.h b/dom/webgpu/Queue.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Queue.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_Queue_H_
+#define WEBGPU_Queue_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+template<typename T> class Sequence;
+} // namespace dom
+
+namespace webgpu {
+
+class CommandBuffer;
+class Device;
+class Fence;
+
+class Queue final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(Queue)
+
+private:
+    Queue() = delete;
+    virtual ~Queue();
+
+public:
+    void Submit(const dom::Sequence<OwningNonNull<CommandBuffer>>& buffers) const;
+    already_AddRefed<Fence> InsertFence() const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_Queue_H_
diff --git a/dom/webgpu/Queue.cpp b/dom/webgpu/Queue.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Queue.cpp
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Queue.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Queue::~Queue() = default;
+
+void
+Queue::Submit(const dom::Sequence<OwningNonNull<CommandBuffer>>& buffers) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Fence>
+Queue::InsertFence() const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(Queue)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/RenderPipeline.h b/dom/webgpu/RenderPipeline.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/RenderPipeline.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_RenderPipeline_H_
+#define WEBGPU_RenderPipeline_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class RenderPipeline final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(RenderPipeline)
+
+private:
+    RenderPipeline() = delete;
+    virtual ~RenderPipeline();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_RenderPipeline_H_
diff --git a/dom/webgpu/RenderPipeline.cpp b/dom/webgpu/RenderPipeline.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/RenderPipeline.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "RenderPipeline.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+RenderPipeline::~RenderPipeline() = default;
+
+WEBGPU_IMPL_GOOP_0(RenderPipeline)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Sampler.h b/dom/webgpu/Sampler.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Sampler.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_SAMPLER_H_
+#define WEBGPU_SAMPLER_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class Sampler final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(Sampler)
+
+private:
+    Sampler() = delete;
+    virtual ~Sampler();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_SAMPLER_H_
diff --git a/dom/webgpu/Sampler.cpp b/dom/webgpu/Sampler.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Sampler.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Sampler.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Sampler::~Sampler() = default;
+
+WEBGPU_IMPL_GOOP_0(Sampler)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/ShaderModule.h b/dom/webgpu/ShaderModule.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ShaderModule.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_ShaderModule_H_
+#define WEBGPU_ShaderModule_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class ShaderModule final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(ShaderModule)
+
+private:
+    ShaderModule() = delete;
+    virtual ~ShaderModule();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_ShaderModule_H_
diff --git a/dom/webgpu/ShaderModule.cpp b/dom/webgpu/ShaderModule.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/ShaderModule.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "ShaderModule.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+ShaderModule::~ShaderModule() = default;
+
+WEBGPU_IMPL_GOOP_0(ShaderModule)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/SwapChain.h b/dom/webgpu/SwapChain.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/SwapChain.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_SwapChain_H_
+#define WEBGPU_SwapChain_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+struct WebGPUSwapChainDescriptor;
+} // namespace dom
+
+namespace webgpu {
+
+class Device;
+class Texture;
+
+class SwapChain final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(SwapChain)
+
+private:
+    SwapChain() = delete;
+    virtual ~SwapChain();
+
+public:
+    void Configure(const dom::WebGPUSwapChainDescriptor& desc) const;
+    already_AddRefed<Texture> GetNextTexture() const;
+    void Present() const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_SwapChain_H_
diff --git a/dom/webgpu/SwapChain.cpp b/dom/webgpu/SwapChain.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/SwapChain.cpp
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "SwapChain.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+SwapChain::~SwapChain() = default;
+
+void
+SwapChain::Configure(const dom::WebGPUSwapChainDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+already_AddRefed<Texture>
+SwapChain::GetNextTexture() const
+{
+    MOZ_CRASH("todo");
+}
+
+void
+SwapChain::Present() const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(SwapChain)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/Texture.h b/dom/webgpu/Texture.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Texture.h
@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_Texture_H_
+#define WEBGPU_Texture_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace dom {
+struct WebGPUTextureViewDescriptor;
+} // namespace dom
+
+namespace webgpu {
+
+class Device;
+class TextureView;
+
+class Texture final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(Texture)
+
+private:
+    Texture() = delete;
+    virtual ~Texture();
+
+public:
+    already_AddRefed<TextureView> CreateTextureView(const dom::WebGPUTextureViewDescriptor&) const;
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_Texture_H_
diff --git a/dom/webgpu/Texture.cpp b/dom/webgpu/Texture.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/Texture.cpp
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "Texture.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+#include "TextureView.h"
+
+namespace mozilla {
+namespace webgpu {
+
+Texture::~Texture() = default;
+
+already_AddRefed<TextureView>
+Texture::CreateTextureView(const dom::WebGPUTextureViewDescriptor& desc) const
+{
+    MOZ_CRASH("todo");
+}
+
+WEBGPU_IMPL_GOOP_0(Texture)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/TextureView.h b/dom/webgpu/TextureView.h
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/TextureView.h
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef WEBGPU_TEXTURE_VIEW_H_
+#define WEBGPU_TEXTURE_VIEW_H_
+
+#include "nsWrapperCache.h"
+#include "ObjectModel.h"
+
+namespace mozilla {
+namespace webgpu {
+
+class Device;
+
+class TextureView final
+    : public ChildOf<Device>
+{
+public:
+    WEBGPU_DECL_GOOP(TextureView)
+
+private:
+    TextureView() = delete;
+    virtual ~TextureView();
+};
+
+} // namespace webgpu
+} // namespace mozilla
+
+#endif // WEBGPU_TEXTURE_VIEW_H_
diff --git a/dom/webgpu/TextureView.cpp b/dom/webgpu/TextureView.cpp
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/TextureView.cpp
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "TextureView.h"
+
+#include "Device.h"
+#include "mozilla/dom/WebGPUBinding.h"
+
+namespace mozilla {
+namespace webgpu {
+
+TextureView::~TextureView() = default;
+
+WEBGPU_IMPL_GOOP_0(TextureView)
+
+} // namespace webgpu
+} // namespace mozilla
diff --git a/dom/webgpu/mochitest/mochitest-no-pref.ini b/dom/webgpu/mochitest/mochitest-no-pref.ini
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/mochitest/mochitest-no-pref.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+subsuite = webgl1-core
+
+[test_disabled.html]
+
diff --git a/dom/webgpu/mochitest/mochitest.ini b/dom/webgpu/mochitest/mochitest.ini
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/mochitest/mochitest.ini
@@ -0,0 +1,6 @@
+[DEFAULT]
+subsuite = webgl1-core
+prefs = dom.webgpu.enable=true
+
+[test_enabled.html]
+
diff --git a/dom/webgpu/mochitest/test_disabled.html b/dom/webgpu/mochitest/test_disabled.html
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/mochitest/test_disabled.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset='utf-8'>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+</head>
+<body>
+<script>
+
+ok(!SpecialPowers.getBoolPref('dom.webgpu.enable'), 'Pref should be disabled.');
+ok(window.WebGPU === undefined, 'window.WebGPU === undefined');
+ok(window.webgpu === undefined, 'window.webgpu === undefined');
+
+</script>
+</body>
+</html>
+
diff --git a/dom/webgpu/mochitest/test_enabled.html b/dom/webgpu/mochitest/test_enabled.html
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/mochitest/test_enabled.html
@@ -0,0 +1,18 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset='utf-8'>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" href="/tests/SimpleTest/test.css">
+</head>
+<body>
+<script>
+
+ok(SpecialPowers.getBoolPref('dom.webgpu.enable'), 'Pref should be enabled.');
+ok(window.WebGPU !== undefined, 'window.WebGPU !== undefined');
+ok(window.webgpu !== undefined, 'window.webgpu !== undefined');
+
+</script>
+</body>
+</html>
+
diff --git a/dom/webgpu/moz.build b/dom/webgpu/moz.build
new file mode 100644
--- /dev/null
+++ b/dom/webgpu/moz.build
@@ -0,0 +1,49 @@
+# -*- 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', 'Canvas: WebGL')
+
+MOCHITEST_MANIFESTS += [
+    'mochitest/mochitest-no-pref.ini',
+    'mochitest/mochitest.ini',
+]
+
+h_and_cpp = [
+    'Adapter',
+    'AttachmentState',
+    'BindGroup',
+    'BindGroupLayout',
+    'BlendState',
+    'Buffer',
+    'CommandBuffer',
+    'CommandEncoder',
+    'ComputePipeline',
+    'DepthStencilState',
+    'Device',
+    'Fence',
+    'InputState',
+    'Instance',
+    'InstanceProvider',
+    'LogEntry',
+    'ObjectModel',
+    'PipelineLayout',
+    'Queue',
+    'RenderPipeline',
+    'Sampler',
+    'ShaderModule',
+    'SwapChain',
+    'Texture',
+    'TextureView',
+]
+EXPORTS.mozilla.webgpu += [x + '.h' for x in h_and_cpp]
+UNIFIED_SOURCES += [x + '.cpp' for x in h_and_cpp]
+
+EXPORTS.mozilla.webgpu += [
+#    'ObjectModel.h',
+]
+
+FINAL_LIBRARY = 'xul'
diff --git a/dom/webidl/Element.webidl b/dom/webidl/Element.webidl
--- a/dom/webidl/Element.webidl
+++ b/dom/webidl/Element.webidl
@@ -39,10 +39,12 @@
   [Pure]
   DOMString? getAttribute(DOMString name);
   [Pure]
   DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
+  boolean toggleAttribute(DOMString name, optional boolean force);
+  [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
   void setAttribute(DOMString name, DOMString value);
   [CEReactions, NeedsSubjectPrincipal=NonSystem, Throws]
   void setAttributeNS(DOMString? namespace, DOMString name, DOMString value);
   [CEReactions, Throws]
   void removeAttribute(DOMString name);
diff --git a/dom/webidl/MediaCapabilities.webidl b/dom/webidl/MediaCapabilities.webidl
new file mode 100644
--- /dev/null
+++ b/dom/webidl/MediaCapabilities.webidl
@@ -0,0 +1,70 @@
+/* -*- 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/.
+ *
+ * The origin of this IDL file is
+ * https://wicg.github.io/media-capabilities/
+ *
+ * Copyright © 2018 the Contributors to the Media Capabilities Specification
+ */
+
+dictionary MediaConfiguration {
+  VideoConfiguration video;
+  AudioConfiguration audio;
+};
+
+dictionary MediaDecodingConfiguration : MediaConfiguration {
+  required MediaDecodingType type;
+};
+
+dictionary MediaEncodingConfiguration : MediaConfiguration {
+  required MediaEncodingType type;
+};
+
+enum MediaDecodingType {
+  "file",
+  "media-source",
+};
+
+enum MediaEncodingType {
+  "record",
+  "transmission"
+};
+
+// all members are specified as required in the spec.
+// We enforce that requirement in the MediaCapabilities code instead
+// See https://github.com/heycam/webidl/issues/76
+dictionary VideoConfiguration {
+  DOMString contentType;
+  unsigned long width;
+  unsigned long height;
+  unsigned long long bitrate;
+  DOMString framerate;
+};
+
+// contentType member is specified as required in the spec.
+// We enforce that requirement in the MediaCapabilities code instead
+// See https://github.com/heycam/webidl/issues/76
+dictionary AudioConfiguration {
+  DOMString contentType;
+  DOMString channels;
+  unsigned long long bitrate;
+  unsigned long samplerate;
+};
+
+[Exposed=(Window, Worker), Func="mozilla::dom::MediaCapabilities::Enabled",
+ HeaderFile="mozilla/dom/MediaCapabilities.h"]
+interface MediaCapabilitiesInfo {
+  readonly attribute boolean supported;
+  readonly attribute boolean smooth;
+  readonly attribute boolean powerEfficient;
+};
+
+[Exposed=(Window, Worker), Func="mozilla::dom::MediaCapabilities::Enabled"]
+interface MediaCapabilities {
+  [NewObject]
+  Promise<MediaCapabilitiesInfo> decodingInfo(MediaDecodingConfiguration configuration);
+  [NewObject]
+  Promise<MediaCapabilitiesInfo> encodingInfo(MediaEncodingConfiguration configuration);
+};
diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
--- a/dom/webidl/Navigator.webidl
+++ b/dom/webidl/Navigator.webidl
@@ -14,10 +14,11 @@
  * http://www.w3.org/TR/beacon/#sec-beacon-method
  * https://html.spec.whatwg.org/#navigatorconcurrenthardware
  * http://wicg.github.io/netinfo/#extensions-to-the-navigator-interface
  * https://w3c.github.io/webappsec-credential-management/#framework-credential-management
  * https://w3c.github.io/webdriver/webdriver-spec.html#interface
+ * https://wicg.github.io/media-capabilities/#idl-index
  *
  * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and
  * Opera Software ASA. You are granted a license to use, reproduce
  * and create derivative works of this document.
  */
@@ -148,10 +149,17 @@
 partial interface Navigator {
     [Pref="dom.w3c_pointer_events.enabled"]
     readonly attribute long maxTouchPoints;
 };
 
+// https://wicg.github.io/media-capabilities/#idl-index
+[Exposed=Window]
+partial interface Navigator {
+  [SameObject, Func="mozilla::dom::MediaCapabilities::Enabled"]
+  readonly attribute MediaCapabilities mediaCapabilities;
+};
+
 // Mozilla-specific extensions
 
 // Chrome-only interface for Vibration API permission handling.
 partial interface Navigator {
     /* Set permission state to device vibration.
diff --git a/dom/webidl/Screen.webidl b/dom/webidl/Screen.webidl
--- a/dom/webidl/Screen.webidl
+++ b/dom/webidl/Screen.webidl
@@ -57,5 +57,29 @@
 
 // https://w3c.github.io/screen-orientation
 partial interface Screen {
   readonly attribute ScreenOrientation orientation;
 };
+
+// https://wicg.github.io/media-capabilities/#idl-index
+enum ScreenColorGamut {
+  "srgb",
+  "p3",
+  "rec2020",
+};
+
+[Func="mozilla::dom::MediaCapabilities::Enabled"]
+interface ScreenLuminance {
+  readonly attribute double min;
+  readonly attribute double max;
+  readonly attribute double maxAverage;
+};
+
+partial interface Screen {
+  [Func="mozilla::dom::MediaCapabilities::Enabled"]
+  readonly attribute ScreenColorGamut colorGamut;
+  [Func="mozilla::dom::MediaCapabilities::Enabled"]
+  readonly attribute ScreenLuminance? luminance;
+
+  [Func="mozilla::dom::MediaCapabilities::Enabled"]
+  attribute EventHandler onchange;
+};
diff --git a/dom/webidl/ScrollBoxObject.webidl b/dom/webidl/ScrollBoxObject.webidl
--- a/dom/webidl/ScrollBoxObject.webidl
+++ b/dom/webidl/ScrollBoxObject.webidl
@@ -21,19 +21,13 @@
    * Values will be clamped to make the resuling position legal.
    */
   [Throws]
   void scrollBy(long dx, long dy);
   [Throws]
-  void scrollByLine(long dlines);
-  [Throws]
   void scrollByIndex(long dindexes);
   [Throws]
-  void scrollToLine(long line);
-  [Throws]
   void scrollToElement(Element child);
-  [Throws]
-  void scrollToIndex(long index);
 
   /**
    * Get the current scroll position in css pixels.
    * @see scrollTo for the definition of x and y.
    */
@@ -44,27 +38,8 @@
   [Pure, Throws]
   readonly attribute long scrolledWidth;
   [Pure, Throws]
   readonly attribute long scrolledHeight;
 
-  /**
-   * DEPRECATED: Please use positionX and positionY
-   *
-   * Get the current scroll position in css pixels.
-   * @see scrollTo for the definition of x and y.
-   */
-  [Throws]
-  void getPosition(object x, object y);
-
-  /**
-   * DEPRECATED: Please use scrolledWidth and scrolledHeight
-   */
-  [Throws]
-  void getScrolledSize(object width, object height);
-
   [Throws]
   void ensureElementIsVisible(Element child);
-  [Throws]
-  void ensureIndexIsVisible(long index);
-  [Throws]
-  void ensureLineIsVisible(long line);
 };
diff --git a/dom/webidl/WebGPU.webidl b/dom/webidl/WebGPU.webidl
new file mode 100644
--- /dev/null
+++ b/dom/webidl/WebGPU.webidl
@@ -0,0 +1,639 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * The origin of this IDL file is
+ * https://github.com/gpuweb/gpuweb/blob/master/design/sketch.webidl
+ */
+
+typedef unsigned long u32;
+typedef unsigned long long u64;
+
+// ****************************************************************************
+// ERROR HANDLING
+// ****************************************************************************
+
+enum WebGPULogEntryType {
+    "device-lost",
+    "validation-error",
+    "recoverable-out-of-memory",
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPULogEntry {
+    readonly attribute WebGPULogEntryType type;
+    readonly attribute any obj;
+    readonly attribute DOMString? reason;
+};
+
+enum WebGPUObjectStatus {
+    "valid",
+    "out-of-memory",
+    "invalid",
+};
+
+typedef (WebGPUBuffer or WebGPUTexture) WebGPUStatusable;
+
+callback WebGPULogCallback = void (WebGPULogEntry error);
+
+// ****************************************************************************
+// SHADER RESOURCES (buffer, textures, texture views, samples)
+// ****************************************************************************
+
+// Buffer
+typedef u32 WebGPUBufferUsageFlags;
+[Pref="dom.webgpu.enable"]
+interface WebGPUBufferUsage {
+    const u32 NONE = 0;
+    const u32 MAP_READ = 1;
+    const u32 MAP_WRITE = 2;
+    const u32 TRANSFER_SRC = 4;
+    const u32 TRANSFER_DST = 8;
+    const u32 INDEX = 16;
+    const u32 VERTEX = 32;
+    const u32 UNIFORM = 64;
+    const u32 STORAGE = 128;
+};
+
+dictionary WebGPUBufferDescriptor {
+    u32 size;
+    WebGPUBufferUsageFlags usage;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUBuffer {
+    readonly attribute ArrayBuffer? mapping;
+    void unmap();
+};
+
+// Texture view
+dictionary WebGPUTextureViewDescriptor {
+    // TODO Investigate what goes in there.
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUTextureView {
+};
+
+// Texture
+typedef u32 WebGPUTextureDimensionEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUTextureDimension {
+    const u32 e1D = 0;
+    const u32 e2D = 1;
+    const u32 e3D = 2;
+    // TODO other dimensions (cube, arrays)
+};
+
+typedef u32 WebGPUTextureFormatEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUTextureFormat {
+    const u32 R8_G8_B8_A8_UNORM = 0;
+    const u32 R8_G8_B8_A8_UINT = 1;
+    const u32 B8_G8_R8_A8_UNORM = 2;
+    const u32 D32_FLOAT_S8_UINT = 3;
+    // TODO other formats
+};
+
+typedef u32 WebGPUTextureUsageFlags;
+[Pref="dom.webgpu.enable"]
+interface WebGPUTextureUsage {
+    const u32 NONE = 0;
+    const u32 TRANSFER_SRC = 1;
+    const u32 TRANSFER_DST = 2;
+    const u32 SAMPLED = 4;
+    const u32 STORAGE = 8;
+    const u32 OUTPUT_ATTACHMENT = 16;
+    const u32 PRESENT = 32;
+};
+
+dictionary WebGPUTextureDescriptor {
+    u32 width;
+    u32 height;
+    u32 depth;
+    u32 arraySize;
+    WebGPUTextureDimensionEnum dimension;
+    WebGPUTextureFormatEnum format;
+    WebGPUTextureUsageFlags usage;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUTexture {
+    WebGPUTextureView createTextureView(optional WebGPUTextureViewDescriptor desc);
+};
+
+// Sampler
+typedef u32 WebGPUFilterModeEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUFilterMode {
+    const u32 NEAREST = 0;
+    const u32 LINEAR = 1;
+};
+
+dictionary WebGPUSamplerDescriptor {
+    WebGPUFilterModeEnum magFilter;
+    WebGPUFilterModeEnum minFilter;
+    WebGPUFilterModeEnum mipmapFilter;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUSampler {
+};
+
+// ****************************************************************************
+// BINDING MODEL (bindgroup layout, bindgroup)
+// ****************************************************************************
+
+// BindGroupLayout
+typedef u32 WebGPUShaderStageFlags;
+[Pref="dom.webgpu.enable"]
+interface WebGPUShaderStageBit {
+    const u32 NONE = 0;
+    const u32 VERTEX = 1;
+    const u32 FRAGMENT = 2;
+    const u32 COMPUTE = 4;
+};
+
+typedef u32 WebGPUBindingTypeEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUBindingType {
+    const u32 UNIFORM_BUFFER = 0;
+    const u32 SAMPLER = 1;
+    const u32 SAMPLED_TEXTURE = 2;
+    const u32 STORAGE_BUFFER = 3;
+    // TODO other binding types (storage images, ...)
+};
+
+dictionary WebGPUBindGroupBinding {
+    WebGPUShaderStageFlags visibility;
+    WebGPUBindingTypeEnum type;
+    u32 start;
+    u32 count;
+};
+
+dictionary WebGPUBindGroupLayoutDescriptor {
+    sequence<WebGPUBindGroupBinding> bindingTypes;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUBindGroupLayout {
+};
+
+// PipelineLayout
+dictionary WebGPUPipelineLayoutDescriptor {
+    sequence<WebGPUBindGroupLayout> bindGroupLayouts;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUPipelineLayout {
+};
+
+// BindGroup
+/* Moved to WebGPUExtras.webidl for now.
+dictionary WebGPUBufferBinding {
+    WebGPUBuffer buffer;
+    u32 offset;
+    u32 size;
+};
+*/
+
+typedef (WebGPUSampler or WebGPUTextureView or WebGPUBufferBinding) WebGPUBindingResource;
+
+dictionary WebGPUBinding {
+    sequence<WebGPUBindingResource> resources;
+    u32 start;
+    u32 count;
+};
+
+dictionary WebGPUBindGroupDescriptor {
+    WebGPUBindGroupLayout layout;
+    sequence<WebGPUBinding> bindings;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUBindGroup {
+};
+
+// ****************************************************************************
+// PIPELINE CREATION (blend state, DS state, ..., pipelines)
+// ****************************************************************************
+
+// BlendState
+typedef u32 WebGPUBlendFactorEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUBlendFactor {
+    const u32 ZERO = 0;
+    const u32 ONE = 1;
+    const u32 SRC_COLOR = 2;
+    const u32 ONE_MINUS_SRC_COLOR = 3;
+    const u32 SRC_ALPHA = 4;
+    const u32 ONE_MINUS_SRC_ALPHA = 5;
+    const u32 DST_COLOR = 6;
+    const u32 ONE_MINUS_DST_COLOR = 7;
+    const u32 DST_ALPHA = 8;
+    const u32 ONE_MINUS_DST_ALPHA = 9;
+    const u32 SRC_ALPHA_SATURATED = 10;
+    const u32 BLEND_COLOR = 11;
+    const u32 ONE_MINUS_BLEND_COLOR = 12;
+};
+
+typedef u32 WebGPUBlendOperationEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUBlendOperation {
+    const u32 ADD = 0;
+    const u32 SUBTRACT = 1;
+    const u32 REVERSE_SUBTRACT = 2;
+    const u32 MIN = 3;
+    const u32 MAX = 4;
+};
+
+typedef u32 WebGPUColorWriteFlags;
+[Pref="dom.webgpu.enable"]
+interface WebGPUColorWriteBits {
+    const u32 NONE = 0;
+    const u32 RED = 1;
+    const u32 GREEN = 2;
+    const u32 BLUE = 4;
+    const u32 ALPHA = 8;
+    const u32 ALL = 15;
+};
+
+dictionary WebGPUBlendDescriptor {
+    WebGPUBlendFactorEnum srcFactor;
+    WebGPUBlendFactorEnum dstFactor;
+    WebGPUBlendOperationEnum operation;
+};
+
+dictionary WebGPUBlendStateDescriptor {
+    boolean blendEnabled;
+    WebGPUBlendDescriptor alpha;
+    WebGPUBlendDescriptor color;
+    WebGPUColorWriteFlags writeMask;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUBlendState {
+};
+
+// DepthStencilState
+typedef u32 WebGPUCompareFunctionEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUCompareFunction {
+    const u32 NEVER = 0;
+    const u32 LESS = 1;
+    const u32 LESS_EQUAL = 2;
+    const u32 GREATER = 3;
+    const u32 GREATER_EQUAL = 4;
+    const u32 EQUAL = 5;
+    const u32 NOT_EQUAL = 6;
+    const u32 ALWAYS = 7;
+};
+
+typedef u32 WebGPUStencilOperationEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUStencilOperation {
+    const u32 KEEP = 0;
+    const u32 ZERO = 1;
+    const u32 REPLACE = 2;
+    const u32 INVERT = 3;
+    const u32 INCREMENT_CLAMP = 4;
+    const u32 DECREMENT_CLAMP = 5;
+    const u32 INCREMENT_WRAP = 6;
+    const u32 DECREMENT_WRAP = 7;
+};
+
+dictionary WebGPUStencilStateFaceDescriptor {
+    WebGPUCompareFunctionEnum compare;
+    WebGPUStencilOperationEnum stencilFailOp;
+    WebGPUStencilOperationEnum depthFailOp;
+    WebGPUStencilOperationEnum passOp;
+};
+
+dictionary WebGPUDepthStencilStateDescriptor {
+    boolean depthWriteEnabled;
+    WebGPUCompareFunctionEnum depthCompare;
+
+    WebGPUStencilStateFaceDescriptor front;
+    WebGPUStencilStateFaceDescriptor back;
+
+    u32 stencilReadMask;
+    u32 stencilWriteMask;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUDepthStencilState {
+};
+
+// InputState
+typedef u32 WebGPUIndexFormatEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUIndexFormat {
+    const u32 UINT16 = 0;
+    const u32 UINT32 = 1;
+};
+
+typedef u32 WebGPUVertexFormatEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUVertexFormat {
+    const u32 FLOAT_R32_G32_B32_A32 = 0;
+    const u32 FLOAT_R32_G32_B32 = 1;
+    const u32 FLOAT_R32_G32 = 2;
+    const u32 FLOAT_R32 = 3;
+    // TODO other vertex formats
+};
+
+typedef u32 WebGPUInputStepModeEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUInputStepMode {
+    const u32 VERTEX = 0;
+    const u32 INSTANCE = 1;
+};
+
+dictionary WebGPUVertexAttributeDescriptor {
+    u32 shaderLocation;
+    u32 inputSlot;
+    u32 offset;
+    WebGPUVertexFormatEnum format;
+};
+
+dictionary WebGPUVertexInputDescriptor {
+    u32 inputSlot;
+    u32 stride;
+    WebGPUInputStepModeEnum stepMode;
+};
+
+dictionary WebGPUInputStateDescriptor {
+    WebGPUIndexFormatEnum indexFormat;
+
+    sequence<WebGPUVertexAttributeDescriptor> attributes;
+    sequence<WebGPUVertexInputDescriptor> inputs;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUInputState {
+};
+
+// ShaderModule
+dictionary WebGPUShaderModuleDescriptor {
+    required ArrayBuffer code;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUShaderModule {
+};
+
+// AttachmentState
+dictionary WebGPUAttachmentStateDescriptor {
+    sequence<WebGPUTextureFormatEnum> formats;
+    // TODO other stuff like sample count etc.
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUAttachmentState {
+};
+
+// Common stuff for ComputePipeline and RenderPipeline
+typedef u32 WebGPUShaderStageEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUShaderStage {
+    const u32 VERTEX = 0;
+    const u32 FRAGMENT = 1;
+    const u32 COMPUTE = 2;
+};
+
+dictionary WebGPUPipelineStageDescriptor {
+    required WebGPUShaderModule shaderModule;
+    required WebGPUShaderStageEnum stage;
+    required DOMString entryPoint;
+    // TODO other stuff like specialization constants?
+};
+
+dictionary WebGPUPipelineDescriptorBase {
+    required WebGPUPipelineLayout layout;
+    sequence<WebGPUPipelineStageDescriptor> stages;
+};
+
+// ComputePipeline
+dictionary WebGPUComputePipelineDescriptor : WebGPUPipelineDescriptorBase {
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUComputePipeline {
+};
+
+// WebGPURenderPipeline
+typedef u32 WebGPUPrimitiveTopologyEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUPrimitiveTopology {
+    const u32 POINT_LIST = 0;
+    const u32 LINE_LIST = 1;
+    const u32 LINE_STRIP = 2;
+    const u32 TRIANGLE_LIST = 3;
+    const u32 TRIANGLE_STRIP = 4;
+};
+
+dictionary WebGPURenderPipelineDescriptor : WebGPUPipelineDescriptorBase {
+    WebGPUPrimitiveTopologyEnum primitiveTopology;
+    sequence<WebGPUBlendState> blendState;
+    WebGPUDepthStencilState depthStencilState;
+    WebGPUInputState inputState;
+    WebGPUAttachmentState attachmentState;
+    // TODO other properties
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPURenderPipeline {
+};
+// ****************************************************************************
+// COMMAND RECORDING (Command buffer and all relevant structures)
+// ****************************************************************************
+
+typedef u32 WebGPULoadOpEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPULoadOp {
+    const u32 CLEAR = 0;
+    const u32 LOAD = 1;
+};
+
+typedef u32 WebGPUStoreOpEnum;
+[Pref="dom.webgpu.enable"]
+interface WebGPUStoreOp {
+    const u32 STORE = 0;
+};
+
+dictionary WebGPURenderPassAttachmentDescriptor {
+    WebGPUTextureView attachment;
+    WebGPULoadOpEnum loadOp;
+    WebGPUStoreOpEnum storeOp;
+};
+
+dictionary WebGPURenderPassDescriptor {
+    sequence<WebGPURenderPassAttachmentDescriptor> colorAttachments;
+    WebGPURenderPassAttachmentDescriptor depthStencilAttachment;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUCommandBuffer {
+};
+
+dictionary WebGPUCommandEncoderDescriptor {
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUCommandEncoder {
+    WebGPUCommandBuffer finishEncoding();
+
+    // Commands allowed outside of "passes"
+    void copyBufferToBuffer(WebGPUBuffer src,
+                            u32 srcOffset,
+                            WebGPUBuffer dst,
+                            u32 dstOffset,
+                            u32 size);
+    // TODO figure out all the arguments required for these
+    void copyBufferToTexture();
+    void copyTextureToBuffer();
+    void copyTextureToTexture();
+    void blit();
+
+    void transitionBuffer(WebGPUBuffer b, WebGPUBufferUsageFlags f);
+
+    // Allowed in both compute and render passes
+    void setPushConstants(WebGPUShaderStageFlags stage,
+                          u32 offset,
+                          u32 count,
+                          ArrayBuffer data);
+    void setBindGroup(u32 index, WebGPUBindGroup bindGroup);
+    void setPipeline((WebGPUComputePipeline or WebGPURenderPipeline) pipeline);
+
+    // Compute pass commands
+    void beginComputePass();
+    void endComputePass();
+
+    void dispatch(u32 x, u32 y, u32 z);
+
+    // Render pass commands
+    void beginRenderPass(optional WebGPURenderPassDescriptor descriptor);
+    void endRenderPass();
+
+    void setBlendColor(float r, float g, float b, float a);
+    void setIndexBuffer(WebGPUBuffer buffer, u32 offset);
+    void setVertexBuffers(u32 startSlot, sequence<WebGPUBuffer> buffers, sequence<u32> offsets);
+
+    void draw(u32 vertexCount, u32 instanceCount, u32 firstVertex, u32 firstInstance);
+    void drawIndexed(u32 indexCount, u32 instanceCount, u32 firstIndex, u32 firstInstance, u32 firstVertex);
+
+    // TODO add missing commands
+};
+
+// ****************************************************************************
+// OTHER (Fence, Queue SwapChain, Device)
+// ****************************************************************************
+
+// Fence
+[Pref="dom.webgpu.enable"]
+interface WebGPUFence {
+    boolean wait(double milliseconds);
+    readonly attribute Promise<void> promise;
+};
+
+// Queue
+[Pref="dom.webgpu.enable"]
+interface WebGPUQueue {
+    void submit(sequence<WebGPUCommandBuffer> buffers);
+    WebGPUFence insertFence();
+};
+
+// SwapChain / RenderingContext
+dictionary WebGPUSwapChainDescriptor {
+    WebGPUTextureUsageFlags usage;
+    WebGPUTextureFormatEnum format;
+    u32 width;
+    u32 height;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUSwapChain {
+    void configure(optional WebGPUSwapChainDescriptor descriptor);
+    WebGPUTexture getNextTexture();
+    void present();
+};
+
+//[Pref="dom.webgpu.enable"]
+//interface WebGPURenderingContext : WebGPUSwapChain {
+//};
+
+// WebGPU "namespace" used for device creation
+dictionary WebGPUExtensions {
+    boolean anisotropicFiltering;
+    boolean logicOp; // Previously a "Feature".
+};
+
+dictionary WebGPULimits {
+    u32 maxBindGroups;
+};
+
+// Device
+[Pref="dom.webgpu.enable"]
+interface WebGPUDevice {
+    readonly attribute WebGPUAdapter adapter;
+    WebGPUExtensions extensions();
+    WebGPULimits limits();
+
+    WebGPUBuffer createBuffer(optional WebGPUBufferDescriptor descriptor);
+    WebGPUTexture createTexture(optional WebGPUTextureDescriptor descriptor);
+    WebGPUSampler createSampler(optional WebGPUSamplerDescriptor descriptor);
+
+    WebGPUBindGroupLayout createBindGroupLayout(optional WebGPUBindGroupLayoutDescriptor descriptor);
+    WebGPUPipelineLayout createPipelineLayout(optional WebGPUPipelineLayoutDescriptor descriptor);
+    WebGPUBindGroup createBindGroup(optional WebGPUBindGroupDescriptor descriptor);
+
+    WebGPUBlendState createBlendState(optional WebGPUBlendStateDescriptor descriptor);
+    WebGPUDepthStencilState createDepthStencilState(optional WebGPUDepthStencilStateDescriptor descriptor);
+    WebGPUInputState createInputState(optional WebGPUInputStateDescriptor descriptor);
+    WebGPUShaderModule createShaderModule(WebGPUShaderModuleDescriptor descriptor);
+    WebGPUAttachmentState createAttachmentState(optional WebGPUAttachmentStateDescriptor descriptor);
+    WebGPUComputePipeline createComputePipeline(WebGPUComputePipelineDescriptor descriptor);
+    WebGPURenderPipeline createRenderPipeline(WebGPURenderPipelineDescriptor descriptor);
+
+    WebGPUCommandEncoder createCommandEncoder(optional WebGPUCommandEncoderDescriptor descriptor);
+
+    WebGPUQueue getQueue();
+
+    attribute WebGPULogCallback onLog;
+    Promise<WebGPUObjectStatus> getObjectStatus(WebGPUStatusable obj);
+};
+
+dictionary WebGPUDeviceDescriptor {
+    WebGPUExtensions extensions;
+    //WebGPULimits limits; Don't expose higher limits for now.
+
+    // TODO are other things configurable like queues?
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPUAdapter {
+    readonly attribute DOMString name;
+    WebGPUExtensions extensions();
+    //WebGPULimits limits(); Don't expose higher limits for now.
+
+    WebGPUDevice createDevice(optional WebGPUDeviceDescriptor descriptor);
+};
+
+enum WebGPUPowerPreference { "default", "low-power", "high-performance" };
+
+dictionary WebGPUAdapterDescriptor {
+    WebGPUPowerPreference powerPreference;
+};
+
+[Pref="dom.webgpu.enable"]
+interface WebGPU {
+    WebGPUAdapter getAdapter(optional WebGPUAdapterDescriptor desc);
+};
+
+// Add a "webgpu" member to Window that contains the global instance of a "WebGPU"
+[NoInterfaceObject]
+interface WebGPUProvider {
+    [SameObject, Replaceable, Pref="dom.webgpu.enable"] readonly attribute WebGPU webgpu;
+};
+//Window includes WebGPUProvider;
diff --git a/dom/webidl/WebGPUExtras.webidl b/dom/webidl/WebGPUExtras.webidl
new file mode 100644
--- /dev/null
+++ b/dom/webidl/WebGPUExtras.webidl
@@ -0,0 +1,14 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Some parts of WebGPU.webidl need to be pulled into a different file due to a codegen
+ * bug/missing support.
+ */
+
+dictionary WebGPUBufferBinding {
+    WebGPUBuffer buffer;
+    u32 offset;
+    u32 size;
+};
diff --git a/dom/webidl/Window.webidl b/dom/webidl/Window.webidl
--- a/dom/webidl/Window.webidl
+++ b/dom/webidl/Window.webidl
@@ -561,5 +561,7 @@
    * localization.
    */
   [Throws, Func="IsChromeOrXBL"]
   readonly attribute IntlUtils intlUtils;
 };
+
+Window implements WebGPUProvider;
diff --git a/dom/webidl/WorkerNavigator.webidl b/dom/webidl/WorkerNavigator.webidl
--- a/dom/webidl/WorkerNavigator.webidl
+++ b/dom/webidl/WorkerNavigator.webidl
@@ -12,10 +12,17 @@
 WorkerNavigator implements NavigatorOnLine;
 WorkerNavigator implements NavigatorConcurrentHardware;
 WorkerNavigator implements NavigatorStorage;
 
 // http://wicg.github.io/netinfo/#extensions-to-the-navigator-interface
-[Exposed=(Worker)]
+[Exposed=Worker]
 partial interface WorkerNavigator {
     [Func="mozilla::dom::DOMPrefs::NetworkInformationEnabled", Throws]
     readonly attribute NetworkInformation connection;
 };
+
+// https://wicg.github.io/media-capabilities/#idl-index
+[Exposed=Worker]
+partial interface WorkerNavigator {
+  [SameObject, Func="mozilla::dom::MediaCapabilities::Enabled"]
+  readonly attribute MediaCapabilities mediaCapabilities;
+};
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -326,10 +326,13 @@
     BUG_COMPONENT = ("Core", "DOM: Device Interfaces")
 
 with Files("WebGL*"):
     BUG_COMPONENT = ("Core", "Canvas: WebGL")
 
+with Files("WebGPU*"):
+    BUG_COMPONENT = ("Core", "Canvas: WebGL")
+
 with Files("WebKitCSSMatrix.webidl"):
     BUG_COMPONENT = ("Core", "DOM: CSS Object Model")
 
 with Files("Webrtc*"):
     BUG_COMPONENT = ("Core", "WebRTC")
@@ -631,10 +634,11 @@
     'LegacyQueryInterface.webidl',
     'LinkStyle.webidl',
     'ListBoxObject.webidl',
     'LocalMediaStream.webidl',
     'Location.webidl',
+    'MediaCapabilities.webidl',
     'MediaDeviceInfo.webidl',
     'MediaDevices.webidl',
     'MediaElementAudioSourceNode.webidl',
     'MediaEncryptedEvent.webidl',
     'MediaError.webidl',
@@ -919,10 +923,12 @@
     'WaveShaperNode.webidl',
     'WebAuthentication.webidl',
     'WebComponents.webidl',
     'WebGL2RenderingContext.webidl',
     'WebGLRenderingContext.webidl',
+    'WebGPU.webidl',
+    'WebGPUExtras.webidl',
     'WebKitCSSMatrix.webidl',
     'WebSocket.webidl',
     'WheelEvent.webidl',
     'WidevineCDMManifest.webidl',
     'WindowOrWorkerGlobalScope.webidl',
diff --git a/dom/workers/WorkerNavigator.h b/dom/workers/WorkerNavigator.h
--- a/dom/workers/WorkerNavigator.h
+++ b/dom/workers/WorkerNavigator.h
@@ -16,10 +16,11 @@
 
 namespace mozilla {
 namespace dom {
 class Promise;
 class StorageManager;
+class MediaCapabilities;
 
 namespace network {
 class Connection;
 } // namespace network
 
@@ -105,10 +106,15 @@
   uint64_t HardwareConcurrency() const;
 
   StorageManager* Storage();
 
   network::Connection* GetConnection(ErrorResult& aRv);
+
+  dom::MediaCapabilities* MediaCapabilities();
+
+private:
+  RefPtr<dom::MediaCapabilities> mMediaCapabilities;
 };
 
 } // namespace dom
 } // namespace mozilla
 
diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp
--- a/dom/workers/WorkerNavigator.cpp
+++ b/dom/workers/WorkerNavigator.cpp
@@ -4,10 +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/BindingUtils.h"
 #include "mozilla/dom/DOMPrefs.h"
+#include "mozilla/dom/MediaCapabilities.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/StorageManager.h"
 #include "mozilla/dom/WorkerNavigator.h"
 #include "mozilla/dom/WorkerNavigatorBinding.h"
@@ -29,11 +30,11 @@
 namespace dom {
 
 using namespace workerinternals;
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WorkerNavigator, mStorageManager,
-                                      mConnection);
+                                      mConnection, mMediaCapabilities);
 
 NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WorkerNavigator, AddRef)
 NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(WorkerNavigator, Release)
 
 WorkerNavigator::WorkerNavigator(const NavigatorProperties& aProperties,
@@ -214,8 +215,22 @@
   }
 
   return mConnection;
 }
 
+dom::MediaCapabilities*
+WorkerNavigator::MediaCapabilities()
+{
+  if (!mMediaCapabilities) {
+    WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
+    MOZ_ASSERT(workerPrivate);
+
+    nsIGlobalObject* global = workerPrivate->GlobalScope();
+    MOZ_ASSERT(global);
+
+    mMediaCapabilities = new dom::MediaCapabilities(global);
+  }
+  return mMediaCapabilities;
+}
 
 } // namespace dom
 } // namespace mozilla
diff --git a/image/imgLoader.cpp b/image/imgLoader.cpp
--- a/image/imgLoader.cpp
+++ b/image/imgLoader.cpp
@@ -15,10 +15,11 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Move.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ChaosMode.h"
 #include "mozilla/LoadInfo.h"
+#include "mozilla/Telemetry.h"
 
 #include "nsImageModule.h"
 #include "imgRequestProxy.h"
 
 #include "nsCOMPtr.h"
@@ -1356,10 +1357,13 @@
 
   sMemReporter = new imgMemoryReporter();
   RegisterStrongMemoryReporter(sMemReporter);
   RegisterImagesContentUsedUncompressedDistinguishedAmount(
     imgMemoryReporter::ImagesContentUsedUncompressedDistinguishedAmount);
+
+  Telemetry::ScalarSet(Telemetry::ScalarID::IMAGES_WEBP_PROBE_OBSERVED, false);
+  Telemetry::ScalarSet(Telemetry::ScalarID::IMAGES_WEBP_CONTENT_OBSERVED, false);
 }
 
 void imgLoader::ShutdownMemoryReporter()
 {
   UnregisterImagesContentUsedUncompressedDistinguishedAmount();
diff --git a/ipc/mscom/COMPtrHolder.h b/ipc/mscom/COMPtrHolder.h
--- a/ipc/mscom/COMPtrHolder.h
+++ b/ipc/mscom/COMPtrHolder.h
@@ -160,11 +160,11 @@
       XRE_IsParentProcess() && mozilla::GetEffectiveContentSandboxLevel() >= 3;
 #else
     const bool sIsStreamPreservationNeeded = false;
 #endif // defined(MOZ_CONTENT_SANDBOX)
 
-    paramType::EnvType env;
+    typename paramType::EnvType env;
 
     mozilla::mscom::ProxyStreamFlags flags = sIsStreamPreservationNeeded ?
          mozilla::mscom::ProxyStreamFlags::ePreservable :
          mozilla::mscom::ProxyStreamFlags::eDefault;
 
diff --git a/ipc/mscom/Interceptor.cpp b/ipc/mscom/Interceptor.cpp
--- a/ipc/mscom/Interceptor.cpp
+++ b/ipc/mscom/Interceptor.cpp
@@ -242,11 +242,11 @@
     return E_INVALIDARG;
   }
 
   detail::LiveSetAutoLock lock(GetLiveSet());
 
-  RefPtr<IWeakReference> existingWeak(std::move(GetLiveSet().Get(aTarget.get())));
+  RefPtr<IWeakReference> existingWeak(GetLiveSet().Get(aTarget.get()));
   if (existingWeak) {
     RefPtr<IWeakReferenceSource> existingStrong;
     if (SUCCEEDED(existingWeak->ToStrongRef(getter_AddRefs(existingStrong)))) {
       // QI on existingStrong may touch other threads. Since we now hold a
       // strong ref on the interceptor, we may now release the lock.
@@ -540,16 +540,29 @@
 {
   MOZ_ASSERT(aOutInterceptor);
   MOZ_ASSERT(aTargetIid != IID_IMarshal);
   MOZ_ASSERT(!IsProxy(aTarget.get()));
 
+  HRESULT hr = E_UNEXPECTED;
+
+  auto hasFailed = [&hr]() -> bool {
+    return FAILED(hr);
+  };
+
+  auto cleanup = [&aLiveSetLock]() -> void {
+    aLiveSetLock.Unlock();
+  };
+
+  ExecuteWhen<decltype(hasFailed), decltype(cleanup)>
+    onFail(hasFailed, cleanup);
+
   if (aTargetIid == IID_IUnknown) {
     // We must lock mInterceptorMapMutex so that nothing can race with us once
     // we have been published to the live set.
     MutexAutoLock lock(mInterceptorMapMutex);
 
-    HRESULT hr = PublishTarget(aLiveSetLock, nullptr, aTargetIid, std::move(aTarget));
+    hr = PublishTarget(aLiveSetLock, nullptr, aTargetIid, std::move(aTarget));
     ENSURE_HR_SUCCEEDED(hr);
 
     hr = QueryInterface(aTargetIid, aOutInterceptor);
     ENSURE_HR_SUCCEEDED(hr);
     return hr;
@@ -557,11 +570,11 @@
 
   // Raise the refcount for stabilization purposes during aggregation
   WeakReferenceSupport::StabilizeRefCount stabilizer(*this);
 
   RefPtr<IUnknown> unkInterceptor;
-  HRESULT hr = CreateInterceptor(aTargetIid,
+  hr = CreateInterceptor(aTargetIid,
                                  static_cast<WeakReferenceSupport*>(this),
                                  getter_AddRefs(unkInterceptor));
   ENSURE_HR_SUCCEEDED(hr);
 
   RefPtr<ICallInterceptor> interceptor;
@@ -876,11 +889,11 @@
 
   detail::LiveSetAutoLock lock(GetLiveSet());
 
   // It is not an error if the interceptor doesn't exist, so we return
   // S_FALSE instead of an error in that case.
-  RefPtr<IWeakReference> existingWeak(std::move(GetLiveSet().Get(aTarget)));
+  RefPtr<IWeakReference> existingWeak(GetLiveSet().Get(aTarget));
   if (!existingWeak) {
     return S_FALSE;
   }
 
   RefPtr<IWeakReferenceSource> existingStrong;
diff --git a/ipc/mscom/Utils.h b/ipc/mscom/Utils.h
--- a/ipc/mscom/Utils.h
+++ b/ipc/mscom/Utils.h
@@ -9,10 +9,11 @@
 
 #if defined(MOZILLA_INTERNAL_API)
 #include "nsString.h"
 #endif // defined(MOZILLA_INTERNAL_API)
 
+#include "mozilla/Attributes.h"
 #include <guiddef.h>
 
 struct IStream;
 struct IUnknown;
 
@@ -61,10 +62,44 @@
                                        unsigned long aVtableIndexHint);
 #endif // defined(MOZILLA_INTERNAL_API)
 
 #endif // defined(ACCESSIBILITY)
 
+/**
+ * Execute cleanup code when going out of scope if a condition is met.
+ * This is useful when, for example, particular cleanup needs to be performed
+ * whenever a call returns a failure HRESULT.
+ * Both the condition and cleanup code are provided as functions (usually
+ * lambdas).
+ */
+template <typename CondFnT, typename ExeFnT>
+class MOZ_RAII ExecuteWhen final
+{
+public:
+  ExecuteWhen(CondFnT& aCondFn, ExeFnT& aExeFn)
+    : mCondFn(aCondFn)
+    , mExeFn(aExeFn)
+  {
+  }
+
+  ~ExecuteWhen()
+  {
+    if (mCondFn()) {
+      mExeFn();
+    }
+  }
+
+  ExecuteWhen(const ExecuteWhen&) = delete;
+  ExecuteWhen(ExecuteWhen&&) = delete;
+  ExecuteWhen& operator=(const ExecuteWhen&) = delete;
+  ExecuteWhen& operator=(ExecuteWhen&&) = delete;
+
+private:
+  CondFnT&  mCondFn;
+  ExeFnT&   mExeFn;
+};
+
 } // namespace mscom
 } // namespace mozilla
 
 #endif // mozilla_mscom_Utils_h
 
diff --git a/js/ductwork/debugger/JSDebugger.cpp b/js/ductwork/debugger/JSDebugger.cpp
--- a/js/ductwork/debugger/JSDebugger.cpp
+++ b/js/ductwork/debugger/JSDebugger.cpp
@@ -1,8 +1,8 @@
 /* -*-  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
+ * License, v. 2.0. If a copy of the MPL was not destributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "JSDebugger.h"
 #include "nsIXPConnect.h"
 #include "nsThreadUtils.h"
@@ -53,11 +53,11 @@
   JSAutoRealm ar(cx, obj);
   if (JS_GetGlobalForObject(cx, obj) != obj) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  if (!JS_DefineDebuggerObject(cx, obj)) {
+  else if (!JS_DefineDebuggerObject(cx, obj)) { // readability-else-after-return
     return NS_ERROR_FAILURE;
   }
 
   return NS_OK;
 }
diff --git a/js/src/builtin/Array.h b/js/src/builtin/Array.h
--- a/js/src/builtin/Array.h
+++ b/js/src/builtin/Array.h
@@ -190,11 +190,11 @@
 // Like Array constructor, but doesn't perform GetPrototypeFromConstructor.
 extern bool
 array_construct(JSContext* cx, unsigned argc, Value* vp);
 
 extern bool
-IsWrappedArrayConstructor(JSContext* cx, const Value& v, bool* result);
+IsCrossRealmArrayConstructor(JSContext* cx, const Value& v, bool* result);
 
 class MOZ_NON_TEMPORARY_CLASS ArraySpeciesLookup final
 {
     /*
      * An ArraySpeciesLookup holds the following:
diff --git a/js/src/builtin/Array.cpp b/js/src/builtin/Array.cpp
--- a/js/src/builtin/Array.cpp
+++ b/js/src/builtin/Array.cpp
@@ -1021,42 +1021,39 @@
 }
 
 static bool
 IsArrayConstructor(const JSObject* obj)
 {
-    // This must only return true if v is *the* Array constructor for the
-    // current compartment; we rely on the fact that any other Array
-    // constructor would be represented as a wrapper.
-    return obj->is<JSFunction>() &&
-           obj->as<JSFunction>().isNative() &&
-           obj->as<JSFunction>().native() == ArrayConstructor;
+    // Note: this also returns true for cross-realm Array constructors in the
+    // same compartment.
+    return IsNativeFunction(obj, ArrayConstructor);
 }
 
 static bool
 IsArrayConstructor(const Value& v)
 {
     return v.isObject() && IsArrayConstructor(&v.toObject());
 }
 
 bool
-js::IsWrappedArrayConstructor(JSContext* cx, const Value& v, bool* result)
+js::IsCrossRealmArrayConstructor(JSContext* cx, const Value& v, bool* result)
 {
     if (!v.isObject()) {
         *result = false;
         return true;
     }
-    if (v.toObject().is<WrapperObject>()) {
-        JSObject* obj = CheckedUnwrap(&v.toObject());
+
+    JSObject* obj = &v.toObject();
+    if (obj->is<WrapperObject>()) {
+        obj = CheckedUnwrap(obj);
         if (!obj) {
             ReportAccessDenied(cx);
             return false;
         }
-
-        *result = IsArrayConstructor(obj);
-    } else {
-        *result = false;
     }
+
+    *result = IsArrayConstructor(obj) && obj->as<JSFunction>().realm() != cx->realm();
     return true;
 }
 
 static MOZ_ALWAYS_INLINE bool
 IsArraySpecies(JSContext* cx, HandleObject origArray)
@@ -1086,10 +1083,15 @@
         return false;
 
     if (!IsArrayConstructor(ctor))
         return ctor.isUndefined();
 
+    // 9.4.2.3 Step 6.c. Use the current realm's constructor if |ctor| is a
+    // cross-realm Array constructor.
+    if (cx->realm() != ctor.toObject().as<JSFunction>().realm())
+        return true;
+
     jsid speciesId = SYMBOL_TO_JSID(cx->wellKnownSymbols().species);
     JSFunction* getter;
     if (!GetGetterPure(cx, &ctor.toObject(), speciesId, &getter))
         return false;
 
diff --git a/js/src/builtin/Array.js b/js/src/builtin/Array.js
--- a/js/src/builtin/Array.js
+++ b/js/src/builtin/Array.js
@@ -980,11 +980,11 @@
 
     // Step 5.a.
     var C = originalArray.constructor;
 
     // Step 5.b.
-    if (IsConstructor(C) && IsWrappedArrayConstructor(C))
+    if (IsConstructor(C) && IsCrossRealmArrayConstructor(C))
         return std_Array(length);
 
     // Step 5.c.
     if (IsObject(C)) {
         // Step 5.c.i.
diff --git a/js/src/frontend/TokenStream.h b/js/src/frontend/TokenStream.h
--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -1232,19 +1232,20 @@
 inline bool
 TokenStreamCharsBase<CharT>::matchCodeUnit(int32_t expect)
 {
     MOZ_ASSERT(expect != EOF, "shouldn't be matching EOFs");
     MOZ_ASSERT(!SourceUnits::isRawEOLChar(expect));
-    return MOZ_LIKELY(!sourceUnits.atEnd()) && sourceUnits.matchCodeUnit(toCharT(expect));
+    return MOZ_LIKELY(!this->sourceUnits.atEnd()) &&
+           this->sourceUnits.matchCodeUnit(toCharT(expect));
 }
 
 template<>
 MOZ_MUST_USE inline bool
 TokenStreamCharsBase<char16_t>::fillCharBufferWithTemplateStringContents(const char16_t* cur,
                                                                          const char16_t* end)
 {
-    MOZ_ASSERT(charBuffer.length() == 0);
+    MOZ_ASSERT(this->charBuffer.length() == 0);
 
     while (cur < end) {
         // U+2028 LINE SEPARATOR and U+2029 PARAGRAPH SEPARATOR are
         // interpreted literally inside template literal contents; only
         // literal CRLF sequences are normalized to '\n'.  See
@@ -1254,11 +1255,11 @@
             ch = '\n';
             if (cur < end && *cur == '\n')
                 cur++;
         }
 
-        if (!charBuffer.append(ch))
+        if (!this->charBuffer.append(ch))
             return false;
     }
 
     return true;
 }
@@ -1316,12 +1317,10 @@
     uint32_t matchExtendedUnicodeEscape(uint32_t* codePoint);
 
   protected:
     using typename CharsBase::SourceUnits;
 
-    using CharsBase::sourceUnits;
-
   protected:
     using CharsBase::CharsBase;
 
     TokenStreamAnyChars& anyCharsAccess() {
         return AnyCharsAccess::anyChars(this);
@@ -1388,12 +1387,12 @@
      * unit is guaranteed to be ungotten (by ungetCodeUnit()) if it's an EOL,
      * and (b) the line-related state (lineno, linebase) is not used before
      * it's ungotten.
      */
     int32_t getCodeUnit() {
-        if (MOZ_LIKELY(!sourceUnits.atEnd()))
-            return sourceUnits.getCodeUnit();
+        if (MOZ_LIKELY(!this->sourceUnits.atEnd()))
+            return this->sourceUnits.getCodeUnit();
 
         anyCharsAccess().flags.isEOF = true;
         return EOF;
     }
 
@@ -1408,11 +1407,11 @@
      * comment, without consuming the EOL/EOF.
      */
     void consumeRestOfSingleLineComment();
 
     MOZ_MUST_USE MOZ_ALWAYS_INLINE bool updateLineInfoForEOL() {
-        return anyCharsAccess().internalUpdateLineInfoForEOL(sourceUnits.offset());
+        return anyCharsAccess().internalUpdateLineInfoForEOL(this->sourceUnits.offset());
     }
 
     uint32_t matchUnicodeEscapeIdStart(uint32_t* codePoint);
     bool matchUnicodeEscapeIdent(uint32_t* codePoint);
 };
@@ -1434,11 +1433,11 @@
 
   protected:
     using GeneralCharsBase::anyCharsAccess;
     using GeneralCharsBase::getCodeUnit;
     using TokenStreamCharsShared::isAsciiCodePoint;
-    using CharsBase::sourceUnits;
+    // Deliberately don't |using| |sourceUnits| because of bug 1472569.  :-(
     using GeneralCharsBase::ungetCodeUnit;
     using GeneralCharsBase::updateLineInfoForEOL;
 
     using typename GeneralCharsBase::SourceUnits;
 
@@ -1462,16 +1461,18 @@
      * This may change the current |sourceUnits| offset.
      */
     MOZ_MUST_USE bool getFullAsciiCodePoint(int32_t lead, int32_t* codePoint) {
         MOZ_ASSERT(isAsciiCodePoint(lead),
                    "non-ASCII code units must be handled separately");
-        MOZ_ASSERT(lead == sourceUnits.previousCodeUnit(),
+        // NOTE: |this->|-qualify to avoid a gcc bug: see bug 1472569.
+        MOZ_ASSERT(lead == this->sourceUnits.previousCodeUnit(),
                    "getFullAsciiCodePoint called incorrectly");
 
         if (MOZ_UNLIKELY(lead == '\r')) {
-            if (MOZ_LIKELY(!sourceUnits.atEnd()))
-                sourceUnits.matchCodeUnit('\n');
+            // NOTE: |this->|-qualify to avoid a gcc bug: see bug 1472569.
+            if (MOZ_LIKELY(!this->sourceUnits.atEnd()))
+                this->sourceUnits.matchCodeUnit('\n');
         } else if (MOZ_LIKELY(lead != '\n')) {
             *codePoint = lead;
             return true;
         }
 
@@ -1609,11 +1610,11 @@
 
   private:
     using TokenStreamCharsShared::appendCodePointToCharBuffer;
     using CharsBase::atomizeSourceChars;
     using GeneralCharsBase::badToken;
-    using TokenStreamCharsShared::charBuffer;
+    // Deliberately don't |using| |charBuffer| because of bug 1472569.  :-(
     using CharsBase::consumeKnownCodeUnit;
     using GeneralCharsBase::consumeRestOfSingleLineComment;
     using TokenStreamCharsShared::copyCharBufferTo;
     using TokenStreamCharsShared::drainCharBufferIntoAtom;
     using CharsBase::fillCharBufferWithTemplateStringContents;
@@ -1629,11 +1630,11 @@
     using GeneralCharsBase::newNameToken;
     using GeneralCharsBase::newNumberToken;
     using GeneralCharsBase::newRegExpToken;
     using GeneralCharsBase::newSimpleToken;
     using CharsBase::peekCodeUnit;
-    using CharsBase::sourceUnits;
+    // Deliberately don't |using| |sourceUnits| because of bug 1472569.  :-(
     using SpecializedCharsBase::ungetCodePointIgnoreEOL;
     using GeneralCharsBase::ungetCodeUnit;
     using SpecializedCharsBase::ungetNonAsciiNormalizedCodePoint;
     using GeneralCharsBase::updateLineInfoForEOL;
 
@@ -1725,18 +1726,18 @@
     JSAtom* getRawTemplateStringAtom() {
         TokenStreamAnyChars& anyChars = anyCharsAccess();
 
         MOZ_ASSERT(anyChars.currentToken().type == TokenKind::TemplateHead ||
                    anyChars.currentToken().type == TokenKind::NoSubsTemplate);
-        const CharT* cur = sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.begin + 1);
+        const CharT* cur = this->sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.begin + 1);
         const CharT* end;
         if (anyChars.currentToken().type == TokenKind::TemplateHead) {
             // Of the form    |`...${|   or   |}...${|
-            end = sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.end - 2);
+            end = this->sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.end - 2);
         } else {
             // NO_SUBS_TEMPLATE is of the form   |`...`|   or   |}...`|
-            end = sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.end - 1);
+            end = this->sourceUnits.codeUnitPtrAt(anyChars.currentToken().pos.end - 1);
         }
 
         if (!fillCharBufferWithTemplateStringContents(cur, end))
             return nullptr;
 
@@ -1964,15 +1965,15 @@
 
     void seek(const Position& pos);
     MOZ_MUST_USE bool seek(const Position& pos, const TokenStreamAnyChars& other);
 
     const CharT* codeUnitPtrAt(size_t offset) const {
-        return sourceUnits.codeUnitPtrAt(offset);
+        return this->sourceUnits.codeUnitPtrAt(offset);
     }
 
     const CharT* rawLimit() const {
-        return sourceUnits.limit();
+        return this->sourceUnits.limit();
     }
 
     MOZ_MUST_USE bool identifierName(TokenStart start, const CharT* identStart,
                                      IdentifierEscapes escaping, Modifier modifier,
                                      TokenKind* out);
diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -492,27 +492,27 @@
 bool
 TokenStreamChars<char16_t, AnyCharsAccess>::getCodePoint(int32_t* cp)
 {
     TokenStreamAnyChars& anyChars = anyCharsAccess();
 
-    if (MOZ_UNLIKELY(sourceUnits.atEnd())) {
+    if (MOZ_UNLIKELY(this->sourceUnits.atEnd())) {
         anyChars.flags.isEOF = true;
         *cp = EOF;
         return true;
     }
 
-    int32_t c = sourceUnits.getCodeUnit();
+    int32_t c = this->sourceUnits.getCodeUnit();
 
     do {
         // Normalize the char16_t if it was a newline.
         if (MOZ_UNLIKELY(c == '\n'))
             break;
 
         if (MOZ_UNLIKELY(c == '\r')) {
             // If it's a \r\n sequence: treat as a single EOL, skip over the \n.
-            if (MOZ_LIKELY(!sourceUnits.atEnd()))
-                sourceUnits.matchCodeUnit('\n');
+            if (MOZ_LIKELY(!this->sourceUnits.atEnd()))
+                this->sourceUnits.matchCodeUnit('\n');
 
             break;
         }
 
         if (MOZ_UNLIKELY(c == unicode::LINE_SEPARATOR || c == unicode::PARA_SEPARATOR))
@@ -534,11 +534,11 @@
 TokenStreamChars<char16_t, AnyCharsAccess>::getNonAsciiCodePoint(int32_t lead, int32_t* codePoint)
 {
     MOZ_ASSERT(lead != EOF);
     MOZ_ASSERT(!isAsciiCodePoint(lead),
                "ASCII code unit/point must be handled separately");
-    MOZ_ASSERT(lead == sourceUnits.previousCodeUnit(),
+    MOZ_ASSERT(lead == this->sourceUnits.previousCodeUnit(),
                "getNonAsciiCodePoint called incorrectly");
 
     // The code point is usually |lead|: overwrite later if needed.
     *codePoint = lead;
 
@@ -568,28 +568,28 @@
 
         return true;
     }
 
     // Also handle a lead surrogate not paired with a trailing surrogate.
-    if (MOZ_UNLIKELY(sourceUnits.atEnd() ||
-                     !unicode::IsTrailSurrogate(sourceUnits.peekCodeUnit())))
+    if (MOZ_UNLIKELY(this->sourceUnits.atEnd() ||
+                     !unicode::IsTrailSurrogate(this->sourceUnits.peekCodeUnit())))
     {
         MOZ_ASSERT(!SourceUnits::isRawEOLChar(*codePoint));
         return true;
     }
 
     // Otherwise we have a multi-unit code point.
-    *codePoint = unicode::UTF16Decode(lead, sourceUnits.getCodeUnit());
+    *codePoint = unicode::UTF16Decode(lead, this->sourceUnits.getCodeUnit());
     MOZ_ASSERT(!SourceUnits::isRawEOLChar(*codePoint));
     return true;
 }
 
 template<class AnyCharsAccess>
 void
 TokenStreamChars<char16_t, AnyCharsAccess>::ungetCodePointIgnoreEOL(uint32_t codePoint)
 {
-    MOZ_ASSERT(!sourceUnits.atStart());
+    MOZ_ASSERT(!this->sourceUnits.atStart());
 
     unsigned numUnits = 0;
     char16_t units[2];
     unicode::UTF16Encode(codePoint, units, &numUnits);
 
@@ -601,17 +601,17 @@
 
 template<class AnyCharsAccess>
 void
 TokenStreamChars<char16_t, AnyCharsAccess>::ungetLineTerminator()
 {
-    sourceUnits.ungetCodeUnit();
+    this->sourceUnits.ungetCodeUnit();
 
-    char16_t last = sourceUnits.peekCodeUnit();
+    char16_t last = this->sourceUnits.peekCodeUnit();
     MOZ_ASSERT(SourceUnits::isRawEOLChar(last));
 
     if (last == '\n')
-        sourceUnits.ungetOptionalCRBeforeLF();
+        this->sourceUnits.ungetOptionalCRBeforeLF();
 
     anyCharsAccess().undoInternalUpdateLineInfoForEOL();
 }
 
 template<typename CharT>
@@ -639,20 +639,20 @@
 
 template<typename CharT, class AnyCharsAccess>
 bool
 TokenStreamSpecific<CharT, AnyCharsAccess>::advance(size_t position)
 {
-    const CharT* end = sourceUnits.codeUnitPtrAt(position);
-    while (sourceUnits.addressOfNextCodeUnit() < end) {
+    const CharT* end = this->sourceUnits.codeUnitPtrAt(position);
+    while (this->sourceUnits.addressOfNextCodeUnit() < end) {
         int32_t c;
         if (!getCodePoint(&c))
             return false;
     }
 
     TokenStreamAnyChars& anyChars = anyCharsAccess();
     Token* cur = const_cast<Token*>(&anyChars.currentToken());
-    cur->pos.begin = sourceUnits.offset();
+    cur->pos.begin = this->sourceUnits.offset();
     MOZ_MAKE_MEM_UNDEFINED(&cur->type, sizeof(cur->type));
     anyChars.lookahead = 0;
     return true;
 }
 
@@ -660,11 +660,11 @@
 void
 TokenStreamSpecific<CharT, AnyCharsAccess>::seek(const Position& pos)
 {
     TokenStreamAnyChars& anyChars = anyCharsAccess();
 
-    sourceUnits.setAddressOfNextCodeUnit(pos.buf, /* allowPoisoned = */ true);
+    this->sourceUnits.setAddressOfNextCodeUnit(pos.buf, /* allowPoisoned = */ true);
     anyChars.flags = pos.flags;
     anyChars.lineno = pos.lineno;
     anyChars.linebase = pos.linebase;
     anyChars.prevLinebase = pos.prevLinebase;
     anyChars.lookahead = pos.lookahead;
@@ -830,16 +830,16 @@
                          offset - windowRadius :
                          anyChars.linebase;
 
     // The window must start within the portion of the current line that we
     // actually have in our buffer.
-    if (windowStart < sourceUnits.startOffset())
-        windowStart = sourceUnits.startOffset();
+    if (windowStart < this->sourceUnits.startOffset())
+        windowStart = this->sourceUnits.startOffset();
 
     // The window must end within the current line, no later than
     // windowRadius after offset.
-    size_t windowEnd = sourceUnits.findEOLMax(offset, windowRadius);
+    size_t windowEnd = this->sourceUnits.findEOLMax(offset, windowRadius);
     size_t windowLength = windowEnd - windowStart;
     MOZ_ASSERT(windowLength <= windowRadius * 2);
 
     // Create the windowed string, not including the potential line
     // terminator.
@@ -954,11 +954,11 @@
 {
     va_list args;
     va_start(args, errorNumber);
 
     ErrorMetadata metadata;
-    if (computeErrorMetadata(&metadata, sourceUnits.offset())) {
+    if (computeErrorMetadata(&metadata, this->sourceUnits.offset())) {
         TokenStreamAnyChars& anyChars = anyCharsAccess();
         ReportCompileError(anyChars.cx, std::move(metadata), nullptr, JSREPORT_ERROR, errorNumber,
                            args);
     }
 
@@ -996,42 +996,42 @@
 // involed.  Otherwise, return 0 and don't advance along the buffer.
 template<typename CharT, class AnyCharsAccess>
 uint32_t
 GeneralTokenStreamChars<CharT, AnyCharsAccess>::matchUnicodeEscape(uint32_t* codePoint)
 {
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
 
     int32_t unit = getCodeUnit();
     if (unit != 'u') {
         // NOTE: |unit| may be EOF here.
         ungetCodeUnit(unit);
-        MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+        MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
         return 0;
     }
 
     char16_t v;
     unit = getCodeUnit();
-    if (JS7_ISHEX(unit) && sourceUnits.matchHexDigits(3, &v)) {
+    if (JS7_ISHEX(unit) && this->sourceUnits.matchHexDigits(3, &v)) {
         *codePoint = (JS7_UNHEX(unit) << 12) | v;
         return 5;
     }
 
     if (unit == '{')
         return matchExtendedUnicodeEscape(codePoint);
 
     // NOTE: |unit| may be EOF here, so this ungets either one or two units.
     ungetCodeUnit(unit);
     ungetCodeUnit('u');
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
     return 0;
 }
 
 template<typename CharT, class AnyCharsAccess>
 uint32_t
 GeneralTokenStreamChars<CharT, AnyCharsAccess>::matchExtendedUnicodeEscape(uint32_t* codePoint)
 {
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '{');
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '{');
 
     int32_t unit = getCodeUnit();
 
     // Skip leading zeroes.
     uint32_t leadingZeroes = 0;
@@ -1057,12 +1057,12 @@
     if (unit == '}' && (leadingZeroes > 0 || i > 0) && code <= unicode::NonBMPMax) {
         *codePoint = code;
         return gotten;
     }
 
-    sourceUnits.unskipCodeUnits(gotten);
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+    this->sourceUnits.unskipCodeUnits(gotten);
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
     return 0;
 }
 
 template<typename CharT, class AnyCharsAccess>
 uint32_t
@@ -1071,14 +1071,14 @@
     uint32_t length = matchUnicodeEscape(codePoint);
     if (MOZ_LIKELY(length > 0)) {
         if (MOZ_LIKELY(unicode::IsIdentifierStart(*codePoint)))
             return length;
 
-        sourceUnits.unskipCodeUnits(length);
+        this->sourceUnits.unskipCodeUnits(length);
     }
 
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
     return 0;
 }
 
 template<typename CharT, class AnyCharsAccess>
 bool
@@ -1087,14 +1087,14 @@
     uint32_t length = matchUnicodeEscape(codePoint);
     if (MOZ_LIKELY(length > 0)) {
         if (MOZ_LIKELY(unicode::IsIdentifierPart(*codePoint)))
             return true;
 
-        sourceUnits.unskipCodeUnits(length);
+        this->sourceUnits.unskipCodeUnits(length);
     }
 
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '\\');
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '\\');
     return false;
 }
 
 template<typename CharT, class AnyCharsAccess>
 bool
@@ -1142,19 +1142,19 @@
                                                          UniquePtr<char16_t[], JS::FreePolicy>* destination)
 {
     // Stop if we don't find |directive|.  (Note that |directive| must be
     // ASCII, so there are no tricky encoding issues to consider in matching
     // UTF-8/16-agnostically.)
-    if (!sourceUnits.matchCodeUnits(directive, directiveLength))
+    if (!this->sourceUnits.matchCodeUnits(directive, directiveLength))
         return true;
 
     if (shouldWarnDeprecated) {
         if (!warning(JSMSG_DEPRECATED_PRAGMA, errorMsgPragma))
             return false;
     }
 
-    charBuffer.clear();
+    this->charBuffer.clear();
 
     do {
         int32_t unit = peekCodeUnit();
         if (unit == EOF)
             break;
@@ -1171,11 +1171,11 @@
             if (isMultiline && unit == '*' && peekCodeUnit() == '/') {
                 ungetCodeUnit('*');
                 break;
             }
 
-            if (!charBuffer.append(unit))
+            if (!this->charBuffer.append(unit))
                 return false;
 
             continue;
         }
 
@@ -1190,11 +1190,11 @@
 
         if (!appendCodePointToCharBuffer(codePoint))
             return false;
     } while (true);
 
-    if (charBuffer.empty()) {
+    if (this->charBuffer.empty()) {
         // The directive's URL was missing, but comments can contain anything,
         // so it isn't an error.
         return true;
     }
 
@@ -1271,11 +1271,11 @@
 
     // Poisoning sourceUnits on error establishes an invariant: once an
     // erroneous token has been seen, sourceUnits will not be consulted again.
     // This is true because the parser will deal with the illegal token by
     // aborting parsing immediately.
-    sourceUnits.poisonInDebug();
+    this->sourceUnits.poisonInDebug();
 
     return false;
 };
 
 MOZ_MUST_USE bool
@@ -1299,28 +1299,28 @@
 
 template<typename CharT, class AnyCharsAccess>
 bool
 TokenStreamSpecific<CharT, AnyCharsAccess>::putIdentInCharBuffer(const CharT* identStart)
 {
-    const CharT* const originalAddress = sourceUnits.addressOfNextCodeUnit();
-    sourceUnits.setAddressOfNextCodeUnit(identStart);
+    const CharT* const originalAddress = this->sourceUnits.addressOfNextCodeUnit();
+    this->sourceUnits.setAddressOfNextCodeUnit(identStart);
 
     auto restoreNextRawCharAddress =
         MakeScopeExit([this, originalAddress]() {
             this->sourceUnits.setAddressOfNextCodeUnit(originalAddress);
         });
 
-    charBuffer.clear();
+    this->charBuffer.clear();
     do {
         int32_t unit = getCodeUnit();
         if (unit == EOF)
             break;
 
         uint32_t codePoint;
         if (MOZ_LIKELY(isAsciiCodePoint(unit))) {
             if (unicode::IsIdentifierPart(char16_t(unit))) {
-                if (!charBuffer.append(unit))
+                if (!this->charBuffer.append(unit))
                     return false;
 
                 continue;
             }
 
@@ -1405,11 +1405,11 @@
 
         atom = drainCharBufferIntoAtom(anyCharsAccess().cx);
     } else {
         // Escape-free identifiers can be created directly from sourceUnits.
         const CharT* chars = identStart;
-        size_t length = sourceUnits.addressOfNextCodeUnit() - identStart;
+        size_t length = this->sourceUnits.addressOfNextCodeUnit() - identStart;
 
         // Represent reserved words lacking escapes as reserved word tokens.
         if (const ReservedWordInfo* rw = FindReservedWord(chars, length)) {
             noteBadToken.release();
             newSimpleToken(rw->tokentype, start, modifier, out);
@@ -1544,12 +1544,12 @@
         // NOTE: |unit| may be EOF here.
         ungetCodeUnit(unit);
 
         // Most numbers are pure decimal integers without fractional component
         // or exponential notation.  Handle that with optimized code.
-        if (!GetDecimalInteger(anyCharsAccess().cx, numStart, sourceUnits.addressOfNextCodeUnit(),
-                               &dval))
+        if (!GetDecimalInteger(anyCharsAccess().cx, numStart,
+                               this->sourceUnits.addressOfNextCodeUnit(), &dval))
         {
             return false;
         }
     } else {
         // Consume any decimal dot and fractional component.
@@ -1580,12 +1580,12 @@
         }
 
         ungetCodeUnit(unit);
 
         const CharT* dummy;
-        if (!js_strtod(anyCharsAccess().cx, numStart, sourceUnits.addressOfNextCodeUnit(), &dummy,
-                       &dval))
+        if (!js_strtod(anyCharsAccess().cx, numStart, this->sourceUnits.addressOfNextCodeUnit(),
+                       &dummy, &dval))
         {
            return false;
         }
     }
 
@@ -1619,12 +1619,12 @@
 
 template<typename CharT, class AnyCharsAccess>
 MOZ_MUST_USE bool
 TokenStreamSpecific<CharT, AnyCharsAccess>::regexpLiteral(TokenStart start, TokenKind* out)
 {
-    MOZ_ASSERT(sourceUnits.previousCodeUnit() == '/');
-    charBuffer.clear();
+    MOZ_ASSERT(this->sourceUnits.previousCodeUnit() == '/');
+    this->charBuffer.clear();
 
     auto ProcessNonAsciiCodePoint = [this](int32_t lead) {
         MOZ_ASSERT(lead != EOF);
 
         int32_t codePoint;
@@ -1653,11 +1653,11 @@
             return badToken();
         }
 
         if (MOZ_LIKELY(isAsciiCodePoint(unit))) {
             if (unit == '\\')  {
-                if (!charBuffer.append(unit))
+                if (!this->charBuffer.append(unit))
                     return badToken();
 
                 unit = getCodeUnit();
                 if (unit == EOF) {
                     ReportUnterminatedRegExp(unit);
@@ -1684,11 +1684,11 @@
             if (unit == '\r' || unit == '\n') {
                 ReportUnterminatedRegExp(unit);
                 return badToken();
             }
 
-            if (!charBuffer.append(unit))
+            if (!this->charBuffer.append(unit))
                 return badToken();
         } else {
             if (!ProcessNonAsciiCodePoint(unit))
                 return badToken();
         }
@@ -1748,13 +1748,13 @@
     // This loop runs more than once only when whitespace or comments are
     // encountered.
     do {
         int32_t unit = getCodeUnit();
         if (MOZ_UNLIKELY(unit == EOF)) {
-            MOZ_ASSERT(sourceUnits.atEnd());
+            MOZ_ASSERT(this->sourceUnits.atEnd());
             anyCharsAccess().flags.isEOF = true;
-            TokenStart start(sourceUnits, 0);
+            TokenStart start(this->sourceUnits, 0);
             newSimpleToken(TokenKind::Eof, start, modifier, ttp);
             return true;
         }
 
         if (MOZ_UNLIKELY(!isAsciiCodePoint(unit))) {
@@ -1762,12 +1762,12 @@
             // It would be nice to compute these *after* discarding whitespace,
             // but IN A WORLD where |unicode::IsSpaceOrBOM2| requires consuming
             // a variable number of code points, it's easier to assume it's an
             // identifier and maybe do a little wasted work, than to unget and
             // compute and reget if whitespace.
-            TokenStart start(sourceUnits, -1);
-            const CharT* identStart = sourceUnits.addressOfNextCodeUnit() - 1;
+            TokenStart start(this->sourceUnits, -1);
+            const CharT* identStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
             int32_t codePoint;
             if (!getNonAsciiCodePoint(unit, &codePoint))
                 return badToken();
 
@@ -1817,11 +1817,11 @@
         FirstCharKind c1kind = FirstCharKind(firstCharKinds[unit]);
 
         // Look for an unambiguous single-char token.
         //
         if (c1kind <= OneChar_Max) {
-            TokenStart start(sourceUnits, -1);
+            TokenStart start(this->sourceUnits, -1);
             newSimpleToken(TokenKind(c1kind), start, modifier, ttp);
             return true;
         }
 
         // Skip over non-EOL whitespace chars.
@@ -1830,20 +1830,20 @@
             continue;
 
         // Look for an identifier.
         //
         if (c1kind == Ident) {
-            TokenStart start(sourceUnits, -1);
-            return identifierName(start, sourceUnits.addressOfNextCodeUnit() - 1,
+            TokenStart start(this->sourceUnits, -1);
+            return identifierName(start, this->sourceUnits.addressOfNextCodeUnit() - 1,
                                   IdentifierEscapes::None, modifier, ttp);
         }
 
         // Look for a decimal number.
         //
         if (c1kind == Dec) {
-            TokenStart start(sourceUnits, -1);
-            const CharT* numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+            TokenStart start(this->sourceUnits, -1);
+            const CharT* numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
             return decimalNumber(unit, start, numStart, modifier, ttp);
         }
 
         // Look for a string or a template string.
         //
@@ -1852,12 +1852,12 @@
 
         // Skip over EOL chars, updating line state along the way.
         //
         if (c1kind == EOL) {
             // If it's a \r\n sequence, consume it as a single EOL.
-            if (unit == '\r' && !sourceUnits.atEnd())
-                sourceUnits.matchCodeUnit('\n');
+            if (unit == '\r' && !this->sourceUnits.atEnd())
+                this->sourceUnits.matchCodeUnit('\n');
 
             if (!updateLineInfoForEOL())
                 return badToken();
 
             anyCharsAccess().updateFlagsForEOL();
@@ -1867,11 +1867,11 @@
         // From a '0', look for a hexadecimal, binary, octal, or "noctal" (a
         // number starting with '0' that contains '8' or '9' and is treated as
         // decimal) number.
         //
         if (c1kind == ZeroDigit) {
-            TokenStart start(sourceUnits, -1);
+            TokenStart start(this->sourceUnits, -1);
 
             int radix;
             const CharT* numStart;
             unit = getCodeUnit();
             if (unit == 'x' || unit == 'X') {
@@ -1883,11 +1883,11 @@
                     error(JSMSG_MISSING_HEXDIGITS);
                     return badToken();
                 }
 
                 // one past the '0x'
-                numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+                numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
                 while (JS7_ISHEX(unit))
                     unit = getCodeUnit();
             } else if (unit == 'b' || unit == 'B') {
                 radix = 2;
@@ -1898,11 +1898,11 @@
                     error(JSMSG_MISSING_BINARY_DIGITS);
                     return badToken();
                 }
 
                 // one past the '0b'
-                numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+                numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
                 while (unit == '0' || unit == '1')
                     unit = getCodeUnit();
             } else if (unit == 'o' || unit == 'O') {
                 radix = 8;
@@ -1913,18 +1913,18 @@
                     error(JSMSG_MISSING_OCTAL_DIGITS);
                     return badToken();
                 }
 
                 // one past the '0o'
-                numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+                numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
                 while (JS7_ISOCT(unit))
                     unit = getCodeUnit();
             } else if (IsAsciiDigit(unit)) {
                 radix = 8;
                 // one past the '0'
-                numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+                numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
                 do {
                     // Octal integer literals are not permitted in strict mode
                     // code.
                     if (!reportStrictModeError(JSMSG_DEPRECATED_OCTAL))
@@ -1944,11 +1944,11 @@
 
                     unit = getCodeUnit();
                 } while (IsAsciiDigit(unit));
             } else {
                 // '0' not followed by [XxBbOo0-9];  scan as a decimal number.
-                numStart = sourceUnits.addressOfNextCodeUnit() - 1;
+                numStart = this->sourceUnits.addressOfNextCodeUnit() - 1;
 
                 // NOTE: |unit| may be EOF here.  (This is permitted by case #3
                 //       in TokenStream.h docs for this function.)
                 return decimalNumber(unit, start, numStart, modifier, ttp);
             }
@@ -1982,11 +1982,11 @@
             }
 
             double dval;
             const char16_t* dummy;
             if (!GetPrefixInteger(anyCharsAccess().cx, numStart,
-                                  sourceUnits.addressOfNextCodeUnit(), radix, &dummy, &dval))
+                                  this->sourceUnits.addressOfNextCodeUnit(), radix, &dummy, &dval))
             {
                 return badToken();
             }
 
             newNumberToken(dval, NoDecimal, start, modifier, ttp);
@@ -1998,21 +1998,21 @@
         // This handles everything else.  Simple tokens distinguished solely by
         // TokenKind should set |simpleKind| and break, to share simple-token
         // creation code for all such tokens.  All other tokens must be handled
         // by returning (or by continuing from the loop enclosing this).
         //
-        TokenStart start(sourceUnits, -1);
+        TokenStart start(this->sourceUnits, -1);
         TokenKind simpleKind;
 #ifdef DEBUG
         simpleKind = TokenKind::Limit; // sentinel value for code after switch
 #endif
         switch (static_cast<CharT>(unit)) {
           case '.':
             unit = getCodeUnit();
             if (IsAsciiDigit(unit)) {
-                return decimalNumber('.', start, sourceUnits.addressOfNextCodeUnit() - 2, modifier,
-                                     ttp);
+                return decimalNumber('.', start, this->sourceUnits.addressOfNextCodeUnit() - 2,
+                                     modifier, ttp);
             }
 
             if (unit == '.') {
                 if (matchCodeUnit('.')) {
                     simpleKind = TokenKind::TripleDot;
@@ -2045,11 +2045,11 @@
 
           case '\\': {
             uint32_t codePoint;
             if (uint32_t escapeLength = matchUnicodeEscapeIdStart(&codePoint)) {
                 return identifierName(start,
-                                      sourceUnits.addressOfNextCodeUnit() - escapeLength - 1,
+                                      this->sourceUnits.addressOfNextCodeUnit() - escapeLength - 1,
                                       IdentifierEscapes::SawUnicodeEscape, modifier, ttp);
             }
 
             // We could point "into" a mistyped escape, e.g. for "\u{41H}" we
             // could point at the 'H'.  But we don't do that now, so the code
@@ -2235,12 +2235,12 @@
                "unexpected string/template literal delimiter");
 
     bool parsingTemplate = (untilChar == '`');
     bool templateHead = false;
 
-    TokenStart start(sourceUnits, -1);
-    charBuffer.clear();
+    TokenStart start(this->sourceUnits, -1);
+    this->charBuffer.clear();
 
     // Run the bad-token code for every path out of this function except the
     // one success-case.
     auto noteBadToken = MakeScopeExit([this]() {
         this->badToken();
@@ -2322,11 +2322,11 @@
                 // If we consumed U+2028 LINE SEPARATOR or U+2029 PARAGRAPH
                 // SEPARATOR, they'll be normalized to '\n'.  '\' followed by
                 // LineContinuation represents no code points, so don't append
                 // in this case.
                 if (codePoint != '\n') {
-                    if (!charBuffer.append(unit))
+                    if (!this->charBuffer.append(unit))
                         return false;
                 }
 
                 continue;
             }
@@ -2338,11 +2338,11 @@
               case 'r': unit = '\r'; break;
               case 't': unit = '\t'; break;
               case 'v': unit = '\v'; break;
 
               case '\r':
-                sourceUnits.matchCodeUnit('\n');
+                this->sourceUnits.matchCodeUnit('\n');
                 MOZ_FALLTHROUGH;
               case '\n': {
                 // LineContinuation represents no code points.  We're manually
                 // consuming a LineTerminatorSequence, so we must manually
                 // update line/column info.
@@ -2360,11 +2360,11 @@
                     return false;
                 }
 
                 // First handle a delimited Unicode escape, e.g. \u{1F4A9}.
                 if (c2 == '{') {
-                    uint32_t start = sourceUnits.offset() - 3;
+                    uint32_t start = this->sourceUnits.offset() - 3;
                     uint32_t code = 0;
                     bool first = true;
                     bool valid = true;
                     do {
                         int32_t u3 = getCodeUnit();
@@ -2442,16 +2442,16 @@
                 // Otherwise it must be a fixed-length \uXXXX Unicode escape.
                 // If it isn't, this is usually an error -- but if this is a
                 // template literal, we must defer error reporting because
                 // malformed escapes are okay in *tagged* template literals.
                 char16_t v;
-                if (JS7_ISHEX(c2) && sourceUnits.matchHexDigits(3, &v)) {
+                if (JS7_ISHEX(c2) && this->sourceUnits.matchHexDigits(3, &v)) {
                     unit = (JS7_UNHEX(c2) << 12) | v;
                 } else {
                     // Beware: |c2| may not be an ASCII code point here!
                     ungetCodeUnit(c2);
-                    uint32_t start = sourceUnits.offset() - 2;
+                    uint32_t start = this->sourceUnits.offset() - 2;
                     if (parsingTemplate) {
                         TokenStreamAnyChars& anyChars = anyCharsAccess();
                         anyChars.setInvalidTemplateEscape(start, InvalidEscapeType::Unicode);
                         continue;
                     }
@@ -2462,14 +2462,14 @@
               } // case 'u'
 
               // Hexadecimal character specification.
               case 'x': {
                 char16_t v;
-                if (sourceUnits.matchHexDigits(2, &v)) {
+                if (this->sourceUnits.matchHexDigits(2, &v)) {
                     unit = v;
                 } else {
-                    uint32_t start = sourceUnits.offset() - 2;
+                    uint32_t start = this->sourceUnits.offset() - 2;
                     if (parsingTemplate) {
                         TokenStreamAnyChars& anyChars = anyCharsAccess();
                         anyChars.setInvalidTemplateEscape(start, InvalidEscapeType::Hexadecimal);
                         continue;
                     }
@@ -2494,11 +2494,11 @@
 
                 // Strict mode code allows only \0, then a non-digit.
                 if (val != 0 || IsAsciiDigit(unit)) {
                     TokenStreamAnyChars& anyChars = anyCharsAccess();
                     if (parsingTemplate) {
-                        anyChars.setInvalidTemplateEscape(sourceUnits.offset() - 2,
+                        anyChars.setInvalidTemplateEscape(this->sourceUnits.offset() - 2,
                                                           InvalidEscapeType::Octal);
                         continue;
                     }
                     if (!reportStrictModeError(JSMSG_DEPRECATED_OCTAL))
                         return false;
@@ -2528,11 +2528,11 @@
                 unit = char16_t(val);
                 break;
               } // default
             }
 
-            if (!charBuffer.append(unit))
+            if (!this->charBuffer.append(unit))
                 return false;
 
             continue;
         } // (unit == '\\')
 
@@ -2546,12 +2546,12 @@
 
             if (unit == '\r') {
                 unit = '\n';
 
                 // If it's a \r\n sequence: treat as a single EOL, skip over the \n.
-                if (!sourceUnits.atEnd())
-                    sourceUnits.matchCodeUnit('\n');
+                if (!this->sourceUnits.atEnd())
+                    this->sourceUnits.matchCodeUnit('\n');
             }
 
             if (!updateLineInfoForEOL())
                 return false;
 
@@ -2559,11 +2559,11 @@
         } else if (parsingTemplate && unit == '$' && matchCodeUnit('{')) {
             templateHead = true;
             break;
         }
 
-        if (!charBuffer.append(unit))
+        if (!this->charBuffer.append(unit))
             return false;
     }
 
     JSAtom* atom = drainCharBufferIntoAtom(anyCharsAccess().cx);
     if (!atom)
diff --git a/js/src/jit-test/tests/realms/array-species-create.js b/js/src/jit-test/tests/realms/array-species-create.js
new file mode 100644
--- /dev/null
+++ b/js/src/jit-test/tests/realms/array-species-create.js
@@ -0,0 +1,31 @@
+function testSelfHosted() {
+    var g = newGlobal({sameCompartmentAs: this});
+    var arr = g.evaluate("[1, 2]");
+    for (var i = 0; i < 20; i++) {
+        var mapped = Array.prototype.map.call(arr, x => x + 1);
+        assertEq(mapped.constructor, Array);
+    }
+}
+testSelfHosted();
+
+function testNative() {
+    var g = newGlobal({sameCompartmentAs: this});
+    var arr = g.evaluate("[1, 2, 3, 4]");
+    for (var i = 0; i < 20; i++) {
+        var slice = Array.prototype.slice.call(arr, 0, 3);
+        assertEq(slice.constructor, Array);
+    }
+}
+testNative();
+
+function testIntrinsic() {
+    var g1 = newGlobal({sameCompartmentAs: this});
+    var g2 = newGlobal();
+    var IsCrossRealmArrayConstructor = getSelfHostedValue("IsCrossRealmArrayConstructor");
+    for (var i = 0; i < 20; i++) {
+        assertEq(IsCrossRealmArrayConstructor(Array), false);
+        assertEq(IsCrossRealmArrayConstructor(g1.Array), true);
+        assertEq(IsCrossRealmArrayConstructor(g2.Array), true);
+    }
+}
+testIntrinsic();
diff --git a/js/src/jit/CacheIR.h b/js/src/jit/CacheIR.h
--- a/js/src/jit/CacheIR.h
+++ b/js/src/jit/CacheIR.h
@@ -1666,10 +1666,12 @@
   public:
     GetIteratorIRGenerator(JSContext* cx, HandleScript, jsbytecode* pc, ICState::Mode mode,
                            HandleValue value);
 
     bool tryAttachStub();
+
+    void trackAttached(const char *name);
 };
 
 class MOZ_RAII CallIRGenerator : public IRGenerator
 {
   private:
diff --git a/js/src/jit/CacheIR.cpp b/js/src/jit/CacheIR.cpp
--- a/js/src/jit/CacheIR.cpp
+++ b/js/src/jit/CacheIR.cpp
@@ -4351,13 +4351,16 @@
         return false;
 
     RootedObject obj(cx_, &val_.toObject());
 
     ObjOperandId objId = writer.guardIsObject(valId);
-    if (tryAttachNativeIterator(objId, obj))
-        return true;
+    if (tryAttachNativeIterator(objId, obj)) {
+      trackAttached("GetIterator");
+      return true;
+    }
 
+    trackAttached(IRGenerator::NotAttached);
     return false;
 }
 
 bool
 GetIteratorIRGenerator::tryAttachNativeIterator(ObjOperandId objId, HandleObject obj)
@@ -4389,10 +4392,20 @@
     writer.returnFromIC();
 
     return true;
 }
 
+void
+GetIteratorIRGenerator::trackAttached(const char* name)
+{
+#ifdef JS_CACHEIR_SPEW
+    if (const CacheIRSpewer::Guard& sp = CacheIRSpewer::Guard(*this, name)) {
+        sp.valueProperty("val", val_);
+    }
+#endif
+}
+
 CallIRGenerator::CallIRGenerator(JSContext* cx, HandleScript script, jsbytecode* pc, JSOp op,
                                  ICState::Mode mode, uint32_t argc,
                                  HandleValue callee, HandleValue thisval, HandleValueArray args)
   : IRGenerator(cx, script, pc, CacheKind::Call, mode),
     op_(op),
diff --git a/js/src/jit/InlinableNatives.h b/js/src/jit/InlinableNatives.h
--- a/js/src/jit/InlinableNatives.h
+++ b/js/src/jit/InlinableNatives.h
@@ -121,11 +121,11 @@
                                     \
     _(IntrinsicIsCallable)          \
     _(IntrinsicIsConstructor)       \
     _(IntrinsicToObject)            \
     _(IntrinsicIsObject)            \
-    _(IntrinsicIsWrappedArrayConstructor) \
+    _(IntrinsicIsCrossRealmArrayConstructor) \
     _(IntrinsicToInteger)           \
     _(IntrinsicToString)            \
     _(IntrinsicIsConstructing)      \
     _(IntrinsicSubstringKernel)     \
     _(IntrinsicObjectHasPrototype)  \
diff --git a/js/src/jit/IonBuilder.h b/js/src/jit/IonBuilder.h
--- a/js/src/jit/IonBuilder.h
+++ b/js/src/jit/IonBuilder.h
@@ -778,11 +778,11 @@
     // Utility intrinsics.
     InliningResult inlineIsCallable(CallInfo& callInfo);
     InliningResult inlineIsConstructor(CallInfo& callInfo);
     InliningResult inlineIsObject(CallInfo& callInfo);
     InliningResult inlineToObject(CallInfo& callInfo);
-    InliningResult inlineIsWrappedArrayConstructor(CallInfo& callInfo);
+    InliningResult inlineIsCrossRealmArrayConstructor(CallInfo& callInfo);
     InliningResult inlineToInteger(CallInfo& callInfo);
     InliningResult inlineToString(CallInfo& callInfo);
     InliningResult inlineDump(CallInfo& callInfo);
     InliningResult inlineHasClass(CallInfo& callInfo, const Class* clasp,
                                   const Class* clasp2 = nullptr,
diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -314,12 +314,12 @@
         return inlineIsConstructor(callInfo);
       case InlinableNative::IntrinsicToObject:
         return inlineToObject(callInfo);
       case InlinableNative::IntrinsicIsObject:
         return inlineIsObject(callInfo);
-      case InlinableNative::IntrinsicIsWrappedArrayConstructor:
-        return inlineIsWrappedArrayConstructor(callInfo);
+      case InlinableNative::IntrinsicIsCrossRealmArrayConstructor:
+        return inlineIsCrossRealmArrayConstructor(callInfo);
       case InlinableNative::IntrinsicToInteger:
         return inlineToInteger(callInfo);
       case InlinableNative::IntrinsicToString:
         return inlineToString(callInfo);
       case InlinableNative::IntrinsicIsConstructing:
@@ -3297,11 +3297,11 @@
 
     return InliningStatus_Inlined;
 }
 
 IonBuilder::InliningResult
-IonBuilder::inlineIsWrappedArrayConstructor(CallInfo& callInfo)
+IonBuilder::inlineIsCrossRealmArrayConstructor(CallInfo& callInfo)
 {
     MOZ_ASSERT(!callInfo.constructing());
     MOZ_ASSERT(callInfo.argc() == 1);
 
     if (getInlineReturnType() != MIRType::Boolean)
@@ -3309,22 +3309,18 @@
     MDefinition* arg = callInfo.getArg(0);
     if (arg->type() != MIRType::Object)
         return InliningStatus_NotInlined;
 
     TemporaryTypeSet* types = arg->resultTypeSet();
-    switch (types->forAllClasses(constraints(), IsProxyClass)) {
-      case TemporaryTypeSet::ForAllResult::ALL_FALSE:
-        break;
-      case TemporaryTypeSet::ForAllResult::EMPTY:
-      case TemporaryTypeSet::ForAllResult::ALL_TRUE:
-      case TemporaryTypeSet::ForAllResult::MIXED:
+    Realm* realm = types->getKnownRealm(constraints());
+    if (!realm || realm != script()->realm())
         return InliningStatus_NotInlined;
-    }
 
     callInfo.setImplicitlyUsedUnchecked();
 
-    // Inline only if argument is absolutely *not* a Proxy.
+    // Inline only if argument is absolutely *not* a wrapper or a cross-realm
+    // object.
     pushConstant(BooleanValue(false));
     return InliningStatus_Inlined;
 }
 
 IonBuilder::InliningResult
diff --git a/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h b/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
--- a/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
+++ b/js/src/jit/mips-shared/MacroAssembler-mips-shared-inl.h
@@ -1055,11 +1055,12 @@
 }
 
 void
 MacroAssembler::memoryBarrier(MemoryBarrierBits barrier)
 {
-    as_sync();
+    if (barrier)
+        as_sync();
 }
 
 // ===============================================================
 // Clamping functions.
 
diff --git a/js/src/jit/mips32/MacroAssembler-mips32.cpp b/js/src/jit/mips32/MacroAssembler-mips32.cpp
--- a/js/src/jit/mips32/MacroAssembler-mips32.cpp
+++ b/js/src/jit/mips32/MacroAssembler-mips32.cpp
@@ -115,10 +115,15 @@
 MacroAssemblerMIPSCompat::convertDoubleToFloat32(FloatRegister src, FloatRegister dest)
 {
     as_cvtsd(dest, src);
 }
 
+const int CauseBitPos = int(Assembler::CauseI);
+const int CauseBitCount = 1 + int(Assembler::CauseV) - int(Assembler::CauseI);
+const int CauseIOrVMask = ((1 << int(Assembler::CauseI)) |
+                           (1 << int(Assembler::CauseV))) >> int(Assembler::CauseI);
+
 // Checks whether a double is representable as a 32-bit integer. If so, the
 // integer is written to the output register. Otherwise, a bailout is taken to
 // the given snapshot. This function overwrites the scratch float register.
 void
 MacroAssemblerMIPSCompat::convertDoubleToInt32(FloatRegister src, Register dest,
@@ -134,16 +139,16 @@
 
     // Truncate double to int ; if result is inexact or invalid fail.
     as_truncwd(ScratchFloat32Reg, src);
     as_cfc1(ScratchRegister, Assembler::FCSR);
     moveFromFloat32(ScratchFloat32Reg, dest);
-    ma_ext(ScratchRegister, ScratchRegister, Assembler::CauseI, 6);
+    ma_ext(ScratchRegister, ScratchRegister, CauseBitPos, CauseBitCount);
     // Here adding the masking andi instruction just for a precaution.
     // For the instruction of trunc.*.*, the Floating Point Exceptions can be
     // only Inexact, Invalid Operation, Unimplemented Operation.
     // Leaving it maybe is also ok.
-    as_andi(ScratchRegister, ScratchRegister, 0x11);
+    as_andi(ScratchRegister, ScratchRegister, CauseIOrVMask);
     ma_b(ScratchRegister, Imm32(0), fail, Assembler::NotEqual);
 }
 
 // Checks whether a float32 is representable as a 32-bit integer. If so, the
 // integer is written to the output register. Otherwise, a bailout is taken to
@@ -158,11 +163,12 @@
     }
 
     as_truncws(ScratchFloat32Reg, src);
     as_cfc1(ScratchRegister, Assembler::FCSR);
     moveFromFloat32(ScratchFloat32Reg, dest);
-    ma_ext(ScratchRegister, ScratchRegister, Assembler::CauseI, 1);
+    ma_ext(ScratchRegister, ScratchRegister, CauseBitPos, CauseBitCount);
+    as_andi(ScratchRegister, ScratchRegister, CauseIOrVMask);
     ma_b(ScratchRegister, Imm32(0), fail, Assembler::NotEqual);
 }
 
 void
 MacroAssemblerMIPSCompat::convertFloat32ToDouble(FloatRegister src, FloatRegister dest)
diff --git a/js/src/jit/mips64/MacroAssembler-mips64.cpp b/js/src/jit/mips64/MacroAssembler-mips64.cpp
--- a/js/src/jit/mips64/MacroAssembler-mips64.cpp
+++ b/js/src/jit/mips64/MacroAssembler-mips64.cpp
@@ -97,10 +97,15 @@
 MacroAssemblerMIPS64Compat::convertDoubleToFloat32(FloatRegister src, FloatRegister dest)
 {
     as_cvtsd(dest, src);
 }
 
+const int CauseBitPos = int(Assembler::CauseI);
+const int CauseBitCount = 1 + int(Assembler::CauseV) - int(Assembler::CauseI);
+const int CauseIOrVMask = ((1 << int(Assembler::CauseI)) |
+                           (1 << int(Assembler::CauseV))) >> int(Assembler::CauseI);
+
 // Checks whether a double is representable as a 32-bit integer. If so, the
 // integer is written to the output register. Otherwise, a bailout is taken to
 // the given snapshot. This function overwrites the scratch float register.
 void
 MacroAssemblerMIPS64Compat::convertDoubleToInt32(FloatRegister src, Register dest,
@@ -114,12 +119,12 @@
 
     // Truncate double to int ; if result is inexact or invalid fail.
     as_truncwd(ScratchFloat32Reg, src);
     as_cfc1(ScratchRegister, Assembler::FCSR);
     moveFromFloat32(ScratchFloat32Reg, dest);
-    ma_ext(ScratchRegister, ScratchRegister, Assembler::CauseI, 6);
-    as_andi(ScratchRegister, ScratchRegister, 0x11);//masking for Inexact and Invalid flag.
+    ma_ext(ScratchRegister, ScratchRegister, CauseBitPos, CauseBitCount);
+    as_andi(ScratchRegister, ScratchRegister, CauseIOrVMask); //masking for Inexact and Invalid flag.
     ma_b(ScratchRegister, Imm32(0), fail, Assembler::NotEqual);
 }
 
 // Checks whether a float32 is representable as a 32-bit integer. If so, the
 // integer is written to the output register. Otherwise, a bailout is taken to
@@ -134,11 +139,12 @@
     }
 
     as_truncws(ScratchFloat32Reg, src);
     as_cfc1(ScratchRegister, Assembler::FCSR);
     moveFromFloat32(ScratchFloat32Reg, dest);
-    ma_ext(ScratchRegister, ScratchRegister, Assembler::CauseI, 1);
+    ma_ext(ScratchRegister, ScratchRegister, CauseBitPos, CauseBitCount);
+    as_andi(ScratchRegister, ScratchRegister, CauseIOrVMask);
     ma_b(ScratchRegister, Imm32(0), fail, Assembler::NotEqual);
 }
 
 void
 MacroAssemblerMIPS64Compat::convertFloat32ToDouble(FloatRegister src, FloatRegister dest)
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -13,10 +13,15 @@
 #include "mozilla/FloatingPoint.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/Sprintf.h"
 
+#include <map>
+#include <sys/types.h>
+#include <unistd.h>
+#include <vector>
+
 #include <ctype.h>
 #ifdef __linux__
 # include <dlfcn.h>
 #endif
 #include <stdarg.h>
@@ -108,16 +113,32 @@
 
 using mozilla::Maybe;
 using mozilla::PodCopy;
 using mozilla::Some;
 
+const char* Test[] = {
+  "line 1",
+  "line 2",
+  "line 3",
+  "line 4",
+  "line 5",
+  "line 6"     // misc-suspicious-missing-comma
+  "line 7",
+  "line 8",
+};
+
 #ifdef HAVE_VA_LIST_AS_ARRAY
 #define JS_ADDRESSOF_VA_LIST(ap) ((va_list*)(ap))
 #else
 #define JS_ADDRESSOF_VA_LIST(ap) (&(ap))
 #endif
 
+class AnnotateConflict {
+  MOZ_NO_DANGLING_ON_TEMPORARIES int *get() && { return nullptr; } // mozilla-dangling-on-temporary
+  MOZ_NO_DANGLING_ON_TEMPORARIES int test() { return 0; } // mozilla-dangling-on-temporary
+};
+
 JS_PUBLIC_API(bool)
 JS::CallArgs::requireAtLeast(JSContext* cx, const char* fnname, unsigned required) const
 {
     if (length() < required) {
         char numArgsStr[40];
@@ -163,11 +184,11 @@
         RootedValue val(cx, ObjectValue(*obj));
         return ReportValueErrorFlags(cx, flags, code_, JSDVG_IGNORE_STACK, val,
                                      nullptr, nullptr, nullptr);
     }
 
-    if (ErrorTakesArguments(code_)) {
+    else if (ErrorTakesArguments(code_)) { // readability-misleading-indentation or readability-else-after-return
         RootedValue idv(cx, IdToValue(id));
         RootedString str(cx, ValueToSource(cx, idv));
         if (!str)
             return false;
 
@@ -198,22 +219,36 @@
 }
 
 JS_PUBLIC_API(bool)
 JS::ObjectOpResult::reportStrictErrorOrWarning(JSContext* cx, HandleObject obj, bool strict)
 {
+    for (float x = 0.1f; x <= 1.0f; x += 0.1f) {} // clang-analyzer-security.FloatLoopCounter
+
+    setuid(1); // clang-analyzer-security.insecureAPI.UncheckedReturn
+
+    int x = 0;
+    int y = 0;
+    if (x < y); // misc-suspicious-semicolon
+    {
+      x++;
+    }
+
     MOZ_ASSERT(code_ != Uninitialized);
     MOZ_ASSERT(!ok());
     MOZ_ASSERT(!ErrorTakesArguments(code_));
     assertSameCompartment(cx, obj);
 
     unsigned flags = strict ? JSREPORT_ERROR : (JSREPORT_WARNING | JSREPORT_STRICT);
     return JS_ReportErrorFlagsAndNumberASCII(cx, flags, GetErrorMessage, nullptr, code_);
 }
 
 JS_PUBLIC_API(bool)
-JS::ObjectOpResult::failCantRedefineProp()
+JS::ObjectOpResult::failCantRedefineProp(void) // modernize-redundant-void-arg
 {
+    int x;
+    x = 1; // clang-analyzer-deadcode.DeadStores
+
     return fail(JSMSG_CANT_REDEFINE_PROP);
 }
 
 JS_PUBLIC_API(bool)
 JS::ObjectOpResult::failReadOnly()
@@ -306,16 +341,22 @@
 }
 
 JS_PUBLIC_API(Value)
 JS_GetEmptyStringValue(JSContext* cx)
 {
+    std::string str;
+    str.find("A"); // performance-faster-string-find
+
     return StringValue(cx->runtime()->emptyString);
 }
 
 JS_PUBLIC_API(JSString*)
 JS_GetEmptyString(JSContext* cx)
 {
+    std::map<int, std::vector<std::string>> my_map;
+    for (const std::pair<int, std::vector<std::string>>& p : my_map) {} // performance-implicit-conversion-in-loop
+
     MOZ_ASSERT(cx->emptyString());
     return cx->emptyString();
 }
 
 namespace js {
diff --git a/js/src/jsexn.cpp b/js/src/jsexn.cpp
--- a/js/src/jsexn.cpp
+++ b/js/src/jsexn.cpp
@@ -687,17 +687,18 @@
 
     UniquePtr<JSErrorReport> report = CopyErrorReport(cx, reportp);
     if (!report)
         return;
 
-    RootedObject errObject(cx, ErrorObject::create(cx, exnType, stack, fileName, lineNumber,
-                                                   columnNumber, std::move(report), messageStr));
+    ErrorObject* errObject = ErrorObject::create(cx, exnType, stack, fileName, lineNumber,
+                                                 columnNumber, std::move(report), messageStr);
     if (!errObject)
         return;
 
     // Throw it.
-    cx->setPendingException(ObjectValue(*errObject));
+    RootedValue errValue(cx, ObjectValue(*errObject));
+    cx->setPendingException(errValue);
 
     // Flag the error report passed in to indicate an exception was raised.
     reportp->flags |= JSREPORT_EXCEPTION;
 }
 
diff --git a/js/src/proxy/Wrapper.cpp b/js/src/proxy/Wrapper.cpp
--- a/js/src/proxy/Wrapper.cpp
+++ b/js/src/proxy/Wrapper.cpp
@@ -454,11 +454,12 @@
         RootedValue exc(cx);
         if (cx->getPendingException(&exc) && exc.isObject() && exc.toObject().is<ErrorObject>()) {
             cx->clearPendingException();
             ar.reset();
             Rooted<ErrorObject*> errObj(cx, &exc.toObject().as<ErrorObject>());
-            JSObject* copyobj = CopyErrorObject(cx, errObj);
-            if (copyobj)
-                cx->setPendingException(ObjectValue(*copyobj));
+            if (JSObject* copyobj = CopyErrorObject(cx, errObj)) {
+                RootedValue rootedCopy(cx, ObjectValue(*copyobj));
+                cx->setPendingException(rootedCopy);
+            }
         }
     }
 }
diff --git a/js/src/vm/GeneratorObject.cpp b/js/src/vm/GeneratorObject.cpp
--- a/js/src/vm/GeneratorObject.cpp
+++ b/js/src/vm/GeneratorObject.cpp
@@ -121,11 +121,12 @@
         MOZ_ASSERT(resumeKind == GeneratorObject::RETURN);
 
         MOZ_ASSERT(arg.isObject());
         frame.setReturnValue(arg);
 
-        cx->setPendingException(MagicValue(JS_GENERATOR_CLOSING));
+        RootedValue closing(cx, MagicValue(JS_GENERATOR_CLOSING));
+        cx->setPendingException(closing);
         genObj->setClosing();
     }
     return false;
 }
 
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -3992,11 +3992,12 @@
          * Exception was pending during finally, throw it *before* we adjust
          * pc, because pc indexes into script->trynotes.  This turns out not to
          * be necessary, but it seems clearer.  And it points out a FIXME:
          * 350509, due to Igor Bukanov.
          */
-        cx->setPendingException(rval);
+        ReservedRooted<Value> v(&rootValue0, rval);
+        cx->setPendingException(v);
         goto error;
     }
     MOZ_ASSERT(rval.isInt32());
 
     /* Increment the PC by this much. */
diff --git a/js/src/vm/JSContext-inl.h b/js/src/vm/JSContext-inl.h
--- a/js/src/vm/JSContext-inl.h
+++ b/js/src/vm/JSContext-inl.h
@@ -358,11 +358,11 @@
 {
     runtime()->gc.minorGC(reason);
 }
 
 inline void
-JSContext::setPendingException(const js::Value& v)
+JSContext::setPendingException(JS::HandleValue v)
 {
 #if defined(NIGHTLY_BUILD)
     do {
         // Do not intercept exceptions if we are already
         // in the exception interceptor. That would lead
diff --git a/js/src/vm/JSContext.h b/js/src/vm/JSContext.h
--- a/js/src/vm/JSContext.h
+++ b/js/src/vm/JSContext.h
@@ -737,11 +737,11 @@
 
     bool isThrowingOutOfMemory();
     bool isThrowingDebuggeeWouldRun();
     bool isClosingGenerator();
 
-    void setPendingException(const js::Value& v);
+    void setPendingException(JS::HandleValue v);
 
     void clearPendingException() {
         throwing = false;
         overRecursed_ = false;
         unwrappedException().setUndefined();
diff --git a/js/src/vm/JSContext.cpp b/js/src/vm/JSContext.cpp
--- a/js/src/vm/JSContext.cpp
+++ b/js/src/vm/JSContext.cpp
@@ -305,11 +305,12 @@
 
     /* Report the oom. */
     if (JS::OutOfMemoryCallback oomCallback = cx->runtime()->oomCallback)
         oomCallback(cx, cx->runtime()->oomCallbackData);
 
-    cx->setPendingException(StringValue(cx->names().outOfMemory));
+    RootedValue oomMessage(cx, StringValue(cx->names().outOfMemory));
+    cx->setPendingException(oomMessage);
 }
 
 mozilla::GenericErrorResult<OOM&>
 js::ReportOutOfMemoryResult(JSContext* cx)
 {
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -121,15 +121,15 @@
     }
     return true;
 }
 
 static bool
-intrinsic_IsWrappedArrayConstructor(JSContext* cx, unsigned argc, Value* vp)
+intrinsic_IsCrossRealmArrayConstructor(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     bool result = false;
-    if (!IsWrappedArrayConstructor(cx, args[0], &result))
+    if (!IsCrossRealmArrayConstructor(cx, args[0], &result))
         return false;
     args.rval().setBoolean(result);
     return true;
 }
 
@@ -2418,12 +2418,12 @@
 
     // Helper funtions after this point.
     JS_INLINABLE_FN("ToObject",      intrinsic_ToObject,                1,0, IntrinsicToObject),
     JS_INLINABLE_FN("IsObject",      intrinsic_IsObject,                1,0, IntrinsicIsObject),
     JS_INLINABLE_FN("IsArray",       intrinsic_IsArray,                 1,0, ArrayIsArray),
-    JS_INLINABLE_FN("IsWrappedArrayConstructor", intrinsic_IsWrappedArrayConstructor, 1,0,
-                    IntrinsicIsWrappedArrayConstructor),
+    JS_INLINABLE_FN("IsCrossRealmArrayConstructor", intrinsic_IsCrossRealmArrayConstructor, 1,0,
+                    IntrinsicIsCrossRealmArrayConstructor),
     JS_INLINABLE_FN("ToInteger",     intrinsic_ToInteger,               1,0, IntrinsicToInteger),
     JS_INLINABLE_FN("ToString",      intrinsic_ToString,                1,0, IntrinsicToString),
     JS_FN("ToSource",                intrinsic_ToSource,                1,0),
     JS_FN("ToPropertyKey",           intrinsic_ToPropertyKey,           1,0),
     JS_INLINABLE_FN("IsCallable",    intrinsic_IsCallable,              1,0, IntrinsicIsCallable),
diff --git a/js/src/vm/TypeInference.h b/js/src/vm/TypeInference.h
--- a/js/src/vm/TypeInference.h
+++ b/js/src/vm/TypeInference.h
@@ -876,10 +876,17 @@
     bool hasObjectFlags(CompilerConstraintList* constraints, ObjectGroupFlags flags);
 
     /* Get the class shared by all objects in this set, or nullptr. */
     const Class* 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).
+     */
+    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
diff --git a/js/src/vm/TypeInference.cpp b/js/src/vm/TypeInference.cpp
--- a/js/src/vm/TypeInference.cpp
+++ b/js/src/vm/TypeInference.cpp
@@ -2345,10 +2345,54 @@
     }
 
     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 Class* 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.
diff --git a/layout/base/nsLayoutUtils.h b/layout/base/nsLayoutUtils.h
--- a/layout/base/nsLayoutUtils.h
+++ b/layout/base/nsLayoutUtils.h
@@ -2393,15 +2393,10 @@
   /**
    * Checks if we should enable parsing for CSS Filters.
    */
   static bool CSSFiltersEnabled();
 
-  /**
-   * Checks whether support for the CSS-wide "unset" value is enabled.
-   */
-  static bool UnsetValueEnabled();
-
   /**
    * Checks whether support for inter-character ruby is enabled.
    */
   static bool IsInterCharacterRubyEnabled();
 
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -518,26 +518,10 @@
   }
 
   return sCSSFiltersEnabled;
 }
 
-bool
-nsLayoutUtils::UnsetValueEnabled()
-{
-  static bool sUnsetValueEnabled;
-  static bool sUnsetValuePrefCached = false;
-
-  if (!sUnsetValuePrefCached) {
-    sUnsetValuePrefCached = true;
-    Preferences::AddBoolVarCache(&sUnsetValueEnabled,
-                                 "layout.css.unset-value.enabled",
-                                 false);
-  }
-
-  return sUnsetValueEnabled;
-}
-
 bool
 nsLayoutUtils::IsInterCharacterRubyEnabled()
 {
   static bool sInterCharacterRubyEnabled;
   static bool sInterCharacterRubyEnabledPrefCached = false;
diff --git a/layout/doc/frame_reflow_debug.html b/layout/doc/frame_reflow_debug.html
--- a/layout/doc/frame_reflow_debug.html
+++ b/layout/doc/frame_reflow_debug.html
@@ -35,15 +35,28 @@
 </ul>
 
 <h2>Getting the log</h2>
 <ul>
 <li>Make sure that your build is a <b>debug</b> build.
+<li>Either:
+<ol>
+<li>Select which processes should log all reflow debugging:
+<ul>
+<li><code>set GECKO_DISPLAY_REFLOW_PROCESSES=a</code> to log from all processes
+<li><code>set GECKO_DISPLAY_REFLOW_PROCESSES=p</code> to log from the parent process
+<li><code>set GECKO_DISPLAY_REFLOW_PROCESSES=c</code> to log from e10s content processes
+</ul>
+<li>OR create a rules file:
+<ul>
 <li>Create a text file (for instance <code>reflow_rules.txt</code>).
 <li>Enter this line  in the text file <pre>* 1</pre>
 <li>Save the text file in the <code>%DIST%</code> directory
 <li>Go to the <code>%DIST%</code> directory
 <li>enter from command line: <code>set GECKO_DISPLAY_REFLOW_RULES_FILE=reflow_rules.txt</code>
+<li>Note: If Firefox fails to read the file, it may be because of sandboxing, try `--setpref security.sandbox.content.level=2` as workaround.
+</ul>
+</ol>
 <li> Run <code>viewer &gt; logfile.txt</code> and load your testcase. The
 logfile will contain all the promised information.
 </ul>
 <h2>Log File analyis</h2>
 <p>The logfile for a simple table like</p>
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2950,18 +2950,20 @@
     visibleRect =
       nsSVGIntegrationUtils::GetRequiredSourceForInvalidArea(this, visibleRect);
     aBuilder->EnterSVGEffectsContents(&hoistedScrollInfoItemsStorage);
   }
 
+
+  bool needsActiveOpacityLayer = false;
   // We build an opacity item if it's not going to be drawn by SVG content, or
   // SVG effects. SVG effects won't handle the opacity if we want an active
   // layer (for async animations), see
   // nsSVGIntegrationsUtils::PaintMaskAndClipPath or
   // nsSVGIntegrationsUtils::PaintFilter.
   bool useOpacity = HasVisualOpacity(effectSet) &&
                     !nsSVGUtils::CanOptimizeOpacity(this) &&
-                    (!usingSVGEffects || nsDisplayOpacity::NeedsActiveLayer(aBuilder, this));
+                    ((needsActiveOpacityLayer = nsDisplayOpacity::NeedsActiveLayer(aBuilder, this)) || !usingSVGEffects);
   bool useBlendMode = effects->mMixBlendMode != NS_STYLE_BLEND_NORMAL;
   bool useStickyPosition = disp->mPosition == NS_STYLE_POSITION_STICKY &&
     IsScrollFrameActive(aBuilder,
                         nsLayoutUtils::GetNearestScrollableFrame(GetParent(),
                         nsLayoutUtils::SCROLLABLE_SAME_DOC |
@@ -3257,13 +3259,14 @@
     // Don't clip nsDisplayOpacity items. We clip their descendants instead.
     // The clip we would set on an element with opacity would clip
     // all descendant content, but some should not be clipped.
     DisplayListClipState::AutoSaveRestore opacityClipState(aBuilder);
     resultList.AppendToTop(
-        MakeDisplayItem<nsDisplayOpacity>(aBuilder, this, &resultList,
+      MakeDisplayItem<nsDisplayOpacity>(aBuilder, this, &resultList,
                                         containerItemASR,
-                                        opacityItemForEventsAndPluginsOnly));
+                                        opacityItemForEventsAndPluginsOnly,
+                                        needsActiveOpacityLayer));
     if (aCreatedContainerItem) {
       *aCreatedContainerItem = true;
     }
   }
 
@@ -11920,17 +11923,42 @@
     }
   }
   aRules.AppendElement(&aRule);
 }
 
+static Maybe<bool> ShouldLogReflow(const char* processes)
+{
+  switch (processes[0]) {
+  case 'A': case 'a': return Some(true);
+  case 'P': case 'p': return Some(XRE_IsParentProcess());
+  case 'C': case 'c': return Some(XRE_IsContentProcess());
+  default: return Nothing{};
+  }
+}
+
 void DR_State::ParseRulesFile()
 {
+  char* processes = PR_GetEnv("GECKO_DISPLAY_REFLOW_PROCESSES");
+  if (processes) {
+    Maybe<bool> enableLog = ShouldLogReflow(processes);
+    if (enableLog.isNothing()) {
+      MOZ_CRASH("GECKO_DISPLAY_REFLOW_PROCESSES: [a]ll [p]arent [c]ontent");
+    } else if (enableLog.value()) {
+      DR_Rule* rule = new DR_Rule;
+      rule->AddPart(LayoutFrameType::None);
+      rule->mDisplay = true;
+      AddRule(mWildRules, *rule);
+      mActive = true;
+    }
+    return;
+  }
+
   char* path = PR_GetEnv("GECKO_DISPLAY_REFLOW_RULES_FILE");
   if (path) {
     FILE* inFile = fopen(path, "r");
     if (!inFile) {
-      MOZ_CRASH("Failed to open the specified rules file");
+      MOZ_CRASH("Failed to open the specified rules file; Try `--setpref security.sandbox.content.level=2` if the sandbox is at cause");
     }
     for (DR_Rule* rule = ParseRule(inFile); rule; rule = ParseRule(inFile)) {
       if (rule->mTarget) {
         LayoutFrameType fType = rule->mTarget->mFrameType;
         if (fType != LayoutFrameType::None) {
diff --git a/layout/painting/FrameLayerBuilder.cpp b/layout/painting/FrameLayerBuilder.cpp
--- a/layout/painting/FrameLayerBuilder.cpp
+++ b/layout/painting/FrameLayerBuilder.cpp
@@ -577,11 +577,12 @@
                   const nsIntRect& aVisibleRect,
                   const nsRect& aContentRect,
                   const DisplayItemClip& aClip,
                   LayerState aLayerState,
                   nsDisplayList *aList,
-                  DisplayItemEntryType aType);
+                  DisplayItemEntryType aType,
+                  nsTArray<size_t>& aOpacityIndices);
   AnimatedGeometryRoot* GetAnimatedGeometryRoot() { return mAnimatedGeometryRoot; }
 
   /**
    * A region including the horizontal pan, vertical pan, and no action regions.
    */
@@ -766,15 +767,10 @@
   /**
    * All the display items that have been assigned to this painted layer.
    * These items get added by Accumulate().
    */
   nsTArray<AssignedDisplayItem> mAssignedDisplayItems;
-  /**
-   * Tracks the active opacity markers by holding the indices to PUSH_OPACITY
-   * items in |mAssignedDisplayItems|.
-   */
-  nsTArray<size_t> mOpacityIndices;
 };
 
 struct NewLayerEntry {
   NewLayerEntry()
     : mAnimatedGeometryRoot(nullptr)
@@ -3349,12 +3345,10 @@
 template<typename FindOpaqueBackgroundColorCallbackType>
 void ContainerState::FinishPaintedLayerData(PaintedLayerData& aData, FindOpaqueBackgroundColorCallbackType aFindOpaqueBackgroundColor)
 {
   PaintedLayerData* data = &aData;
 
-  MOZ_ASSERT(data->mOpacityIndices.IsEmpty());
-
   if (!data->mLayer) {
     // No layer was recycled, so we create a new one.
     RefPtr<PaintedLayer> paintedLayer = CreatePaintedLayer(data);
     data->mLayer = paintedLayer;
 
@@ -3637,22 +3631,23 @@
                              const nsIntRect& aVisibleRect,
                              const nsRect& aContentRect,
                              const DisplayItemClip& aClip,
                              LayerState aLayerState,
                              nsDisplayList* aList,
-                             DisplayItemEntryType aType)
+                             DisplayItemEntryType aType,
+                             nsTArray<size_t>& aOpacityIndices)
 {
   FLB_LOG_PAINTED_LAYER_DECISION(this, "Accumulating dp=%s(%p), f=%p against pld=%p\n", aItem->Name(), aItem, aItem->Frame(), this);
 
-  const bool hasOpacity = mOpacityIndices.Length() > 0;
+  const bool hasOpacity = aOpacityIndices.Length() > 0;
 
   const DisplayItemClip* oldClip = mItemClip;
   mItemClip = &aClip;
 
   if (aType == DisplayItemEntryType::POP_OPACITY) {
-    MOZ_ASSERT(!mOpacityIndices.IsEmpty());
-    mOpacityIndices.RemoveLastElement();
+    MOZ_ASSERT(!aOpacityIndices.IsEmpty());
+    aOpacityIndices.RemoveLastElement();
 
     AssignedDisplayItem item(aItem, aLayerState,
                              nullptr, aContentRect, aType, hasOpacity);
     mAssignedDisplayItems.AppendElement(std::move(item));
     return;
@@ -3671,11 +3666,11 @@
   } else {
     componentAlphaBounds = aItem->GetComponentAlphaBounds(aState->mBuilder);
 
     if (!componentAlphaBounds.IsEmpty()) {
       // This display item needs background copy when pushing opacity group.
-      for (size_t i : mOpacityIndices) {
+      for (size_t i : aOpacityIndices) {
         AssignedDisplayItem& item = mAssignedDisplayItems[i];
         MOZ_ASSERT(item.mType == DisplayItemEntryType::PUSH_OPACITY ||
                    item.mType == DisplayItemEntryType::PUSH_OPACITY_WITH_BG);
         item.mType = DisplayItemEntryType::PUSH_OPACITY_WITH_BG;
       }
@@ -3694,11 +3689,11 @@
   AssignedDisplayItem item(aItem, aLayerState,
                            oldData, aContentRect, aType, hasOpacity);
   mAssignedDisplayItems.AppendElement(std::move(item));
 
   if (aType == DisplayItemEntryType::PUSH_OPACITY) {
-    mOpacityIndices.AppendElement(mAssignedDisplayItems.Length() - 1);
+    aOpacityIndices.AppendElement(mAssignedDisplayItems.Length() - 1);
   }
 
   if (aItem->MustPaintOnContentSide()) {
      mShouldPaintOnContentSide = true;
   }
@@ -4286,10 +4281,11 @@
   nsPoint lastTopLeft;
 
   // Tracks the PaintedLayerData that the item will be accumulated in, if it is
   // non-null. Currently only used with PUSH_OPACITY and POP_OPACITY markers.
   PaintedLayerData* selectedPLD = nullptr;
+  AutoTArray<size_t, 2> opacityIndices;
 
   FLBDisplayItemIterator iter(mBuilder, aList, this);
   while (iter.HasNext()) {
     DisplayItemEntry e = iter.GetNextEntry();
     nsDisplayItem* i = e.mItem;
@@ -4839,11 +4835,11 @@
         nsDisplayCompositorHitTestInfo* hitTestInfo =
           static_cast<nsDisplayCompositorHitTestInfo*>(item);
         paintedLayerData->AccumulateHitTestInfo(this, hitTestInfo);
       } else {
         paintedLayerData->Accumulate(this, item, itemVisibleRect, itemContent, itemClip,
-                                     layerState, aList, marker);
+                                     layerState, aList, marker, opacityIndices);
 
         if (!paintedLayerData->mLayer) {
           // Try to recycle the old layer of this display item.
           RefPtr<PaintedLayer> layer =
             AttemptToRecyclePaintedLayer(animatedGeometryRoot, item,
@@ -4866,11 +4862,11 @@
       }
 
       if (marker == DisplayItemEntryType::POP_OPACITY ) {
         MOZ_ASSERT(selectedPLD);
 
-        if (selectedPLD->mOpacityIndices.IsEmpty()) {
+        if (opacityIndices.IsEmpty()) {
           selectedPLD = nullptr;
         }
       }
     }
 
diff --git a/layout/painting/RetainedDisplayListBuilder.cpp b/layout/painting/RetainedDisplayListBuilder.cpp
--- a/layout/painting/RetainedDisplayListBuilder.cpp
+++ b/layout/painting/RetainedDisplayListBuilder.cpp
@@ -295,10 +295,11 @@
           if (mBuilder->MergeDisplayLists(aNewItem->GetChildren(),
                                           oldItem->GetChildren(),
                                           aNewItem->GetChildren(),
                                           containerASRForChildren,
                                           aNewItem->GetPerFrameKey())) {
+            aNewItem->InvalidateCachedChildInfo();
             mResultIsModified = true;
 
           }
           UpdateASR(aNewItem, containerASRForChildren);
           aNewItem->UpdateBounds(mBuilder->Builder());
@@ -399,10 +400,11 @@
       if (item->GetChildren()) {
         Maybe<const ActiveScrolledRoot*> containerASRForChildren;
         nsDisplayList empty;
         if (mBuilder->MergeDisplayLists(&empty, item->GetChildren(), item->GetChildren(),
                                         containerASRForChildren, item->GetPerFrameKey())) {
+          item->InvalidateCachedChildInfo();
           mResultIsModified = true;
         }
         UpdateASR(item, containerASRForChildren);
         item->UpdateBounds(mBuilder->Builder());
       }
diff --git a/layout/painting/nsCSSRendering.cpp b/layout/painting/nsCSSRendering.cpp
--- a/layout/painting/nsCSSRendering.cpp
+++ b/layout/painting/nsCSSRendering.cpp
@@ -1799,11 +1799,11 @@
   nsCSSShadowArray* shadows = aFrame->StyleEffects()->mBoxShadow;
   if (!shadows)
     return false;
 
   if (aFrame->IsThemed() && aFrame->GetContent() &&
-      !nsContentUtils::IsChromeDoc(aFrame->GetContent()->GetUncomposedDoc())) {
+      !nsContentUtils::IsChromeDoc(aFrame->GetContent()->GetComposedDoc())) {
     // There's no way of getting hold of a shape corresponding to a
     // "padding-box" for native-themed widgets, so just don't draw
     // inner box-shadows for them. But we allow chrome to paint inner
     // box shadows since chrome can be aware of the platform theme.
     return false;
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -2370,10 +2370,16 @@
         aInvalidRegion->Xor(aGeometry->mBounds, bounds);
       }
     }
   }
 
+  /**
+   * This function is called when an item's list of children has been omdified
+   * by RetaineDisplayListBuilder.
+   */
+  virtual void InvalidateCachedChildInfo() {}
+
   /**
    * @param aSnap set to true if the edges of the rectangles of the opaque
    * region would be snapped to device pixels when drawing
    * @return a region of the item that is opaque --- that is, every pixel
    * that is visible is painted with an opaque
@@ -2783,10 +2789,15 @@
   bool In3DContextAndBackfaceIsHidden()
   {
     return mBackfaceHidden;
   }
 
+  bool HasDifferentFrame(const nsDisplayItem* aOther) const
+  {
+    return mFrame != aOther->mFrame;
+  }
+
   bool HasSameTypeAndClip(const nsDisplayItem* aOther) const
   {
     return GetPerFrameKey() == aOther->GetPerFrameKey() &&
            GetClipChain() == aOther->GetClipChain();
   }
@@ -4965,10 +4976,11 @@
   }
 
   virtual void Merge(const nsDisplayItem* aItem) override
   {
     MOZ_ASSERT(CanMerge(aItem));
+    MOZ_ASSERT(Frame() != aItem->Frame());
     MergeFromTrackingMergedFrames(static_cast<const nsDisplayWrapList*>(aItem));
   }
 
   virtual void GetMergedFrames(nsTArray<nsIFrame*>* aFrames) const override
   {
@@ -5113,40 +5125,43 @@
 class nsDisplayOpacity : public nsDisplayWrapList {
 public:
   nsDisplayOpacity(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                    nsDisplayList* aList,
                    const ActiveScrolledRoot* aActiveScrolledRoot,
-                   bool aForEventsAndPluginsOnly);
+                   bool aForEventsAndPluginsOnly,
+                   bool aNeedsActiveLayer);
 
   nsDisplayOpacity(nsDisplayListBuilder* aBuilder,
                    const nsDisplayOpacity& aOther)
     : nsDisplayWrapList(aBuilder, aOther)
     , mOpacity(aOther.mOpacity)
     , mForEventsAndPluginsOnly(aOther.mForEventsAndPluginsOnly)
-    , mOpacityAppliedToChildren(false)
+    , mNeedsActiveLayer(aOther.mNeedsActiveLayer)
+    , mChildOpacityState(ChildOpacityState::Unknown)
   {
     // We should not try to merge flattened opacities.
-    MOZ_ASSERT(!aOther.mOpacityAppliedToChildren);
+    MOZ_ASSERT(aOther.mChildOpacityState != ChildOpacityState::Applied);
   }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
   virtual ~nsDisplayOpacity();
 #endif
 
   virtual void RestoreState() override
   {
     nsDisplayItem::RestoreState();
     mOpacity = mState.mOpacity;
-    mOpacityAppliedToChildren = false;
   }
 
   virtual nsDisplayWrapList* Clone(nsDisplayListBuilder* aBuilder) const override
   {
     MOZ_COUNT_CTOR(nsDisplayOpacity);
     return MakeDisplayItem<nsDisplayOpacity>(aBuilder, *this);
   }
 
+  virtual void InvalidateCachedChildInfo() override { mChildOpacityState = ChildOpacityState::Unknown; }
+
   virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder,
                                    bool* aSnap) const override;
   virtual already_AddRefed<Layer> BuildLayer(nsDisplayListBuilder* aBuilder,
                                              LayerManager* aManager,
                                              const ContainerLayerParameters& aContainerParameters) override;
@@ -5159,11 +5174,11 @@
   virtual bool CanMerge(const nsDisplayItem* aItem) const override
   {
     // items for the same content element should be merged into a single
     // compositing group
     // aItem->GetUnderlyingFrame() returns non-null because it's nsDisplayOpacity
-    return HasSameTypeAndClip(aItem) && HasSameContent(aItem);
+    return HasDifferentFrame(aItem) && HasSameTypeAndClip(aItem) && HasSameContent(aItem);
   }
 
   virtual nsDisplayItemGeometry* AllocateGeometry(nsDisplayListBuilder* aBuilder) override
   {
     return new nsDisplayOpacityGeometry(this, aBuilder, mOpacity);
@@ -5187,11 +5202,11 @@
   virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override;
 
   /**
    * Returns true if ShouldFlattenAway() applied opacity to children.
    */
-  bool OpacityAppliedToChildren() const { return mOpacityAppliedToChildren; }
+  bool OpacityAppliedToChildren() const { return mChildOpacityState == ChildOpacityState::Applied; }
 
   static bool NeedsActiveLayer(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame);
   NS_DISPLAY_DECL_NAME("Opacity", TYPE_OPACITY)
   virtual void WriteDebugInfo(std::stringstream& aStream) override;
 
@@ -5207,12 +5222,25 @@
 
 private:
   bool ApplyOpacityToChildren(nsDisplayListBuilder* aBuilder);
 
   float mOpacity;
-  bool mForEventsAndPluginsOnly;
-  bool mOpacityAppliedToChildren;
+  bool mForEventsAndPluginsOnly : 1;
+  enum class ChildOpacityState : uint8_t {
+    // Our child list has changed since the last time ApplyOpacityToChildren was called.
+    Unknown,
+    // Our children defer opacity handling to us.
+    Deferred,
+    // Opacity is applied to our children.
+    Applied
+  };
+  bool mNeedsActiveLayer : 1;
+#ifndef __GNUC__
+  ChildOpacityState mChildOpacityState : 2;
+#else
+  ChildOpacityState mChildOpacityState;
+#endif
 
   struct {
     float mOpacity;
   } mState;
 };
@@ -5379,11 +5407,11 @@
 
     virtual bool CanMerge(const nsDisplayItem* aItem) const override
     {
       // Items for the same content element should be merged into a single
       // compositing group.
-      return HasSameTypeAndClip(aItem) && HasSameContent(aItem)
+      return HasDifferentFrame(aItem) && HasSameTypeAndClip(aItem) && HasSameContent(aItem)
           && mIsForBackground == static_cast<const nsDisplayBlendContainer*>(aItem)->mIsForBackground;
     }
 
     virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override
     {
@@ -6134,11 +6162,11 @@
 
   virtual bool CanMerge(const nsDisplayItem* aItem) const override
   {
     // Items for the same content element should be merged into a single
     // compositing group.
-    return HasSameTypeAndClip(aItem) && HasSameContent(aItem);
+    return HasDifferentFrame(aItem) && HasSameTypeAndClip(aItem) && HasSameContent(aItem);
   }
 
   virtual void Merge(const nsDisplayItem* aItem) override
   {
     nsDisplayWrapList::Merge(aItem);
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -6235,15 +6235,17 @@
 }
 
 nsDisplayOpacity::nsDisplayOpacity(nsDisplayListBuilder* aBuilder,
                                    nsIFrame* aFrame, nsDisplayList* aList,
                                    const ActiveScrolledRoot* aActiveScrolledRoot,
-                                   bool aForEventsAndPluginsOnly)
+                                   bool aForEventsAndPluginsOnly,
+                                   bool aNeedsActiveLayer)
     : nsDisplayWrapList(aBuilder, aFrame, aList, aActiveScrolledRoot, true)
     , mOpacity(aFrame->StyleEffects()->mOpacity)
     , mForEventsAndPluginsOnly(aForEventsAndPluginsOnly)
-    , mOpacityAppliedToChildren(false)
+    , mNeedsActiveLayer(aNeedsActiveLayer)
+    , mChildOpacityState(ChildOpacityState::Unknown)
 {
   MOZ_COUNT_CTOR(nsDisplayOpacity);
   mState.mOpacity = mOpacity;
 }
 
@@ -6376,18 +6378,23 @@
 }
 
 bool
 nsDisplayOpacity::ApplyOpacityToChildren(nsDisplayListBuilder* aBuilder)
 {
+  if (mChildOpacityState == ChildOpacityState::Deferred) {
+    return false;
+  }
+
   // Only try folding our opacity down if we have at most kMaxChildCount
   // children that don't overlap and can all apply the opacity to themselves.
   static const size_t kMaxChildCount = 3;
 
   // Iterate through the child display list and copy at most kMaxChildCount
   // child display item pointers to a temporary list.
   AutoTArray<nsDisplayItem*, kMaxChildCount> items;
   if (!CollectItemsWithOpacity(&mList, items, kMaxChildCount)) {
+    mChildOpacityState = ChildOpacityState::Deferred;
     return false;
   }
 
   struct {
     nsDisplayItem* item;
@@ -6403,37 +6410,35 @@
   }
 
   for (size_t i = 0; i < childCount; i++) {
     for (size_t j = i+1; j < childCount; j++) {
       if (children[i].bounds.Intersects(children[j].bounds)) {
+        mChildOpacityState = ChildOpacityState::Deferred;
         return false;
       }
     }
   }
 
   for (uint32_t i = 0; i < childCount; i++) {
     children[i].item->ApplyOpacity(aBuilder, mOpacity, mClipChain);
   }
 
-  mOpacityAppliedToChildren = true;
+  mChildOpacityState = ChildOpacityState::Applied;
   return true;
 }
 
 bool
 nsDisplayOpacity::ShouldFlattenAway(nsDisplayListBuilder* aBuilder)
 {
-  // ShouldFlattenAway() should be called only once during painting.
-  MOZ_ASSERT(!mOpacityAppliedToChildren);
-
   if (mFrame->GetPrevContinuation() || mFrame->GetNextContinuation() ||
       mFrame->HasAnyStateBits(NS_FRAME_PART_OF_IBSPLIT)) {
     // If we've been split, then we might need to merge, so
     // don't flatten us away.
     return false;
   }
 
-  if (NeedsActiveLayer(aBuilder, mFrame) || mOpacity == 0.0) {
+  if (mNeedsActiveLayer || mOpacity == 0.0) {
     // If our opacity is zero then we'll discard all descendant display items
     // except for layer event regions, so there's no point in doing this
     // optimization (and if we do do it, then invalidations of those descendants
     // might trigger repainting).
     return false;
@@ -6459,11 +6464,11 @@
   if (mForEventsAndPluginsOnly) {
     MOZ_ASSERT(mOpacity == 0);
     return LAYER_INACTIVE;
   }
 
-  if (NeedsActiveLayer(aBuilder, mFrame)) {
+  if (mNeedsActiveLayer) {
     // Returns LAYER_ACTIVE_FORCE to avoid flatterning the layer for async
     // animations.
     return LAYER_ACTIVE_FORCE;
   }
 
@@ -6647,11 +6652,11 @@
 bool
 nsDisplayBlendMode::CanMerge(const nsDisplayItem* aItem) const
 {
   // Items for the same content element should be merged into a single
   // compositing group.
-  if (!HasSameTypeAndClip(aItem) || !HasSameContent(aItem)) {
+  if (!HasDifferentFrame(aItem) || !HasSameTypeAndClip(aItem) || !HasSameContent(aItem)) {
     return false;
   }
 
   const nsDisplayBlendMode* item =
     static_cast<const nsDisplayBlendMode*>(aItem);
@@ -9363,11 +9368,11 @@
 bool
 nsDisplayMask::CanMerge(const nsDisplayItem* aItem) const
 {
   // Items for the same content element should be merged into a single
   // compositing group.
-  if (!HasSameTypeAndClip(aItem) || !HasSameContent(aItem)) {
+  if (!HasDifferentFrame(aItem) || !HasSameTypeAndClip(aItem) || !HasSameContent(aItem)) {
     return false;
   }
 
   return CanMergeDisplayMaskFrame(mFrame) &&
          CanMergeDisplayMaskFrame(aItem->Frame());
diff --git a/layout/style/test/property_database.js b/layout/style/test/property_database.js
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@@ -290,10 +290,14 @@
   "linear-gradient(to top, red, 100%)",
   "linear-gradient(to top, red, 45%, 56%, blue)",
   "linear-gradient(to top, red,, blue)",
   "linear-gradient(to top, red, green 35%, 15%, 54%, blue)",
 
+  "linear-gradient(unset, 10px 10px, from(blue))",
+  "linear-gradient(unset, 10px 10px, blue 0)",
+  "repeating-linear-gradient(unset, 10px 10px, blue 0)",
+
 
   "radial-gradient(top left 45deg, red, blue)",
   "radial-gradient(20% bottom -300deg, red, blue)",
   "radial-gradient(center 20% 1.95929rad, red, blue)",
   "radial-gradient(left 35px 30grad, red, blue)",
@@ -1175,11 +1179,11 @@
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
     subproperties: [ "animation-name", "animation-duration", "animation-timing-function", "animation-delay", "animation-direction", "animation-fill-mode", "animation-iteration-count", "animation-play-state" ],
     initial_values: [ "none none 0s 0s ease normal running 1.0", "none", "0s", "ease", "normal", "running", "1.0" ],
     other_values: [ "none none 0s 0s cubic-bezier(0.25, 0.1, 0.25, 1.0) normal running 1.0", "bounce 1s linear 2s", "bounce 1s 2s linear", "bounce linear 1s 2s", "linear bounce 1s 2s", "linear 1s bounce 2s", "linear 1s 2s bounce", "1s bounce linear 2s", "1s bounce 2s linear", "1s 2s bounce linear", "1s linear bounce 2s", "1s linear 2s bounce", "1s 2s linear bounce", "bounce linear 1s", "bounce 1s linear", "linear bounce 1s", "linear 1s bounce", "1s bounce linear", "1s linear bounce", "1s 2s bounce", "1s bounce 2s", "bounce 1s 2s", "1s 2s linear", "1s linear 2s", "linear 1s 2s", "bounce 1s", "1s bounce", "linear 1s", "1s linear", "1s 2s", "2s 1s", "bounce", "linear", "1s", "height", "2s", "ease-in-out", "2s ease-in", "opacity linear", "ease-out 2s", "2s color, 1s bounce, 500ms height linear, 1s opacity 4s cubic-bezier(0.0, 0.1, 1.0, 1.0)", "1s \\32bounce linear 2s", "1s -bounce linear 2s", "1s -\\32bounce linear 2s", "1s \\32 0bounce linear 2s", "1s -\\32 0bounce linear 2s", "1s \\2bounce linear 2s", "1s -\\2bounce linear 2s", "2s, 1s bounce", "1s bounce, 2s", "2s all, 1s bounce", "1s bounce, 2s all", "1s bounce, 2s none", "2s none, 1s bounce", "2s bounce, 1s all", "2s all, 1s bounce" ],
-    invalid_values: [ "2s inherit", "inherit 2s", "2s bounce, 1s inherit", "2s inherit, 1s bounce", "2s initial", "2s all,, 1s bounce", "2s all, , 1s bounce", "bounce 1s cubic-bezier(0, rubbish) 2s", "bounce 1s steps(rubbish) 2s" ]
+    invalid_values: [ "2s inherit", "inherit 2s", "2s bounce, 1s inherit", "2s inherit, 1s bounce", "2s initial", "2s all,, 1s bounce", "2s all, , 1s bounce", "bounce 1s cubic-bezier(0, rubbish) 2s", "bounce 1s steps(rubbish) 2s", "2s unset" ]
   },
   "animation-delay": {
     domProp: "animationDelay",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1191,11 +1195,11 @@
     domProp: "animationDirection",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "normal" ],
     other_values: [ "alternate", "normal, alternate", "alternate, normal", "normal, normal", "normal, normal, normal", "reverse", "alternate-reverse", "normal, reverse, alternate-reverse, alternate" ],
-    invalid_values: [ "normal normal", "inherit, normal", "reverse-alternate" ]
+    invalid_values: [ "normal normal", "inherit, normal", "reverse-alternate", "normal, unset", "unset, normal" ]
   },
   "animation-duration": {
     domProp: "animationDuration",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1225,11 +1229,11 @@
     domProp: "animationName",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "none" ],
     other_values: [ "all", "ball", "mall", "color", "bounce, bubble, opacity", "foobar", "auto", "\\32bounce", "-bounce", "-\\32bounce", "\\32 0bounce", "-\\32 0bounce", "\\2bounce", "-\\2bounce" ],
-    invalid_values: [ "bounce, initial", "initial, bounce", "bounce, inherit", "inherit, bounce" ]
+    invalid_values: [ "bounce, initial", "initial, bounce", "bounce, inherit", "inherit, bounce", "bounce, unset", "unset, bounce" ]
   },
   "animation-play-state": {
     domProp: "animationPlayState",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1421,11 +1425,11 @@
       "calc(25px*3)",
       "calc(3*25px + 50%)",
       "2px 2px calc(2px + 1%) 2px",
       "1px 2px 2px 2px / 2px 2px calc(2px + 1%) 2px",
             ],
-    invalid_values: [ "2px -2px", "inherit 2px", "inherit / 2px", "2px inherit", "2px / inherit", "2px 2px 2px 2px 2px", "1px / 2px 2px 2px 2px 2px", "2", "2 2", "2px 2px 2px 2px / 2px 2px 2 2px", "2px calc(0px + rubbish)" ]
+    invalid_values: [ "2px -2px", "inherit 2px", "inherit / 2px", "2px inherit", "2px / inherit", "2px 2px 2px 2px 2px", "1px / 2px 2px 2px 2px 2px", "2", "2 2", "2px 2px 2px 2px / 2px 2px 2 2px", "2px calc(0px + rubbish)", "unset 2px", "unset / 2px", "2px unset", "2px / unset" ]
   },
   "border-bottom-left-radius": {
     domProp: "borderBottomLeftRadius",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1442,11 +1446,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)", "unset 2px", "2px unset" ]
   },
   "border-bottom-right-radius": {
     domProp: "borderBottomRightRadius",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1463,11 +1467,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)", "unset 2px", "2px unset" ]
   },
   "border-top-left-radius": {
     domProp: "borderTopLeftRadius",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1484,11 +1488,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)", "unset 2px", "2px unset" ]
   },
   "border-top-right-radius": {
     domProp: "borderTopRightRadius",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -1505,11 +1509,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "2px calc(0px + rubbish)", "unset 2px", "2px unset" ]
   },
   "border-inline-start": {
     domProp: "borderInlineStart",
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
@@ -2270,11 +2274,11 @@
       "calc(25px*3)",
       "calc(3*25px + 50%)",
       "2px 2px calc(2px + 1%) 2px",
       "1px 2px 2px 2px / 2px 2px calc(2px + 1%) 2px",
             ],
-    invalid_values: [ "2px -2px", "inherit 2px", "inherit / 2px", "2px inherit", "2px / inherit", "2px 2px 2px 2px 2px", "1px / 2px 2px 2px 2px 2px", "2", "2 2", "2px 2px 2px 2px / 2px 2px 2 2px" ]
+    invalid_values: [ "2px -2px", "inherit 2px", "inherit / 2px", "2px inherit", "2px / inherit", "2px 2px 2px 2px 2px", "1px / 2px 2px 2px 2px 2px", "2", "2 2", "2px 2px 2px 2px / 2px 2px 2 2px", "unset 2px", "unset / 2px", "2px unset", "2px / unset" ]
   },
   "-moz-outline-radius-bottomleft": {
     domProp: "MozOutlineRadiusBottomleft",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -2290,11 +2294,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "unset 2px", "2px unset" ]
   },
   "-moz-outline-radius-bottomright": {
     domProp: "MozOutlineRadiusBottomright",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -2310,11 +2314,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "unset 2px", "2px unset" ]
   },
   "-moz-outline-radius-topleft": {
     domProp: "MozOutlineRadiusTopleft",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -2330,11 +2334,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "unset 2px", "2px unset" ]
   },
   "-moz-outline-radius-topright": {
     domProp: "MozOutlineRadiusTopright",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -2350,11 +2354,11 @@
       "5px calc(3*25px)",
       "calc(20%) calc(3*25px)",
       "calc(25px*3)",
       "calc(3*25px + 50%)",
             ],
-    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px" ]
+    invalid_values: [ "-1px", "4px -2px", "inherit 2px", "2px inherit", "2", "2px 2", "2 2px", "unset 2px", "2px unset" ]
   },
   "padding-inline-end": {
     domProp: "paddingInlineEnd",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -3242,11 +3246,11 @@
       "-2px -2px",
       "calc(2px) calc(2px)",
       "calc(2px) calc(2px) calc(2px)",
       "calc(2px) calc(2px) calc(2px) calc(2px)"
     ],
-    invalid_values: [ "3% 3%", "1px 1px 1px 1px 1px", "2px 2px, none", "red 2px 2px blue", "inherit, 2px 2px", "2px 2px, inherit", "2px 2px -5px", "inset 4px 4px black inset", "inset inherit", "inset none", "3 3", "3px 3", "3 3px", "3px 3px 3", "3px 3px 3px 3", "3px calc(3px + rubbish)", "3px 3px calc(3px + rubbish)", "3px 3px 3px calc(3px + rubbish)", "3px 3px 3px 3px rgb(0, rubbish, 0)" ]
+    invalid_values: [ "3% 3%", "1px 1px 1px 1px 1px", "2px 2px, none", "red 2px 2px blue", "inherit, 2px 2px", "2px 2px, inherit", "2px 2px -5px", "inset 4px 4px black inset", "inset inherit", "inset none", "3 3", "3px 3", "3 3px", "3px 3px 3", "3px 3px 3px 3", "3px calc(3px + rubbish)", "3px 3px calc(3px + rubbish)", "3px 3px 3px calc(3px + rubbish)", "3px 3px 3px 3px rgb(0, rubbish, 0)", "unset, 2px 2px", "2px 2px, unset", "inset unset" ]
   },
   "caption-side": {
     domProp: "captionSide",
     inherited: true,
     type: CSS_TYPE_LONGHAND,
@@ -4521,11 +4525,11 @@
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     applies_to_placeholder: true,
     initial_values: [ "clip" ],
     other_values: [ "ellipsis", '""', "''", '"hello"', 'clip clip', 'ellipsis ellipsis', 'clip ellipsis', 'clip ""', '"hello" ""', '"" ellipsis' ],
-    invalid_values: [ "none", "auto", '"hello" inherit', 'inherit "hello"', 'clip initial', 'initial clip', 'initial inherit', 'inherit initial', 'inherit none']
+    invalid_values: [ "none", "auto", '"hello" inherit', 'inherit "hello"', 'clip initial', 'initial clip', 'initial inherit', 'inherit initial', 'inherit none', '"hello" unset', 'unset "hello"', 'clip unset', 'unset clip', 'unset inherit', 'unset none', 'initial unset']
   },
   "text-shadow": {
     domProp: "textShadow",
     inherited: true,
     type: CSS_TYPE_LONGHAND,
@@ -4546,11 +4550,11 @@
       "-2px -2px",
       "calc(2px) calc(2px)",
       "calc(2px) calc(2px) calc(2px)",
     ],
     invalid_values: [ "3% 3%", "2px 2px -5px", "2px 2px 2px 2px", "2px 2px, none", "none, 2px 2px", "inherit, 2px 2px", "2px 2px, inherit", "2 2px", "2px 2", "2px 2px 2", "2px 2px 2px 2",
-      "calc(2px) calc(2px) calc(2px) calc(2px)", "3px 3px calc(3px + rubbish)"
+      "calc(2px) calc(2px) calc(2px) calc(2px)", "3px 3px calc(3px + rubbish)", "unset, 2px 2px", "2px 2px, unset"
     ]
   },
   "text-transform": {
     domProp: "textTransform",
     inherited: true,
@@ -4586,11 +4590,11 @@
     inherited: false,
     type: CSS_TYPE_TRUE_SHORTHAND,
     subproperties: [ "transition-property", "transition-duration", "transition-timing-function", "transition-delay" ],
     initial_values: [ "all 0s ease 0s", "all", "0s", "0s 0s", "ease" ],
     other_values: [ "all 0s cubic-bezier(0.25, 0.1, 0.25, 1.0) 0s", "width 1s linear 2s", "width 1s 2s linear", "width linear 1s 2s", "linear width 1s 2s", "linear 1s width 2s", "linear 1s 2s width", "1s width linear 2s", "1s width 2s linear", "1s 2s width linear", "1s linear width 2s", "1s linear 2s width", "1s 2s linear width", "width linear 1s", "width 1s linear", "linear width 1s", "linear 1s width", "1s width linear", "1s linear width", "1s 2s width", "1s width 2s", "width 1s 2s", "1s 2s linear", "1s linear 2s", "linear 1s 2s", "width 1s", "1s width", "linear 1s", "1s linear", "1s 2s", "2s 1s", "width", "linear", "1s", "height", "2s", "ease-in-out", "2s ease-in", "opacity linear", "ease-out 2s", "2s color, 1s width, 500ms height linear, 1s opacity 4s cubic-bezier(0.0, 0.1, 1.0, 1.0)", "1s \\32width linear 2s", "1s -width linear 2s", "1s -\\32width linear 2s", "1s \\32 0width linear 2s", "1s -\\32 0width linear 2s", "1s \\2width linear 2s", "1s -\\2width linear 2s", "2s, 1s width", "1s width, 2s", "2s all, 1s width", "1s width, 2s all", "2s all, 1s width", "2s width, 1s all", "3s --my-color", "none", "none 2s linear 2s" ],
-    invalid_values: [ "1s width, 2s none", "2s none, 1s width", "2s inherit", "inherit 2s", "2s width, 1s inherit", "2s inherit, 1s width", "2s initial", "1s width,,2s color", "1s width, ,2s color", "bounce 1s cubic-bezier(0, rubbish) 2s", "bounce 1s steps(rubbish) 2s" ]
+    invalid_values: [ "1s width, 2s none", "2s none, 1s width", "2s inherit", "inherit 2s", "2s width, 1s inherit", "2s inherit, 1s width", "2s initial", "1s width,,2s color", "1s width, ,2s color", "bounce 1s cubic-bezier(0, rubbish) 2s", "bounce 1s steps(rubbish) 2s", "2s unset" ]
   },
   "transition-delay": {
     domProp: "transitionDelay",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -4610,11 +4614,11 @@
     domProp: "transitionProperty",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
     initial_values: [ "all" ],
     other_values: [ "none", "left", "top", "color", "width, height, opacity", "foobar", "auto", "\\32width", "-width", "-\\32width", "\\32 0width", "-\\32 0width", "\\2width", "-\\2width", "all, all", "all, color", "color, all", "--my-color" ],
-    invalid_values: [ "none, none", "color, none", "none, color", "inherit, color", "color, inherit", "initial, color", "color, initial", "none, color", "color, none" ]
+    invalid_values: [ "none, none", "color, none", "none, color", "inherit, color", "color, inherit", "initial, color", "color, initial", "none, color", "color, none", "unset, color", "color, unset" ]
   },
   "transition-timing-function": {
     domProp: "transitionTimingFunction",
     inherited: false,
     type: CSS_TYPE_LONGHAND,
@@ -8188,40 +8192,20 @@
     other_values: [ "green", "#fc3" ],
     invalid_values: [ "000000", "ff00ff" ]
   };
 }
 
-if (IsCSSPropertyPrefEnabled("layout.css.unset-value.enabled")) {
-  gCSSProperties["animation"].invalid_values.push("2s unset");
-  gCSSProperties["animation-direction"].invalid_values.push("normal, unset", "unset, normal");
-  gCSSProperties["animation-name"].invalid_values.push("bounce, unset", "unset, bounce");
-  gCSSProperties["border-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
-  gCSSProperties["border-bottom-left-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-bottom-right-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-top-left-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["border-top-right-radius"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius"].invalid_values.push("unset 2px", "unset / 2px", "2px unset", "2px / unset");
-  gCSSProperties["-moz-outline-radius-bottomleft"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-bottomright"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-topleft"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["-moz-outline-radius-topright"].invalid_values.push("unset 2px", "2px unset");
-  gCSSProperties["background-image"].invalid_values.push("linear-gradient(unset, 10px 10px, from(blue))", "linear-gradient(unset, 10px 10px, blue 0)", "repeating-linear-gradient(unset, 10px 10px, blue 0)");
-  gCSSProperties["box-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset", "inset unset");
-  gCSSProperties["text-overflow"].invalid_values.push('"hello" unset', 'unset "hello"', 'clip unset', 'unset clip', 'unset inherit', 'unset none', 'initial unset');
-  gCSSProperties["text-shadow"].invalid_values.push("unset, 2px 2px", "2px 2px, unset");
-  gCSSProperties["transition"].invalid_values.push("2s unset");
-  gCSSProperties["transition-property"].invalid_values.push("unset, color", "color, unset");
-  if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
-    gCSSProperties["filter"].invalid_values.push("drop-shadow(unset, 2px 2px)", "drop-shadow(2px 2px, unset)");
-  }
-  if (IsCSSPropertyPrefEnabled("layout.css.prefixes.gradients")) {
-    gCSSProperties["background-image"].invalid_values.push(
-      "-moz-linear-gradient(unset, 10px 10px, from(blue))",
-      "-moz-linear-gradient(unset, 10px 10px, blue 0)",
-      "-moz-repeating-linear-gradient(unset, 10px 10px, blue 0)",
-    );
-  }
+if (IsCSSPropertyPrefEnabled("layout.css.filters.enabled")) {
+  gCSSProperties["filter"].invalid_values.push("drop-shadow(unset, 2px 2px)", "drop-shadow(2px 2px, unset)");
+}
+
+if (IsCSSPropertyPrefEnabled("layout.css.prefixes.gradients")) {
+  gCSSProperties["background-image"].invalid_values.push(
+    "-moz-linear-gradient(unset, 10px 10px, from(blue))",
+    "-moz-linear-gradient(unset, 10px 10px, blue 0)",
+    "-moz-repeating-linear-gradient(unset, 10px 10px, blue 0)",
+  );
 }
 
 if (IsCSSPropertyPrefEnabled("layout.css.scrollbar-colors.enabled")) {
   gCSSProperties["scrollbar-face-color"] = {
     domProp: "scrollbarFaceColor",
diff --git a/layout/style/test/test_all_shorthand.html b/layout/style/test/test_all_shorthand.html
--- a/layout/style/test/test_all_shorthand.html
+++ b/layout/style/test/test_all_shorthand.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <title>Test the 'all' shorthand property</title>
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <script src="property_database.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css">
-<body>
+<body onload="runTest()">
 
 <style id="stylesheet">
 #parent { }
 #child { }
 #child { }
@@ -152,7 +152,6 @@
 
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
-SpecialPowers.pushPrefEnv({ "set": [["layout.css.unset-value.enabled", true]] }, runTest);
 </script>
diff --git a/layout/style/test/test_bug74880.html b/layout/style/test/test_bug74880.html
--- a/layout/style/test/test_bug74880.html
+++ b/layout/style/test/test_bug74880.html
@@ -33,19 +33,13 @@
   [ "border-left-color", "border-right-color", "border-inline-start-color", "border-inline-end-color" ],
   [ "border-left-style", "border-right-style", "border-inline-start-style", "border-inline-end-style" ],
   [ "border-left-width", "border-right-width", "border-inline-start-width", "border-inline-end-width" ],
 ];
 
-var gLengthValues = [ "inherit", "initial", "2px", "1em" ];
-var gColorValues = [ "inherit", "initial", "currentColor", "green" ];
-var gStyleValues = [ "inherit", "initial", "double", "dashed" ];
-
-if (SpecialPowers.getBoolPref("layout.css.unset-value.enabled")) {
-  gLengthValues.push("unset");
-  gColorValues.push("unset");
-  gStyleValues.push("unset");
-}
+var gLengthValues = [ "inherit", "initial", "2px", "1em", "unset" ];
+var gColorValues = [ "inherit", "initial", "currentColor", "green", "unset" ];
+var gStyleValues = [ "inherit", "initial", "double", "dashed", "unset" ];
 
 function values_for(set) {
   var values;
   if (set[0].match(/style$/))
     values = gStyleValues;
diff --git a/layout/style/test/test_font_family_parsing.html b/layout/style/test/test_font_family_parsing.html
--- a/layout/style/test/test_font_family_parsing.html
+++ b/layout/style/test/test_font_family_parsing.html
@@ -122,25 +122,21 @@
   { namelist: "initial simple", single: true },
   { namelist: "inherit simple", single: true },
   { namelist: "normal simple", single: true },
   { namelist: "caption", single: true }, // these are keywords for the 'font' property but only when in the first position
   { namelist: "icon", single: true },
-  { namelist: "menu", single: true }
+  { namelist: "menu", single: true },
+  { namelist: "unset", invalid: true, fontonly: true, single: true },
+  { namelist: "unset, simple", invalid: true },
+  { namelist: "simple, unset", invalid: true },
+  { namelist: "simple, unset bongo" },
+  { namelist: "simple, bongo unset" },
+  { namelist: "simple unset", single: true },
+  { namelist: "unset simple", single: true }
 
 ];
 
-if (window.SpecialPowers && SpecialPowers.getBoolPref("layout.css.unset-value.enabled")) {
-  testFontFamilyLists.push(
-    { namelist: "unset", invalid: true, fontonly: true, single: true },
-    { namelist: "unset, simple", invalid: true },
-    { namelist: "simple, unset", invalid: true },
-    { namelist: "simple, unset bongo" },
-    { namelist: "simple, bongo unset" },
-    { namelist: "simple unset", single: true },
-    { namelist: "unset simple", single: true });
-}
-
 var gTest = 0;
 
 /* strip out just values */
 function extractDecl(rule)
 {
diff --git a/layout/style/test/test_garbage_at_end_of_declarations.html b/layout/style/test/test_garbage_at_end_of_declarations.html
--- a/layout/style/test/test_garbage_at_end_of_declarations.html
+++ b/layout/style/test/test_garbage_at_end_of_declarations.html
@@ -34,11 +34,10 @@
  * loop in the patch for bug 435441.
  */
 
 var gElement = document.getElementById("testnode");
 var gDeclaration = gElement.style;
-var gUnsetValueEnabled = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
 
 /*
  * This lists properties where garbage identifiers are allowed at the
  * end, with values in property_database.js that are exceptions that
  * should be tested anyway.  "inherit", "initial" and "unset" are always
@@ -118,12 +117,11 @@
   }
 
   var idx;
   test_value("inherit");
   test_value("initial");
-  if (gUnsetValueEnabled)
-    test_value("unset");
+  test_value("unset");
   for (idx in info.initial_values)
     test_value(info.initial_values[idx]);
   for (idx in info.other_values)
     test_value(info.other_values[idx]);
 }
diff --git a/layout/style/test/test_inherit_computation.html b/layout/style/test/test_inherit_computation.html
--- a/layout/style/test/test_inherit_computation.html
+++ b/layout/style/test/test_inherit_computation.html
@@ -35,12 +35,10 @@
 var gChildRule2 = gStyleSheet.cssRules[gStyleSheet.insertRule("#nchild, #fchild {}", gStyleSheet.cssRules.length)];
 var gChildRule3 = gStyleSheet.cssRules[gStyleSheet.insertRule("#nchild.allother, #fchild.allother {}", gStyleSheet.cssRules.length)];
 var gChildRuleTop = gStyleSheet.cssRules[gStyleSheet.insertRule("#nchild, #nchild.allother, #fchild, #fchild.allother {}", gStyleSheet.cssRules.length)];
 var gParentRuleTop = gStyleSheet.cssRules[gStyleSheet.insertRule("#nparent, #fparent {}", gStyleSheet.cssRules.length)];
 
-var gTestUnset = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
-
 function get_computed_value_node(node, property)
 {
   var cs = getComputedStyle(node, "");
   return get_computed_value(cs, property);
 }
@@ -48,11 +46,11 @@
 function test_property(property)
 {
   var info = gCSSProperties[property];
 
   var keywords = ["inherit"];
-  if (info.inherited && gTestUnset)
+  if (info.inherited)
     keywords.push("unset");
 
   keywords.forEach(function(keyword) {
     if ("prerequisites" in info) {
       var prereqs = info.prerequisites;
diff --git a/layout/style/test/test_inherit_storage.html b/layout/style/test/test_inherit_storage.html
--- a/layout/style/test/test_inherit_storage.html
+++ b/layout/style/test/test_inherit_storage.html
@@ -13,28 +13,26 @@
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=375363">Mozilla Bug 375363</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 <div id="testnode"></div>
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for parsing, storage, and serialization of CSS 'inherit' on all
     properties and 'unset' on inherited properties **/
 
 var gDeclaration = document.getElementById("testnode").style;
 
-var gTestUnset = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
-
 function test_property(property)
 {
   var info = gCSSProperties[property];
 
   var keywords = ["inherit"];
-  if (info.inherited && gTestUnset)
+  if (info.inherited)
     keywords.push("unset");
 
   keywords.forEach(function(keyword) {
     function check_initial(sproperty) {
       var sinfo = gCSSProperties[sproperty];
diff --git a/layout/style/test/test_initial_computation.html b/layout/style/test/test_initial_computation.html
--- a/layout/style/test/test_initial_computation.html
+++ b/layout/style/test/test_initial_computation.html
@@ -29,11 +29,11 @@
 </p>
 <div id="content" style="display: none">
 
 <div><span id="elementn"></span></div>
 
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for computation of CSS 'initial' on all properties and 'unset' on
@@ -56,12 +56,10 @@
 var gInitialValuesN;
 var gInitialValuesF;
 var gInitialPrereqsRuleN;
 var gInitialPrereqsRuleF;
 
-var gTestUnset = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
-
 function setup_initial_values(id, ivalprop, prereqprop) {
   var iframe = document.getElementById(id);
   window[ivalprop] = iframe.contentWindow.getComputedStyle(
                        iframe.contentDocument.documentElement.firstChild);
   var sheet = iframe.contentDocument.styleSheets[0];
@@ -74,11 +72,11 @@
 function test_property(property)
 {
   var info = gCSSProperties[property];
 
   var keywords = ["initial"];
-  if (!info.inherited && gTestUnset)
+  if (!info.inherited)
     keywords.push("unset");
 
   keywords.forEach(function(keyword) {
     if ("prerequisites" in info) {
       var prereqs = info.prerequisites;
diff --git a/layout/style/test/test_initial_storage.html b/layout/style/test/test_initial_storage.html
--- a/layout/style/test/test_initial_storage.html
+++ b/layout/style/test/test_initial_storage.html
@@ -13,22 +13,20 @@
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=375363">Mozilla Bug 375363</a>
 <p id="display"></p>
 <div id="content" style="display: none">
 
 <div id="testnode"></div>
-  
+
 </div>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for parsing, storage, and serialization of CSS 'initial' on all
     properties and 'unset' on reset properties **/
 
 var gDeclaration = document.getElementById("testnode").style;
 
-var gTestUnset = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
-
 /**
  * Checks that the passed-in property-value (returned by getPropertyValue) is
  * consistent with the DOM accessors that we know about for the given sproperty.
  */
 function check_consistency(sproperty, valFromGetPropertyValue, messagePrefix)
@@ -51,11 +49,11 @@
 function test_property(property)
 {
   var info = gCSSProperties[property];
 
   var keywords = ["initial"];
-  if (!info.inherited && gTestUnset)
+  if (!info.inherited)
     keywords.push("unset");
 
   keywords.forEach(function(keyword) {
     function check_initial(sproperty) {
       var val = gDeclaration.getPropertyValue(sproperty);
diff --git a/layout/style/test/test_value_cloning.html b/layout/style/test/test_value_cloning.html
--- a/layout/style/test/test_value_cloning.html
+++ b/layout/style/test/test_value_cloning.html
@@ -13,11 +13,10 @@
 <p id="display"><iframe id="iframe" src="about:blank"></iframe></p>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 /** Test for cloning of CSS property values (including 'inherit', 'initial' and 'unset') **/
-var gTestUnset = SpecialPowers.getBoolPref("layout.css.unset-value.enabled");
 var test_queue = [];
 var iframe = document.getElementById("iframe");
 
 SimpleTest.waitForExplicitFinish();
 
@@ -27,19 +26,17 @@
   test_queue.push({ prop: prop, value: "inherit",
                     inherited_value: info.initial_values[0] });
   test_queue.push({ prop: prop, value: "inherit",
                     inherited_value: info.other_values[0] });
   test_queue.push({ prop: prop, value: "initial" });
-  if (gTestUnset) {
-    if (info.inherited) {
-      test_queue.push({ prop: prop, value: "unset",
-                        inherited_value: info.initial_values[0] });
-      test_queue.push({ prop: prop, value: "unset",
-                        inherited_value: info.other_values[0] });
-    } else {
-      test_queue.push({ prop: prop, value: "unset" });
-    }
+  if (info.inherited) {
+    test_queue.push({ prop: prop, value: "unset",
+                      inherited_value: info.initial_values[0] });
+    test_queue.push({ prop: prop, value: "unset",
+                      inherited_value: info.other_values[0] });
+  } else {
+    test_queue.push({ prop: prop, value: "unset" });
   }
   for (var idx in info.initial_values) {
     test_queue.push({ prop: prop, value: info.initial_values[idx] });
   }
   for (var idx in info.other_values) {
diff --git a/layout/xul/BoxObject.cpp b/layout/xul/BoxObject.cpp
--- a/layout/xul/BoxObject.cpp
+++ b/layout/xul/BoxObject.cpp
@@ -123,11 +123,11 @@
 {
   if (!mContent) {
     return nullptr;
   }
 
-  nsCOMPtr<nsIDocument> doc = mContent->GetUncomposedDoc();
+  nsCOMPtr<nsIDocument> doc = mContent->GetComposedDoc();
   if (!doc) {
     return nullptr;
   }
 
   if (aFlushLayout) {
diff --git a/layout/xul/ScrollBoxObject.h b/layout/xul/ScrollBoxObject.h
--- a/layout/xul/ScrollBoxObject.h
+++ b/layout/xul/ScrollBoxObject.h
@@ -25,33 +25,18 @@
 
   virtual nsIScrollableFrame* GetScrollFrame();
 
   void ScrollTo(int32_t x, int32_t y, ErrorResult& aRv);
   void ScrollBy(int32_t dx, int32_t dy, ErrorResult& aRv);
-  void ScrollByLine(int32_t dlines, ErrorResult& aRv);
   void ScrollByIndex(int32_t dindexes, ErrorResult& aRv);
-  void ScrollToLine(int32_t line, ErrorResult& aRv);
   void ScrollToElement(Element& child, ErrorResult& aRv);
-  void ScrollToIndex(int32_t index, ErrorResult& aRv);
   int32_t GetPositionX(ErrorResult& aRv);
   int32_t GetPositionY(ErrorResult& aRv);
   int32_t GetScrolledWidth(ErrorResult& aRv);
   int32_t GetScrolledHeight(ErrorResult& aRv);
   void EnsureElementIsVisible(Element& child, ErrorResult& aRv);
-  void EnsureIndexIsVisible(int32_t index, ErrorResult& aRv);
-  void EnsureLineIsVisible(int32_t line, ErrorResult& aRv);
 
-  // Deprecated APIs from old IDL
-  void GetPosition(JSContext* cx,
-                   JS::Handle<JSObject*> x,
-                   JS::Handle<JSObject*> y,
-                   ErrorResult& aRv);
-
-  void GetScrolledSize(JSContext* cx,
-                       JS::Handle<JSObject*> width,
-                       JS::Handle<JSObject*> height,
-                       ErrorResult& aRv);
 
 protected:
   void GetScrolledSize(nsRect& aRect, ErrorResult& aRv);
   void GetPosition(CSSIntPoint& aPos, ErrorResult& aRv);
 
diff --git a/layout/xul/ScrollBoxObject.cpp b/layout/xul/ScrollBoxObject.cpp
--- a/layout/xul/ScrollBoxObject.cpp
+++ b/layout/xul/ScrollBoxObject.cpp
@@ -57,22 +57,10 @@
   }
 
   ScrollTo(pt.x + dx, pt.y + dy, aRv);
 }
 
-void ScrollBoxObject::ScrollByLine(int32_t dlines, ErrorResult& aRv)
-{
-  nsIScrollableFrame* sf = GetScrollFrame();
-  if (!sf) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  sf->ScrollBy(nsIntPoint(0, dlines), nsIScrollableFrame::LINES,
-               nsIScrollableFrame::SMOOTH);
-}
-
 // XUL <scrollbox> elements have a single box child element.
 // Get a pointer to that box.
 // Note that now that the <scrollbox> is just a regular box
 // with 'overflow:hidden', the boxobject's frame is an nsXULScrollFrame,
 // the <scrollbox>'s box frame is the scrollframe's "scrolled frame", and
@@ -210,24 +198,10 @@
        nsRect range(cp.x, rect.y - csspixel, 0, csspixel);
        sf->ScrollTo(nsPoint(cp.x, rect.y), nsIScrollableFrame::INSTANT, &range);
    }
 }
 
-void ScrollBoxObject::ScrollToLine(int32_t line, ErrorResult& aRv)
-{
-  nsIScrollableFrame* sf = GetScrollFrame();
-  if (!sf) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  nscoord y = sf->GetLineScrollAmount().height * line;
-  nsRect range(0, y - nsPresContext::CSSPixelsToAppUnits(1),
-               0, nsPresContext::CSSPixelsToAppUnits(1));
-  sf->ScrollTo(nsPoint(0, y), nsIScrollableFrame::INSTANT, &range);
-}
-
 void ScrollBoxObject::ScrollToElement(Element& child, ErrorResult& aRv)
 {
   nsCOMPtr<nsIPresShell> shell = GetPresShell(false);
   if (!shell) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
@@ -243,15 +217,10 @@
                                  nsIPresShell::SCROLL_ALWAYS),
                                nsIPresShell::SCROLL_FIRST_ANCESTOR_ONLY |
                                nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 }
 
-void ScrollBoxObject::ScrollToIndex(int32_t index, ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 int32_t ScrollBoxObject::GetPositionX(ErrorResult& aRv)
 {
   CSSIntPoint pt;
   GetPosition(pt, aRv);
   return pt.x;
@@ -302,50 +271,10 @@
     aRect = scrolledBox->GetRect();
     aRect.width  = nsPresContext::AppUnitsToIntCSSPixels(aRect.width);
     aRect.height = nsPresContext::AppUnitsToIntCSSPixels(aRect.height);
 }
 
-void ScrollBoxObject::GetPosition(JSContext* cx,
-                                  JS::Handle<JSObject*> x,
-                                  JS::Handle<JSObject*> y,
-                                  ErrorResult& aRv)
-{
-  CSSIntPoint pt;
-  GetPosition(pt, aRv);
-  JS::Rooted<JS::Value> v(cx);
-  if (!ToJSValue(cx, pt.x, &v) ||
-      !JS_SetProperty(cx, x, "value", v)) {
-    aRv.Throw(NS_ERROR_XPC_CANT_SET_OUT_VAL);
-    return;
-  }
-  if (!ToJSValue(cx, pt.y, &v) ||
-      !JS_SetProperty(cx, y, "value", v)) {
-    aRv.Throw(NS_ERROR_XPC_CANT_SET_OUT_VAL);
-    return;
-  }
-}
-
-void ScrollBoxObject::GetScrolledSize(JSContext* cx,
-                                      JS::Handle<JSObject*> width,
-                                      JS::Handle<JSObject*> height,
-                                      ErrorResult& aRv)
-{
-  nsRect rect;
-  GetScrolledSize(rect, aRv);
-  JS::Rooted<JS::Value> v(cx);
-  if (!ToJSValue(cx, rect.width, &v) ||
-      !JS_SetProperty(cx, width, "value", v)) {
-    aRv.Throw(NS_ERROR_XPC_CANT_SET_OUT_VAL);
-    return;
-  }
-  if (!ToJSValue(cx, rect.height, &v) ||
-      !JS_SetProperty(cx, height, "value", v)) {
-    aRv.Throw(NS_ERROR_XPC_CANT_SET_OUT_VAL);
-    return;
-  }
-}
-
 void ScrollBoxObject::EnsureElementIsVisible(Element& child, ErrorResult& aRv)
 {
     nsCOMPtr<nsIPresShell> shell = GetPresShell(false);
     if (!shell) {
       aRv.Throw(NS_ERROR_UNEXPECTED);
@@ -356,29 +285,16 @@
                                  nsIPresShell::ScrollAxis(),
                                  nsIPresShell::ScrollAxis(),
                                  nsIPresShell::SCROLL_FIRST_ANCESTOR_ONLY |
                                  nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
 }
-
-void ScrollBoxObject::EnsureIndexIsVisible(int32_t index, ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
-void ScrollBoxObject::EnsureLineIsVisible(int32_t line, ErrorResult& aRv)
-{
-  aRv.Throw(NS_ERROR_NOT_IMPLEMENTED);
-}
-
 } // namespace dom
 } // namespace mozilla
 
-// Creation Routine ///////////////////////////////////////////////////////////////////////
-
 using namespace mozilla::dom;
 
 nsresult
 NS_NewScrollBoxObject(nsIBoxObject** aResult)
 {
-  NS_ADDREF(*aResult = new ScrollBoxObject());
-  return NS_OK;
+    NS_ADDREF(*aResult = new ScrollBoxObject());
+    return NS_OK;
 }
diff --git a/layout/xul/nsXULTooltipListener.cpp b/layout/xul/nsXULTooltipListener.cpp
--- a/layout/xul/nsXULTooltipListener.cpp
+++ b/layout/xul/nsXULTooltipListener.cpp
@@ -105,11 +105,11 @@
     nsCOMPtr<nsINode> targetNode = do_QueryInterface(aEvent->GetTarget());
 
     nsXULPopupManager* pm = nsXULPopupManager::GetInstance();
     if (pm) {
       nsCOMPtr<nsINode> tooltipNode =
-        pm->GetLastTriggerTooltipNode(currentTooltip->GetUncomposedDoc());
+        pm->GetLastTriggerTooltipNode(currentTooltip->GetComposedDoc());
       if (tooltipNode == targetNode) {
         // if the target node is the current tooltip target node, the mouse
         // left the node the tooltip appeared on, so close the tooltip.
         HideTooltip();
         // reset special tree tracking
@@ -602,22 +602,25 @@
   if (tooltipId.EqualsLiteral("_child")) {
     GetImmediateChild(aTarget, nsGkAtoms::tooltip, aTooltip);
     return NS_OK;
   }
 
-  if (!tooltipId.IsEmpty() && aTarget->IsInUncomposedDoc()) {
+  if (!tooltipId.IsEmpty()) {
+    DocumentOrShadowRoot* documentOrShadowRoot =
+      aTarget->GetUncomposedDocOrConnectedShadowRoot();
     // tooltip must be an id, use getElementById to find it
-    //XXXsmaug If aTarget is in shadow dom, should we use
-    //         ShadowRoot::GetElementById()?
-    nsCOMPtr<nsIContent> tooltipEl = document->GetElementById(tooltipId);
+    if (documentOrShadowRoot) {
+      nsCOMPtr<nsIContent> tooltipEl =
+        documentOrShadowRoot->GetElementById(tooltipId);
 
-    if (tooltipEl) {
+      if (tooltipEl) {
 #ifdef MOZ_XUL
-      mNeedTitletip = false;
+        mNeedTitletip = false;
 #endif
-      tooltipEl.forget(aTooltip);
-      return NS_OK;
+        tooltipEl.forget(aTooltip);
+        return NS_OK;
+      }
     }
   }
 
 #ifdef MOZ_XUL
   // titletips should just use the default tooltip
diff --git a/media/webrtc/signaling/gtest/sdp_unittests.cpp b/media/webrtc/signaling/gtest/sdp_unittests.cpp
--- a/media/webrtc/signaling/gtest/sdp_unittests.cpp
+++ b/media/webrtc/signaling/gtest/sdp_unittests.cpp
@@ -3735,11 +3735,10 @@
   ParseSdp(kMalformedImageattr, false);
   ASSERT_NE("", GetParseErrors());
 }
 
 TEST_P(NewSdpTest, ParseInvalidSimulcastNoSuchSendRid) {
-  SKIP_TEST_WITH_RUST_PARSER; // See Bug 1432931
   ParseSdp("v=0" CRLF
            "o=- 4294967296 2 IN IP4 127.0.0.1" CRLF
            "s=SIP Call" CRLF
            "c=IN IP4 198.51.100.7" CRLF
            "b=CT:5000" CRLF
diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -10,11 +10,10 @@
 #include <inttypes.h>
 #include <math.h>
 
 #include "AudioSegment.h"
 #include "AudioConverter.h"
-#include "AutoTaskQueue.h"
 #include "CSFLog.h"
 #include "DOMMediaStream.h"
 #include "ImageContainer.h"
 #include "ImageTypes.h"
 #include "Layers.h"
@@ -33,10 +32,11 @@
 #include "libyuv/convert.h"
 #include "mozilla/PeerIdentity.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/SharedThreadPool.h"
 #include "mozilla/Sprintf.h"
+#include "mozilla/TaskQueue.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/dom/RTCStatsReportBinding.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/gfx/Types.h"
@@ -114,12 +114,12 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameConverter)
 
   VideoFrameConverter()
     : mLength(0)
     , mTaskQueue(
-        new AutoTaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
-                          "VideoFrameConverter"))
+        new TaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
+                      "VideoFrameConverter"))
     , mBufferPool(false, CONVERTER_BUFFER_POOL_SIZE)
     , mLastImage(-1) // -1 is not a guaranteed invalid serial. See bug 1262134.
 #ifdef DEBUG
     , mThrottleCount(0)
     , mThrottleRecord(0)
@@ -456,11 +456,11 @@
                              webrtc::kVideoRotation_0);
     VideoFrameConverted(frame);
   }
 
   Atomic<int32_t, Relaxed> mLength;
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   webrtc::I420BufferPool mBufferPool;
 
   // Written and read from the queueing thread (normally MSG).
   int32_t mLastImage;       // serial number of last Image
   TimeStamp mLastFrameSent; // The time we sent the last frame.
@@ -484,12 +484,12 @@
   NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AudioProxyThread)
 
   explicit AudioProxyThread(AudioSessionConduit* aConduit)
     : mConduit(aConduit)
     , mTaskQueue(
-        new AutoTaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
-                          "AudioProxy"))
+        new TaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
+                      "AudioProxy"))
     , mAudioConverter(nullptr)
   {
     MOZ_ASSERT(mConduit);
     MOZ_COUNT_CTOR(AudioProxyThread);
   }
@@ -662,11 +662,11 @@
                                       mConduit.forget());
     MOZ_COUNT_DTOR(AudioProxyThread);
   }
 
   RefPtr<AudioSessionConduit> mConduit;
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   // Only accessed on mTaskQueue
   UniquePtr<AudioPacketizer<int16_t, int16_t>> mPacketizer;
   // A buffer to hold a single packet of audio.
   UniquePtr<int16_t[]> mPacket;
   nsTArray<int16_t> mInterleavedAudio;
@@ -1976,12 +1976,12 @@
     , mRate(static_cast<AudioSessionConduit*>(mConduit.get())
                 ->IsSamplingFreqSupported(mSource->GraphRate())
               ? mSource->GraphRate()
               : WEBRTC_MAX_SAMPLE_RATE)
     , mTaskQueue(
-        new AutoTaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
-                          "AudioPipelineListener"))
+        new TaskQueue(GetMediaThreadPool(MediaThreadType::WEBRTC_DECODER),
+                      "AudioPipelineListener"))
     , mLastLog(0)
   {
     AddTrackToSource(mRate);
   }
 
@@ -2099,11 +2099,11 @@
     }
   }
 
   RefPtr<MediaSessionConduit> mConduit;
   const TrackRate mRate;
-  const RefPtr<AutoTaskQueue> mTaskQueue;
+  const RefPtr<TaskQueue> mTaskQueue;
   // Graph's current sampling rate
   TrackTicks mLastLog = 0; // mPlayedTicks when we last logged
 };
 
 MediaPipelineReceiveAudio::MediaPipelineReceiveAudio(
diff --git a/media/webrtc/signaling/src/sdp/rsdparsa/src/lib.rs b/media/webrtc/signaling/src/sdp/rsdparsa/src/lib.rs
--- a/media/webrtc/signaling/src/sdp/rsdparsa/src/lib.rs
+++ b/media/webrtc/signaling/src/sdp/rsdparsa/src/lib.rs
@@ -697,10 +697,16 @@
           match rid.direction {
               SdpSingleDirection::Recv => Some(rid.id.as_str()),
               _ => None,
           }
         }).collect();
+        let send_rids:Vec<&str> = rids.iter().filter_map(|rid| {
+          match rid.direction {
+              SdpSingleDirection::Send => Some(rid.id.as_str()),
+              _ => None,
+          }
+        }).collect();
 
 
         for rid_format in rids.iter().flat_map(|rid| &rid.formats) {
             match msection.get_formats() {
                 &SdpFormatList::Integers(ref int_fmt) => {
@@ -716,11 +722,10 @@
             }
         }
 
         if let Some(&SdpAttribute::Simulcast(ref simulcast)) =
                                             msection.get_attribute(SdpAttributeType::Simulcast) {
-            // This is already a closure as the next Bug 1432931 will require the same procedure
             let check_defined_rids = |simulcast_version_list: &Vec<SdpAttributeSimulcastVersion>,
                                       rid_ids: &[&str]| -> Result<(),SdpParserError> {
                 for simulcast_rid in simulcast_version_list.iter().flat_map(|x| &x.ids) {
                     if !rid_ids.contains(&simulcast_rid.id.as_str()) {
                         return Err(make_error(
@@ -728,11 +733,12 @@
                     }
                 }
                 Ok(())
             };
 
-            check_defined_rids(&simulcast.receive, &recv_rids)?
+            check_defined_rids(&simulcast.receive, &recv_rids)?;
+            check_defined_rids(&simulcast.send, &send_rids)?;
         }
     }
 
     Ok(())
 }
diff --git a/mobile/android/app/ua-update.json.in b/mobile/android/app/ua-update.json.in
--- a/mobile/android/app/ua-update.json.in
+++ b/mobile/android/app/ua-update.json.in
@@ -13,10 +13,8 @@
   "nhk.or.jp": "\\)\\s# AppleWebKit ",
   // bug 1177298, uniqlo.com
   "uniqlo.com": "\\)\\s#) Mobile Safari ",
   // bug 1338260, directv.com
   "directv.com": "Mozilla/5.0 (Linux; Android 6.0.1; SM-G920F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36",
-  // bug 1310951, m.canadiantire.ca
-  "m.canadiantire.ca": "Mozilla/5.0 (Linux; Android 6.0.1; SM-G920F Build/MMB29K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36",
   // bug 1385206, rakuten.co.jp
   "rakuten.co.jp": "Firefox.+$#"
 }
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashHandler.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashHandler.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashHandler.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashHandler.java
@@ -230,16 +230,15 @@
      */
     protected Bundle getCrashExtras(final Thread thread, final Throwable exc) {
         final Context context = getAppContext();
         final Bundle extras = new Bundle();
         final String pkgName = getAppPackageName();
-        final String processName = getProcessName();
 
-        extras.putString("ProductName", pkgName);
         extras.putLong("CrashTime", getCrashTime());
         extras.putLong("StartupTime", getStartupTime());
-        extras.putString("AndroidProcessName", getProcessName());
+        extras.putString("Android_ProcessName", getProcessName());
+        extras.putString("Android_PackageName", pkgName);
 
         if (context != null) {
             final PackageManager pkgMgr = context.getPackageManager();
             try {
                 final PackageInfo pkgInfo = pkgMgr.getPackageInfo(pkgName, 0);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashReporterService.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashReporterService.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashReporterService.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/CrashReporterService.java
@@ -326,10 +326,11 @@
             sendPart(os, boundary, "Android_Brand", Build.BRAND);
             sendPart(os, boundary, "Android_Device", Build.DEVICE);
             sendPart(os, boundary, "Android_Display", Build.DISPLAY);
             sendPart(os, boundary, "Android_Fingerprint", Build.FINGERPRINT);
             sendPart(os, boundary, "Android_CPU_ABI", Build.CPU_ABI);
+            sendPart(os, boundary, "Android_PackageName", getPackageName());
             try {
                 sendPart(os, boundary, "Android_CPU_ABI2", Build.CPU_ABI2);
                 sendPart(os, boundary, "Android_Hardware", Build.HARDWARE);
             } catch (Exception ex) {
                 Log.e(LOGTAG, "Exception while sending SDK version 8 keys", ex);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
@@ -87,12 +87,14 @@
             context.unbindService(this);
             return null;
         }
 
         public synchronized void unbind() {
-            final Context context = GeckoAppShell.getApplicationContext();
-            context.unbindService(this);
+            if (mChild != null) {
+                final Context context = GeckoAppShell.getApplicationContext();
+                context.unbindService(this);
+            }
 
             final int pid = getPid();
             if (pid != 0) {
                 Process.killProcess(pid);
                 waitForChildLocked();
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBackgroundThread.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBackgroundThread.java
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBackgroundThread.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/GeckoBackgroundThread.java
@@ -30,11 +30,11 @@
         setName(LOOPER_NAME);
         Looper.prepare();
 
         synchronized (GeckoBackgroundThread.class) {
             handler = new Handler();
-            GeckoBackgroundThread.class.notify();
+            GeckoBackgroundThread.class.notifyAll();
         }
 
         if (initialRunnable != null) {
             initialRunnable.run();
             initialRunnable = null;
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -807,18 +807,10 @@
   "media.av1.enabled",
    MediaAv1Enabled,
   RelaxedAtomicBool, true
 )
 
-// Flac
-// Use new MediaFormatReader architecture for plain ogg.
-VARCACHE_PREF(
-  "media.ogg.flac.enabled",
-   MediaOggFlacEnabled,
-  RelaxedAtomicBool, true
-)
-
 VARCACHE_PREF(
   "media.flac.enabled",
    MediaFlacEnabled,
   bool, true
 )
@@ -888,10 +880,46 @@
   "media.autoplay.block-event.enabled",
    MediaBlockEventEnabled,
   bool, false
 )
 
+VARCACHE_PREF(
+  "media.media-capabilities.enabled",
+   MediaCapabilitiesEnabled,
+  RelaxedAtomicBool, false
+)
+
+VARCACHE_PREF(
+  "media.benchmark.vp9.fps",
+   MediaBenchmarkVp9Fps,
+  RelaxedAtomicUint32, 0
+)
+
+VARCACHE_PREF(
+  "media.benchmark.vp9.threshold",
+   MediaBenchmarkVp9Threshold,
+  RelaxedAtomicUint32, 150
+)
+
+VARCACHE_PREF(
+  "media.benchmark.vp9.versioncheck",
+   MediaBenchmarkVp9Versioncheck,
+  RelaxedAtomicUint32, 0
+)
+
+VARCACHE_PREF(
+  "media.benchmark.frames",
+   MediaBenchmarkFrames,
+  RelaxedAtomicUint32, 300
+)
+
+VARCACHE_PREF(
+  "media.benchmark.timeout",
+   MediaBenchmarkTimeout,
+  RelaxedAtomicUint32, 1000
+)
+
 //---------------------------------------------------------------------------
 // Network prefs
 //---------------------------------------------------------------------------
 
 // Sub-resources HTTP-authentication:
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -545,10 +545,12 @@
 
 pref("media.benchmark.vp9.threshold", 150);
 pref("media.benchmark.frames", 300);
 pref("media.benchmark.timeout", 1000);
 
+pref("media.media-capabilities.enabled", false);
+
 #ifdef MOZ_WEBSPEECH
 pref("media.webspeech.synth.enabled", false);
 #endif
 #ifdef MOZ_WEBM_ENCODER
 pref("media.encoder.webm.enabled", true);
@@ -2949,13 +2951,10 @@
 pref("layout.css.osx-font-smoothing.enabled", true);
 #else
 pref("layout.css.osx-font-smoothing.enabled", false);
 #endif
 
-// Is support for the CSS-wide "unset" value enabled?
-pref("layout.css.unset-value.enabled", true);
-
 // Is support for CSS overflow-clip-box enabled for non-UA sheets?
 pref("layout.css.overflow-clip-box.enabled", false);
 
 // Is support for CSS contain enabled?
 pref("layout.css.contain.enabled", false);
@@ -4715,10 +4714,12 @@
 pref("webgl.angle.force-warp", false);
 pref("webgl.dxgl.enabled", true);
 pref("webgl.dxgl.needs-finish", false);
 #endif
 
+pref("dom.webgpu.enable", false);
+
 pref("gfx.offscreencanvas.enabled", false);
 
 // sendbuffer of 0 means use OS default, sendbuffer unset means use
 // gecko default which varies depending on windows version and is OS
 // default on non windows
diff --git a/mozglue/build/WindowsDllBlocklist.cpp b/mozglue/build/WindowsDllBlocklist.cpp
--- a/mozglue/build/WindowsDllBlocklist.cpp
+++ b/mozglue/build/WindowsDllBlocklist.cpp
@@ -88,18 +88,18 @@
   fclose(fp);
 }
 
 
 typedef MOZ_NORETURN_PTR void (__fastcall* BaseThreadInitThunk_func)(BOOL aIsInitialThread, void* aStartAddress, void* aThreadParam);
-static BaseThreadInitThunk_func stub_BaseThreadInitThunk = nullptr;
+static WindowsDllInterceptor::FuncHookType<BaseThreadInitThunk_func> stub_BaseThreadInitThunk;
 
 typedef NTSTATUS (NTAPI *LdrLoadDll_func) (PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileName, PHANDLE handle);
-static LdrLoadDll_func stub_LdrLoadDll;
+static WindowsDllInterceptor::FuncHookType<LdrLoadDll_func> stub_LdrLoadDll;
 
 #ifdef _M_AMD64
 typedef decltype(RtlInstallFunctionTableCallback)* RtlInstallFunctionTableCallback_func;
-static RtlInstallFunctionTableCallback_func stub_RtlInstallFunctionTableCallback;
+static WindowsDllInterceptor::FuncHookType<RtlInstallFunctionTableCallback_func> stub_RtlInstallFunctionTableCallback;
 
 extern uint8_t* sMsMpegJitCodeRegionStart;
 extern size_t sMsMpegJitCodeRegionSize;
 
 BOOLEAN WINAPI patched_RtlInstallFunctionTableCallback(DWORD64 TableIdentifier,
@@ -660,11 +660,12 @@
   ReentrancySentinel::InitializeStatics();
 
   // We specifically use a detour, because there are cases where external
   // code also tries to hook LdrLoadDll, and doesn't know how to relocate our
   // nop space patches. (Bug 951827)
-  bool ok = NtDllIntercept.AddDetour("LdrLoadDll", reinterpret_cast<intptr_t>(patched_LdrLoadDll), (void**) &stub_LdrLoadDll);
+  bool ok = stub_LdrLoadDll.SetDetour(NtDllIntercept, "LdrLoadDll",
+                                      &patched_LdrLoadDll);
 
   if (!ok) {
     sBlocklistInitFailed = true;
 #ifdef DEBUG
     printf_stderr("LdrLoadDll hook failed, no dll blocklisting active\n");
@@ -681,22 +682,22 @@
   Kernel32Intercept.Init("kernel32.dll");
 
 #ifdef _M_AMD64
   if (!IsWin8OrLater()) {
     // The crash that this hook works around is only seen on Win7.
-    Kernel32Intercept.AddHook("RtlInstallFunctionTableCallback",
-                              reinterpret_cast<intptr_t>(patched_RtlInstallFunctionTableCallback),
-                              (void**)&stub_RtlInstallFunctionTableCallback);
+    stub_RtlInstallFunctionTableCallback.Set(Kernel32Intercept,
+                                             "RtlInstallFunctionTableCallback",
+                                             &patched_RtlInstallFunctionTableCallback);
   }
 #endif
 
   // Bug 1361410: WRusr.dll will overwrite our hook and cause a crash.
   // Workaround: If we detect WRusr.dll, don't hook.
   if (!GetModuleHandleW(L"WRusr.dll")) {
-    if(!Kernel32Intercept.AddDetour("BaseThreadInitThunk",
-                                    reinterpret_cast<intptr_t>(patched_BaseThreadInitThunk),
-                                    (void**) &stub_BaseThreadInitThunk)) {
+    if (!stub_BaseThreadInitThunk.SetDetour(Kernel32Intercept,
+                                            "BaseThreadInitThunk",
+                                            &patched_BaseThreadInitThunk)) {
 #ifdef DEBUG
     printf_stderr("BaseThreadInitThunk hook failed\n");
 #endif
     }
   }
diff --git a/mozglue/misc/interceptor/PatcherDetour.h b/mozglue/misc/interceptor/PatcherDetour.h
--- a/mozglue/misc/interceptor/PatcherDetour.h
+++ b/mozglue/misc/interceptor/PatcherDetour.h
@@ -40,11 +40,11 @@
   WindowsDllDetourPatcher& operator=(const WindowsDllDetourPatcher&) = delete;
   WindowsDllDetourPatcher& operator=(WindowsDllDetourPatcher&&) = delete;
 
   void Clear()
   {
-    if (!mVMPolicy.ShouldUnhookUponDestruction()) {
+    if (!this->mVMPolicy.ShouldUnhookUponDestruction()) {
       return;
     }
 
 #if defined(_M_IX86)
     size_t nBytes = 1 + sizeof(intptr_t);
@@ -52,11 +52,11 @@
     size_t nBytes = 2 + sizeof(intptr_t);
 #else
 #error "Unknown processor type"
 #endif
 
-    const auto& tramps = mVMPolicy.Items();
+    const auto& tramps = this->mVMPolicy.Items();
     for (auto&& tramp : tramps) {
       // First we read the pointer to the interceptor instance.
       Maybe<uintptr_t> instance = tramp.ReadEncodedPointer();
       if (!instance) {
         continue;
@@ -78,11 +78,11 @@
       Maybe<uintptr_t> interceptedFn = tramp.ReadEncodedPointer();
       if (!interceptedFn) {
         continue;
       }
 
-      WritableTargetFunction<MMPolicyT> origBytes(mVMPolicy,
+      WritableTargetFunction<MMPolicyT> origBytes(this->mVMPolicy,
                                                   interceptedFn.value(), nBytes);
       if (!origBytes) {
         continue;
       }
 
@@ -133,11 +133,11 @@
 #endif
 
       origBytes.Commit();
     }
 
-    mVMPolicy.Clear();
+    this->mVMPolicy.Clear();
   }
 
   void Init(int aNumHooks = 0)
   {
     if (Initialized()) {
@@ -146,24 +146,24 @@
 
     if (aNumHooks == 0) {
       // Win32 allocates VM addresses at a 64KiB granularity, so by default we
       // might as well utilize that entire 64KiB reservation instead of
       // artifically constraining ourselves to the page size.
-      aNumHooks = mVMPolicy.GetAllocGranularity() / kHookSize;
+      aNumHooks = this->mVMPolicy.GetAllocGranularity() / kHookSize;
     }
 
-    mVMPolicy.Reserve(aNumHooks);
+    this->mVMPolicy.Reserve(aNumHooks);
   }
 
   bool Initialized() const
   {
-    return !!mVMPolicy;
+    return !!this->mVMPolicy;
   }
 
   bool AddHook(FARPROC aTargetFn, intptr_t aHookDest, void** aOrigFunc)
   {
-    ReadOnlyTargetFunction<MMPolicyT> target(ResolveRedirectedAddress(aTargetFn));
+    ReadOnlyTargetFunction<MMPolicyT> target(this->ResolveRedirectedAddress(aTargetFn));
 
     CreateTrampoline(target, aHookDest, aOrigFunc);
     if (!*aOrigFunc) {
       return false;
     }
diff --git a/mozglue/misc/interceptor/VMSharingPolicies.h b/mozglue/misc/interceptor/VMSharingPolicies.h
--- a/mozglue/misc/interceptor/VMSharingPolicies.h
+++ b/mozglue/misc/interceptor/VMSharingPolicies.h
@@ -32,27 +32,28 @@
   }
 
   Trampoline<MMPolicy> GetNextTrampoline()
   {
     uint32_t offset = mNextChunkIndex * kChunkSize;
-    if (!MaybeCommitNextPage(offset, kChunkSize)) {
+    if (!this->MaybeCommitNextPage(offset, kChunkSize)) {
       return nullptr;
     }
 
 
-    Trampoline<MMPolicy> result(this, GetLocalView() + offset,
-                                GetRemoteView() + offset, kChunkSize);
+    Trampoline<MMPolicy> result(this, this->GetLocalView() + offset,
+                                this->GetRemoteView() + offset, kChunkSize);
     if (!!result) {
       ++mNextChunkIndex;
     }
 
     return std::move(result);
   }
 
   TrampolineCollection<MMPolicy> Items() const
   {
-    return TrampolineCollection<MMPolicy>(*this, GetLocalView(), GetRemoteView(),
+    return TrampolineCollection<MMPolicy>(*this, this->GetLocalView(),
+                                          this->GetRemoteView(),
                                           kChunkSize, mNextChunkIndex);
   }
 
   void Clear()
   {
diff --git a/mozglue/misc/nsWindowsDllInterceptor.h b/mozglue/misc/nsWindowsDllInterceptor.h
--- a/mozglue/misc/nsWindowsDllInterceptor.h
+++ b/mozglue/misc/nsWindowsDllInterceptor.h
@@ -6,14 +6,16 @@
 
 #ifndef NS_WINDOWS_DLL_INTERCEPTOR_H_
 #define NS_WINDOWS_DLL_INTERCEPTOR_H_
 
 #include "mozilla/Assertions.h"
+#include "mozilla/Attributes.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/CheckedInt.h"
 #include "mozilla/DebugOnly.h"
-#include "mozilla/NotNull.h"
+#include "mozilla/Move.h"
+#include "mozilla/Tuple.h"
 #include "mozilla/TypeTraits.h"
 #include "mozilla/Types.h"
 #include "mozilla/UniquePtr.h"
 #include "mozilla/Vector.h"
 #include "nsWindowsHelpers.h"
@@ -80,20 +82,159 @@
  */
 
 namespace mozilla {
 namespace interceptor {
 
+template <typename InterceptorT, typename FuncPtrT>
+class FuncHook final
+{
+  template <typename T>
+  struct OriginalFunctionPtrTraits;
+
+  template <typename R, typename... Args>
+  struct OriginalFunctionPtrTraits<R (*)(Args...)>
+  {
+    using ReturnType = R;
+  };
+
+#if defined(_M_IX86)
+  template <typename R, typename... Args>
+  struct OriginalFunctionPtrTraits<R (__stdcall*)(Args...)>
+  {
+    using ReturnType = R;
+  };
+
+  template <typename R, typename... Args>
+  struct OriginalFunctionPtrTraits<R (__fastcall*)(Args...)>
+  {
+    using ReturnType = R;
+  };
+#endif // defined(_M_IX86)
+
+public:
+  using ThisType = FuncHook<InterceptorT, FuncPtrT>;
+  using ReturnType = typename OriginalFunctionPtrTraits<FuncPtrT>::ReturnType;
+
+  constexpr FuncHook()
+    : mOrigFunc(nullptr)
+    , mInitOnce(INIT_ONCE_STATIC_INIT)
+  {
+  }
+
+  ~FuncHook() = default;
+
+  bool Set(InterceptorT& aInterceptor, const char* aName,
+           FuncPtrT aHookDest)
+  {
+    LPVOID addHookOk;
+    InitOnceContext ctx(this, &aInterceptor, aName, aHookDest, false);
+
+    return ::InitOnceExecuteOnce(&mInitOnce, &InitOnceCallback, &ctx,
+                                 &addHookOk) && addHookOk;
+  }
+
+  bool SetDetour(InterceptorT& aInterceptor, const char* aName,
+                 FuncPtrT aHookDest)
+  {
+    LPVOID addHookOk;
+    InitOnceContext ctx(this, &aInterceptor, aName, aHookDest, true);
+
+    return ::InitOnceExecuteOnce(&mInitOnce, &InitOnceCallback, &ctx,
+                                 &addHookOk) && addHookOk;
+  }
+
+  explicit operator bool() const
+  {
+    return !!mOrigFunc;
+  }
+
+  template <typename... ArgsType>
+  ReturnType operator()(ArgsType... aArgs) const
+  {
+    return mOrigFunc(std::forward<ArgsType>(aArgs)...);
+  }
+
+  FuncPtrT GetStub() const
+  {
+    return mOrigFunc;
+  }
+
+  // One-time init stuff cannot be moved or copied
+  FuncHook(const FuncHook&) = delete;
+  FuncHook(FuncHook&&) = delete;
+  FuncHook& operator=(const FuncHook&) = delete;
+  FuncHook& operator=(FuncHook&& aOther) = delete;
+
+private:
+  struct MOZ_RAII InitOnceContext final
+  {
+    InitOnceContext(ThisType* aHook, InterceptorT* aInterceptor,
+                    const char* aName, void* aHookDest, bool aForceDetour)
+      : mHook(aHook)
+      , mInterceptor(aInterceptor)
+      , mName(aName)
+      , mHookDest(aHookDest)
+      , mForceDetour(aForceDetour)
+    {
+    }
+
+    ThisType*     mHook;
+    InterceptorT* mInterceptor;
+    const char*   mName;
+    void*         mHookDest;
+    bool          mForceDetour;
+  };
+
+private:
+  bool Apply(InterceptorT* aInterceptor, const char* aName, void* aHookDest)
+  {
+    return aInterceptor->AddHook(aName, reinterpret_cast<intptr_t>(aHookDest),
+                                 reinterpret_cast<void**>(&mOrigFunc));
+  }
+
+  bool ApplyDetour(InterceptorT* aInterceptor, const char* aName,
+                   void* aHookDest)
+  {
+    return aInterceptor->AddDetour(aName, reinterpret_cast<intptr_t>(aHookDest),
+                                   reinterpret_cast<void**>(&mOrigFunc));
+  }
+
+  static BOOL CALLBACK
+  InitOnceCallback(PINIT_ONCE aInitOnce, PVOID aParam, PVOID* aOutContext)
+  {
+    MOZ_ASSERT(aOutContext);
+
+    bool result;
+    auto ctx = reinterpret_cast<InitOnceContext*>(aParam);
+    if (ctx->mForceDetour) {
+      result = ctx->mHook->ApplyDetour(ctx->mInterceptor, ctx->mName,
+                                       ctx->mHookDest);
+    } else {
+      result = ctx->mHook->Apply(ctx->mInterceptor, ctx->mName, ctx->mHookDest);
+    }
+
+    *aOutContext = result ? reinterpret_cast<PVOID>(1U << INIT_ONCE_CTX_RESERVED_BITS) : nullptr;
+    return TRUE;
+  }
+
+private:
+  FuncPtrT  mOrigFunc;
+  INIT_ONCE mInitOnce;
+};
+
 enum
 {
   kDefaultTrampolineSize = 128
 };
 
 template <typename VMPolicy =
             mozilla::interceptor::VMSharingPolicyShared<
               mozilla::interceptor::MMPolicyInProcess, kDefaultTrampolineSize>>
 class WindowsDllInterceptor final
 {
+  typedef WindowsDllInterceptor<VMPolicy> ThisType;
+
   interceptor::WindowsDllDetourPatcher<VMPolicy> mDetourPatcher;
 #if defined(_M_IX86)
   interceptor::WindowsDllNopSpacePatcher<typename VMPolicy::MMPolicyT> mNopSpacePatcher;
 #endif // defined(_M_IX86)
 
@@ -158,10 +299,11 @@
     mDetourPatcher.Clear();
 
     // NB: We intentionally leak mModule
   }
 
+private:
   /**
    * Hook/detour the method aName from the DLL we set in Init so that it calls
    * aHookDest instead.  Returns the original method pointer in aOrigFunc
    * and returns true if successful.
    *
@@ -217,21 +359,28 @@
     }
 
     return AddDetour(proc, aHookDest, aOrigFunc);
   }
 
-private:
   bool AddDetour(FARPROC aProc, intptr_t aHookDest, void** aOrigFunc)
   {
     MOZ_ASSERT(mModule && aProc);
 
     if (!mDetourPatcher.Initialized()) {
       mDetourPatcher.Init(mNHooks);
     }
 
     return mDetourPatcher.AddHook(aProc, aHookDest, aOrigFunc);
   }
+
+public:
+  template <typename FuncPtrT>
+  using FuncHookType = FuncHook<ThisType, FuncPtrT>;
+
+private:
+  template <typename InterceptorT, typename FuncPtrT>
+  friend class FuncHook;
 };
 
 } // namespace interceptor
 
 using WindowsDllInterceptor = interceptor::WindowsDllInterceptor<>;
diff --git a/mozglue/tests/interceptor/TestDllInterceptor.cpp b/mozglue/tests/interceptor/TestDllInterceptor.cpp
--- a/mozglue/tests/interceptor/TestDllInterceptor.cpp
+++ b/mozglue/tests/interceptor/TestDllInterceptor.cpp
@@ -8,14 +8,37 @@
 #define SECURITY_WIN32
 #include <security.h>
 #include <wininet.h>
 #include <schnlsp.h>
 
+#include "mozilla/TypeTraits.h"
+#include "mozilla/UniquePtr.h"
 #include "mozilla/WindowsVersion.h"
 #include "nsWindowsDllInterceptor.h"
 #include "nsWindowsHelpers.h"
 
+NTSTATUS NTAPI NtFlushBuffersFile(HANDLE, PIO_STATUS_BLOCK);
+NTSTATUS NTAPI NtReadFile(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
+                          PIO_STATUS_BLOCK, PVOID, ULONG,
+                          PLARGE_INTEGER, PULONG);
+NTSTATUS NTAPI NtReadFileScatter(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
+                                 PIO_STATUS_BLOCK, PFILE_SEGMENT_ELEMENT, ULONG,
+                                 PLARGE_INTEGER, PULONG);
+NTSTATUS NTAPI NtWriteFile(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
+                           PIO_STATUS_BLOCK, PVOID, ULONG,
+                           PLARGE_INTEGER, PULONG);
+NTSTATUS NTAPI NtWriteFileGather(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
+                                 PIO_STATUS_BLOCK, PFILE_SEGMENT_ELEMENT, ULONG,
+                                 PLARGE_INTEGER, PULONG);
+NTSTATUS NTAPI NtQueryFullAttributesFile(POBJECT_ATTRIBUTES, PVOID);
+NTSTATUS NTAPI LdrLoadDll(PWCHAR filePath, PULONG flags, PUNICODE_STRING moduleFileName, PHANDLE handle);
+NTSTATUS NTAPI LdrUnloadDll(HMODULE);
+// These pointers are disguised as PVOID to avoid pulling in obscure headers
+PVOID NTAPI LdrResolveDelayLoadedAPI(PVOID, PVOID, PVOID, PVOID, PVOID, ULONG);
+void CALLBACK ProcessCaretEvents(HWINEVENTHOOK, DWORD, HWND, LONG, LONG, DWORD, DWORD);
+void __fastcall BaseThreadInitThunk(BOOL aIsInitialThread, void* aStartAddress, void* aThreadParam);
+
 using namespace mozilla;
 
 struct payload {
   UINT64 a;
   UINT64 b;
@@ -36,84 +59,313 @@
   return p;
 }
 
 static bool patched_func_called = false;
 
-static payload (*orig_rotatePayload)(payload);
+static WindowsDllInterceptor::FuncHookType<decltype(&rotatePayload)>
+  orig_rotatePayload;
 
 static payload
 patched_rotatePayload(payload p)
 {
   patched_func_called = true;
   return orig_rotatePayload(p);
 }
 
-typedef bool(*HookTestFunc)(void*);
-bool CheckHook(HookTestFunc aHookTestFunc, void* aOrigFunc,
-               const char* aDllName, const char* aFuncName)
+// Invoke aFunc by taking aArg's contents and using them as aFunc's arguments
+template <typename CallableT, typename... Args, typename ArgTuple = Tuple<Args...>, size_t... Indices>
+decltype(auto) Apply(CallableT&& aFunc, ArgTuple&& aArgs, std::index_sequence<Indices...>)
+{
+  return std::forward<CallableT>(aFunc)(Get<Indices>(std::forward<ArgTuple>(aArgs))...);
+}
+
+template <typename CallableT>
+bool TestFunction(CallableT aFunc);
+
+#define DEFINE_TEST_FUNCTION(calling_convention) \
+  template <typename R, typename... Args, typename... TestArgs> \
+  bool TestFunction(WindowsDllInterceptor::FuncHookType<R (calling_convention *)(Args...)>&& aFunc, \
+                    bool (* aPred)(R), TestArgs... aArgs) \
+  { \
+    using FuncHookType = WindowsDllInterceptor::FuncHookType<R (calling_convention *)(Args...)>; \
+    using ArgTuple = Tuple<Args...>; \
+    using Indices = std::index_sequence_for<Args...>; \
+    ArgTuple fakeArgs{ std::forward<TestArgs>(aArgs)... }; \
+    return aPred(Apply(std::forward<FuncHookType>(aFunc), std::forward<ArgTuple>(fakeArgs), Indices())); \
+  } \
+  \
+  /* Specialization for functions returning void */ \
+  template <typename... Args, typename PredicateT, typename... TestArgs> \
+  bool TestFunction(WindowsDllInterceptor::FuncHookType<void (calling_convention *)(Args...)>&& aFunc, \
+                    PredicateT&& aPred, TestArgs... aArgs) \
+  { \
+    using FuncHookType = WindowsDllInterceptor::FuncHookType<void (calling_convention *)(Args...)>; \
+    using ArgTuple = Tuple<Args...>; \
+    using Indices = std::index_sequence_for<Args...>; \
+    ArgTuple fakeArgs{ std::forward<TestArgs>(aArgs)... }; \
+    Apply(std::forward<FuncHookType>(aFunc), std::forward<ArgTuple>(fakeArgs), Indices()); \
+    return true; \
+  }
+
+// C++11 allows empty arguments to macros. clang works just fine. MSVC does the
+// right thing, but it also throws up warning C4003.
+#if defined(_MSC_VER) && !defined(__clang__)
+DEFINE_TEST_FUNCTION(__cdecl)
+#else
+DEFINE_TEST_FUNCTION()
+#endif
+
+#ifdef _M_IX86
+DEFINE_TEST_FUNCTION(__stdcall)
+DEFINE_TEST_FUNCTION(__fastcall)
+#endif // _M_IX86
+
+// Test the hooked function against the supplied predicate
+template <typename OrigFuncT, typename PredicateT, typename... Args>
+bool CheckHook(WindowsDllInterceptor::FuncHookType<OrigFuncT> &aOrigFunc,
+               const char* aDllName, const char* aFuncName, PredicateT&& aPred,
+               Args... aArgs)
 {
-  if (aHookTestFunc(aOrigFunc)) {
+  if (TestFunction(std::forward<WindowsDllInterceptor::FuncHookType<OrigFuncT>>(aOrigFunc), std::forward<PredicateT>(aPred), std::forward<Args>(aArgs)...)) {
     printf("TEST-PASS | WindowsDllInterceptor | "
            "Executed hooked function %s from %s\n", aFuncName, aDllName);
     return true;
   }
   printf("TEST-FAILED | WindowsDllInterceptor | "
          "Failed to execute hooked function %s from %s\n", aFuncName, aDllName);
   return false;
 }
 
-template <size_t N>
-bool TestHook(HookTestFunc funcTester, const char (&dll)[N], const char *func)
+// Hook the function and optionally attempt calling it
+template <typename OrigFuncT, size_t N, typename PredicateT, typename... Args>
+bool TestHook(const char (&dll)[N], const char *func, PredicateT&& aPred, Args... aArgs)
 {
-  void *orig_func;
+  auto orig_func(mozilla::MakeUnique<WindowsDllInterceptor::FuncHookType<OrigFuncT>>());
+
   bool successful = false;
   {
     WindowsDllInterceptor TestIntercept;
     TestIntercept.Init(dll);
-    successful = TestIntercept.AddHook(func, 0, &orig_func);
+    successful = orig_func->Set(TestIntercept, func, nullptr);
   }
 
   if (successful) {
     printf("TEST-PASS | WindowsDllInterceptor | Could hook %s from %s\n", func, dll);
-    return CheckHook(funcTester, orig_func, dll, func);
+    if (!aPred) {
+      printf("TEST-SKIPPED | WindowsDllInterceptor | "
+             "Will not attempt to execute patched %s.\n", func);
+      return true;
+    }
+
+    return CheckHook(*orig_func, dll, func, std::forward<PredicateT>(aPred), std::forward<Args>(aArgs)...);
   } else {
     printf("TEST-UNEXPECTED-FAIL | WindowsDllInterceptor | Failed to hook %s from %s\n", func, dll);
     return false;
   }
 }
 
-template <size_t N>
-bool TestDetour(const char (&dll)[N], const char *func)
+// Detour the function and optionally attempt calling it
+template <typename OrigFuncT, size_t N, typename PredicateT>
+bool TestDetour(const char (&dll)[N], const char *func, PredicateT&& aPred)
 {
-  void *orig_func;
+  auto orig_func(mozilla::MakeUnique<WindowsDllInterceptor::FuncHookType<OrigFuncT>>());
+
   bool successful = false;
   {
     WindowsDllInterceptor TestIntercept;
     TestIntercept.Init(dll);
-    successful = TestIntercept.AddDetour(func, 0, &orig_func);
+    successful = orig_func->SetDetour(TestIntercept, func, nullptr);
   }
 
   if (successful) {
     printf("TEST-PASS | WindowsDllInterceptor | Could detour %s from %s\n", func, dll);
-    return true;
+    if (!aPred) {
+      printf("TEST-SKIPPED | WindowsDllInterceptor | "
+             "Will not attempt to execute patched %s.\n", func);
+      return true;
+    }
+
+    return CheckHook(*orig_func, dll, func, std::forward<PredicateT>(aPred));
   } else {
     printf("TEST-UNEXPECTED-FAIL | WindowsDllInterceptor | Failed to detour %s from %s\n", func, dll);
     return false;
   }
 }
 
-template <size_t N>
-bool MaybeTestHook(const bool cond, HookTestFunc funcTester, const char (&dll)[N], const char* func)
+// If a function pointer's type returns void*, this template converts that type
+// to return uintptr_t instead, for the purposes of predicates.
+template <typename FuncT>
+struct SubstituteForVoidPtr
+{
+  using Type = FuncT;
+};
+
+template <typename... Args>
+struct SubstituteForVoidPtr<void* (*)(Args...)>
+{
+  using Type = uintptr_t (*)(Args...);
+};
+
+#ifdef _M_IX86
+template <typename... Args>
+struct SubstituteForVoidPtr<void* (__stdcall*)(Args...)>
+{
+  using Type = uintptr_t (__stdcall*)(Args...);
+};
+
+template <typename... Args>
+struct SubstituteForVoidPtr<void* (__fastcall*)(Args...)>
+{
+  using Type = uintptr_t (__fastcall*)(Args...);
+};
+#endif // _M_IX86
+
+// Determines the function's return type
+template <typename FuncT>
+struct ReturnType;
+
+template <typename R, typename... Args>
+struct ReturnType<R (*)(Args...)>
+{
+  using Type = R;
+};
+
+#ifdef _M_IX86
+template <typename R, typename... Args>
+struct ReturnType<R (__stdcall*)(Args...)>
+{
+  using Type = R;
+};
+
+template <typename R, typename... Args>
+struct ReturnType<R (__fastcall*)(Args...)>
+{
+  using Type = R;
+};
+#endif // _M_IX86
+
+// Predicates that may be supplied during tests
+template <typename FuncT>
+struct Predicates
+{
+  using ArgType = typename ReturnType<FuncT>::Type;
+
+  template <ArgType CompVal>
+  static bool Equals(ArgType aValue)
+  {
+    return CompVal == aValue;
+  }
+
+  template <ArgType CompVal>
+  static bool NotEquals(ArgType aValue)
+  {
+    return CompVal != aValue;
+  }
+
+  template <ArgType CompVal>
+  static bool Ignore(ArgType aValue)
+  {
+    return true;
+  }
+};
+
+// Functions that return void should be ignored, so we specialize the
+// Ignore predicate for that case. Use nullptr as the value to compare against.
+template <typename... Args>
+struct Predicates<void (*)(Args...)>
+{
+  template <nullptr_t DummyVal>
+  static bool Ignore()
+  {
+    return true;
+  }
+};
+
+#ifdef _M_IX86
+template <typename... Args>
+struct Predicates<void (__stdcall*)(Args...)>
+{
+  template <nullptr_t DummyVal>
+  static bool Ignore()
+  {
+    return true;
+  }
+};
+
+template <typename... Args>
+struct Predicates<void (__fastcall*)(Args...)>
+{
+  template <nullptr_t DummyVal>
+  static bool Ignore()
+  {
+    return true;
+  }
+};
+#endif // _M_IX86
+
+// The standard test. Hook |func|, and then try executing it with all zero
+// arguments, using |pred| and |comp| to determine whether the call successfully
+// executed. In general, you want set pred and comp such that they return true
+// when the function is returning whatever value is expected with all-zero
+// arguments.
+//
+// Note: When |func| returns void, you must supply |Ignore| and |nullptr| as the
+// |pred| and |comp| arguments, respectively.
+#define TEST_HOOK(dll, func, pred, comp) \
+  TestHook<decltype(&func)>(#dll, #func, &Predicates<decltype(&func)>::pred<comp>)
+
+// We need to special-case functions that return INVALID_HANDLE_VALUE
+// (ie, CreateFile). Our template machinery for comparing values doesn't work
+// with integer constants passed as pointers (well, it works on MSVC, but not
+// clang, because that is not standard-compliant).
+#define TEST_HOOK_FOR_INVALID_HANDLE_VALUE(dll, func) \
+  TestHook<SubstituteForVoidPtr<decltype(&func)>::Type>(#dll, #func, &Predicates<SubstituteForVoidPtr<decltype(&func)>::Type>::Equals<uintptr_t(-1)>)
+
+// This variant allows you to explicitly supply arguments to the hooked function
+// during testing. You want to provide arguments that produce the conditions that
+// induce the function to return a value that is accepted by your predicate.
+#define TEST_HOOK_PARAMS(dll, func, pred, comp, ...) \
+  TestHook<decltype(&func)>(#dll, #func, &Predicates<decltype(&func)>::pred<comp>, __VA_ARGS__)
+
+// This is for cases when we want to hook |func|, but it is unsafe to attempt
+// to execute the function in the context of a test.
+#define TEST_HOOK_SKIP_EXEC(dll, func) \
+  TestHook<decltype(&func)>(#dll, #func, reinterpret_cast<bool (*)(typename ReturnType<decltype(&func)>::Type)>(NULL))
+
+// The following three variants are identical to the previous macros,
+// however the forcibly use a Detour on 32-bit Windows. On 64-bit Windows,
+// these macros are identical to their TEST_HOOK variants.
+#define TEST_DETOUR(dll, func, pred, comp) \
+  TestDetour<decltype(&func)>(#dll, #func, &Predicates<decltype(&func)>::pred<comp>)
+
+#define TEST_DETOUR_PARAMS(dll, func, pred, comp, ...) \
+  TestDetour<decltype(&func)>(#dll, #func, &Predicates<decltype(&func)>::pred<comp>, __VA_ARGS__)
+
+#define TEST_DETOUR_SKIP_EXEC(dll, func) \
+  TestDetour<decltype(&func)>(#dll, #func, reinterpret_cast<bool (*)(typename ReturnType<decltype(&func)>::Type)>(NULL))
+
+template <typename OrigFuncT, size_t N, typename PredicateT, typename... Args>
+bool MaybeTestHook(const bool cond, const char (&dll)[N], const char *func, PredicateT&& aPred, Args... aArgs)
 {
   if (!cond) {
     printf("TEST-SKIPPED | WindowsDllInterceptor | Skipped hook test for %s from %s\n", func, dll);
     return true;
   }
 
-  return TestHook(funcTester, dll, func);
+  return TestHook<OrigFuncT>(dll, func, std::forward<PredicateT>(aPred), std::forward<Args>(aArgs)...);
 }
 
+// Like TEST_HOOK, but the test is only executed when cond is true.
+#define MAYBE_TEST_HOOK(cond, dll, func, pred, comp) \
+  MaybeTestHook<decltype(&func)>(cond, #dll, #func, &Predicates<decltype(&func)>::pred<comp>)
+
+#define MAYBE_TEST_HOOK_PARAMS(cond, dll, func, pred, comp, ...) \
+  MaybeTestHook<decltype(&func)>(cond, #dll, #func, &Predicates<decltype(&func)>::pred<comp>, __VA_ARGS__)
+
+#define MAYBE_TEST_HOOK_SKIP_EXEC(cond, dll, func) \
+  MaybeTestHook<decltype(&func)>(cond, #dll, #func, reinterpret_cast<bool (*)(typename ReturnType<decltype(&func)>::Type)>(NULL))
+
 bool ShouldTestTipTsf()
 {
   if (!IsWin8OrLater()) {
     return false;
   }
@@ -145,459 +397,10 @@
 
   // Leak the module so that it's loaded for the interceptor test
   return true;
 }
 
-// These test the patched function returned by the DLL
-// interceptor.  They check that the patched assembler preamble does
-// something sane.  The parameter is a pointer to the patched function.
-bool TestGetWindowInfo(void* aFunc)
-{
-  auto patchedGetWindowInfo =
-    reinterpret_cast<decltype(&GetWindowInfo)>(aFunc);
-  return patchedGetWindowInfo(0, 0) == FALSE;
-}
-
-bool TestSetWindowLongPtr(void* aFunc)
-{
-  auto patchedSetWindowLongPtr =
-    reinterpret_cast<decltype(&SetWindowLongPtr)>(aFunc);
-  return patchedSetWindowLongPtr(0, 0, 0) == 0;
-}
-
-bool TestSetWindowLong(void* aFunc)
-{
-  auto patchedSetWindowLong =
-    reinterpret_cast<decltype(&SetWindowLong)>(aFunc);
-  return patchedSetWindowLong(0, 0, 0) == 0;
-}
-
-bool TestTrackPopupMenu(void* aFunc)
-{
-  auto patchedTrackPopupMenu =
-    reinterpret_cast<decltype(&TrackPopupMenu)>(aFunc);
-  return patchedTrackPopupMenu(0, 0, 0, 0, 0, 0, 0) == 0;
-}
-
-bool TestNtFlushBuffersFile(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtFlushBuffersFileType)(HANDLE, PIO_STATUS_BLOCK);
-  auto patchedNtFlushBuffersFile =
-    reinterpret_cast<NtFlushBuffersFileType>(aFunc);
-  patchedNtFlushBuffersFile(0, 0);
-  return true;
-}
-
-bool TestNtCreateFile(void* aFunc)
-{
-  auto patchedNtCreateFile =
-    reinterpret_cast<decltype(&NtCreateFile)>(aFunc);
-  return patchedNtCreateFile(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) != 0;
-}
-
-bool TestNtReadFile(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtReadFileType)(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
-                                           PIO_STATUS_BLOCK, PVOID, ULONG,
-                                           PLARGE_INTEGER, PULONG);
-  auto patchedNtReadFile =
-    reinterpret_cast<NtReadFileType>(aFunc);
-  return patchedNtReadFile(0, 0, 0, 0, 0, 0, 0, 0, 0) != 0;
-}
-
-bool TestNtReadFileScatter(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtReadFileScatterType)(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
-                                                  PIO_STATUS_BLOCK, PFILE_SEGMENT_ELEMENT, ULONG,
-                                                  PLARGE_INTEGER, PULONG);
-  auto patchedNtReadFileScatter =
-    reinterpret_cast<NtReadFileScatterType>(aFunc);
-  return patchedNtReadFileScatter(0, 0, 0, 0, 0, 0, 0, 0, 0) != 0;
-}
-
-bool TestNtWriteFile(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtWriteFileType)(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
-                                            PIO_STATUS_BLOCK, PVOID, ULONG,
-                                            PLARGE_INTEGER, PULONG);
-  auto patchedNtWriteFile =
-    reinterpret_cast<NtWriteFileType>(aFunc);
-  return patchedNtWriteFile(0, 0, 0, 0, 0, 0, 0, 0, 0) != 0;
-}
-
-bool TestNtWriteFileGather(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtWriteFileGatherType)(HANDLE, HANDLE, PIO_APC_ROUTINE, PVOID,
-                                                  PIO_STATUS_BLOCK, PFILE_SEGMENT_ELEMENT, ULONG,
-                                                  PLARGE_INTEGER, PULONG);
-  auto patchedNtWriteFileGather =
-    reinterpret_cast<NtWriteFileGatherType>(aFunc);
-  return patchedNtWriteFileGather(0, 0, 0, 0, 0, 0, 0, 0, 0) != 0;
-}
-
-bool TestNtQueryFullAttributesFile(void* aFunc)
-{
-  typedef NTSTATUS(WINAPI *NtQueryFullAttributesFileType)(POBJECT_ATTRIBUTES,
-                                                          PVOID);
-  auto patchedNtQueryFullAttributesFile =
-    reinterpret_cast<NtQueryFullAttributesFileType>(aFunc);
-  return patchedNtQueryFullAttributesFile(0, 0) != 0;
-}
-
-bool TestLdrUnloadDll(void* aFunc)
-{
-  typedef NTSTATUS (NTAPI *LdrUnloadDllType)(HMODULE);
-  auto patchedLdrUnloadDll = reinterpret_cast<LdrUnloadDllType>(aFunc);
-  return patchedLdrUnloadDll(0) != 0;
-}
-
-bool TestLdrResolveDelayLoadedAPI(void* aFunc)
-{
-  // These pointers are disguised as PVOID to avoid pulling in obscure headers
-  typedef PVOID (WINAPI *LdrResolveDelayLoadedAPIType)(PVOID, PVOID, PVOID,
-                                                       PVOID, PVOID, ULONG);
-  auto patchedLdrResolveDelayLoadedAPI =
-    reinterpret_cast<LdrResolveDelayLoadedAPIType>(aFunc);
-  // No idea how to call this API. Flags==99 is just an arbitrary number that
-  // doesn't crash when the other params are null.
-  return patchedLdrResolveDelayLoadedAPI(0, 0, 0, 0, 0, 99) == 0;
-}
-
-#ifdef _M_AMD64
-bool TestRtlInstallFunctionTableCallback(void* aFunc)
-{
-  auto patchedRtlInstallFunctionTableCallback =
-    reinterpret_cast<decltype(RtlInstallFunctionTableCallback)*>(aFunc);
-
-  return patchedRtlInstallFunctionTableCallback(0, 0, 0, 0, 0, 0) == FALSE;
-}
-#endif
-
-bool TestSetUnhandledExceptionFilter(void* aFunc)
-{
-  auto patchedSetUnhandledExceptionFilter =
-    reinterpret_cast<decltype(&SetUnhandledExceptionFilter)>(aFunc);
-  // Retrieve the current filter as we set the new filter to null, then restore the current filter.
-  LPTOP_LEVEL_EXCEPTION_FILTER current = patchedSetUnhandledExceptionFilter(0);
-  patchedSetUnhandledExceptionFilter(current);
-  return true;
-}
-
-bool TestVirtualAlloc(void* aFunc)
-{
-  auto patchedVirtualAlloc =
-    reinterpret_cast<decltype(&VirtualAlloc)>(aFunc);
-  return patchedVirtualAlloc(0, 0, 0, 0) == 0;
-}
-
-bool TestMapViewOfFile(void* aFunc)
-{
-  auto patchedMapViewOfFile =
-    reinterpret_cast<decltype(&MapViewOfFile)>(aFunc);
-  return patchedMapViewOfFile(0, 0, 0, 0, 0) == 0;
-}
-
-bool TestCreateDIBSection(void* aFunc)
-{
-  auto patchedCreateDIBSection =
-    reinterpret_cast<decltype(&CreateDIBSection)>(aFunc);
-  // MSDN is wrong here.  This does not return ERROR_INVALID_PARAMETER.  It
-  // sets the value of GetLastError to ERROR_INVALID_PARAMETER.
-  // CreateDIBSection returns 0 on error.
-  return patchedCreateDIBSection(0, 0, 0, 0, 0, 0) == 0;
-}
-
-bool TestCreateFileW(void* aFunc)
-{
-  auto patchedCreateFileW =
-    reinterpret_cast<decltype(&CreateFileW)>(aFunc);
-  return patchedCreateFileW(0, 0, 0, 0, 0, 0, 0) == INVALID_HANDLE_VALUE;
-}
-
-bool TestCreateFileA(void* aFunc)
-{
-  auto patchedCreateFileA =
-    reinterpret_cast<decltype(&CreateFileA)>(aFunc);
-//  return patchedCreateFileA(0, 0, 0, 0, 0, 0, 0) == INVALID_HANDLE_VALUE;
-  printf("TEST-SKIPPED | WindowsDllInterceptor | "
-          "Will not attempt to execute patched CreateFileA -- patched method is known to fail.\n");
-  return true;
-}
-
-bool TestQueryDosDeviceW(void* aFunc)
-{
-  auto patchedQueryDosDeviceW =
-    reinterpret_cast<decltype(&QueryDosDeviceW)>(aFunc);
-  return patchedQueryDosDeviceW(nullptr, nullptr, 0) == 0;
-}
-
-bool TestInSendMessageEx(void* aFunc)
-{
-  auto patchedInSendMessageEx =
-    reinterpret_cast<decltype(&InSendMessageEx)>(aFunc);
-  patchedInSendMessageEx(0);
-  return true;
-}
-
-bool TestImmGetContext(void* aFunc)
-{
-  auto patchedImmGetContext =
-    reinterpret_cast<decltype(&ImmGetContext)>(aFunc);
-  patchedImmGetContext(0);
-  return true;
-}
-
-bool TestImmGetCompositionStringW(void* aFunc)
-{
-  auto patchedImmGetCompositionStringW =
-    reinterpret_cast<decltype(&ImmGetCompositionStringW)>(aFunc);
-  patchedImmGetCompositionStringW(0, 0, 0, 0);
-  return true;
-}
-
-bool TestImmSetCandidateWindow(void* aFunc)
-{
-  auto patchedImmSetCandidateWindow =
-    reinterpret_cast<decltype(&ImmSetCandidateWindow)>(aFunc);
-//  return patchedImmSetCandidateWindow(0, 0) == 0;
-  // ImmSetCandidateWindow crashes if given bad parameters.
-  printf("TEST-SKIPPED | WindowsDllInterceptor | "
-          "Will not attempt to execute patched ImmSetCandidateWindow.\n");
-  return true;
-}
-
-bool TestImmNotifyIME(void* aFunc)
-{
-  auto patchedImmNotifyIME =
-    reinterpret_cast<decltype(&ImmNotifyIME)>(aFunc);
-  return patchedImmNotifyIME(0, 0, 0, 0) == 0;
-}
-
-bool TestGetSaveFileNameW(void* aFunc)
-{
-  auto patchedGetSaveFileNameWType =
-    reinterpret_cast<decltype(&GetSaveFileNameW)>(aFunc);
-  patchedGetSaveFileNameWType(0);
-  return true;
-}
-
-bool TestGetOpenFileNameW(void* aFunc)
-{
-  auto patchedGetOpenFileNameWType =
-    reinterpret_cast<decltype(&GetOpenFileNameW)>(aFunc);
-  patchedGetOpenFileNameWType(0);
-  return true;
-}
-
-bool TestGetKeyState(void* aFunc)
-{
-  auto patchedGetKeyState =
-    reinterpret_cast<decltype(&GetKeyState)>(aFunc);
-  patchedGetKeyState(0);
-  return true;
-}
-
-bool TestSendMessageTimeoutW(void* aFunc)
-{
-  auto patchedSendMessageTimeoutW =
-    reinterpret_cast<decltype(&SendMessageTimeoutW)>(aFunc);
-  return patchedSendMessageTimeoutW(0, 0, 0, 0, 0, 0, 0) == 0;
-}
-
-bool TestProcessCaretEvents(void* aFunc)
-{
-  auto patchedProcessCaretEvents =
-    reinterpret_cast<WINEVENTPROC>(aFunc);
-  patchedProcessCaretEvents(0, 0, 0, 0, 0, 0, 0);
-  return true;
-}
-
-bool TestSetCursorPos(void* aFunc)
-{
-  // SetCursorPos has some issues in automation -- see bug 1368033.
-  // For that reason, we don't check the return value -- we only
-  // check that the method runs without producing an exception.
-  auto patchedSetCursorPos =
-    reinterpret_cast<decltype(&SetCursorPos)>(aFunc);
-  patchedSetCursorPos(512, 512);
-  return true;
-}
-
-static DWORD sTlsIndex = 0;
-
-bool TestTlsAlloc(void* aFunc)
-{
-  auto patchedTlsAlloc =
-    reinterpret_cast<decltype(&TlsAlloc)>(aFunc);
-  sTlsIndex = patchedTlsAlloc();
-  return sTlsIndex != TLS_OUT_OF_INDEXES;
-}
-
-bool TestTlsFree(void* aFunc)
-{
-  auto patchedTlsFree =
-    reinterpret_cast<decltype(&TlsFree)>(aFunc);
-  return sTlsIndex != 0 && patchedTlsFree(sTlsIndex);
-}
-
-bool TestCloseHandle(void* aFunc)
-{
-  auto patchedCloseHandle =
-    reinterpret_cast<decltype(&CloseHandle)>(aFunc);
-  return patchedCloseHandle(0) == FALSE;
-}
-
-bool TestDuplicateHandle(void* aFunc)
-{
-  auto patchedDuplicateHandle =
-    reinterpret_cast<decltype(&DuplicateHandle)>(aFunc);
-  return patchedDuplicateHandle(0, 0, 0, 0, 0, 0, 0) == FALSE;
-}
-
-bool TestPrintDlgW(void* aFunc)
-{
-  auto patchedPrintDlgW =
-    reinterpret_cast<decltype(&PrintDlgW)>(aFunc);
-  patchedPrintDlgW(0);
-  return true;
-}
-
-bool TestInternetConnectA(void* aFunc)
-{
-  auto patchedInternetConnectA =
-    reinterpret_cast<decltype(&InternetConnectA)>(aFunc);
-  return patchedInternetConnectA(0, 0, 0, 0, 0, 0, 0, 0) == 0;
-}
-
-HINTERNET sInternet = 0;
-
-bool TestInternetOpenA(void* aFunc)
-{
-  auto patchedInternetOpenA =
-    reinterpret_cast<decltype(&InternetOpenA)>(aFunc);
-  sInternet = patchedInternetOpenA(0, 0, 0, 0, 0);
-  return sInternet != 0;
-}
-
-bool TestInternetCloseHandle(void* aFunc)
-{
-  auto patchedInternetCloseHandle =
-    reinterpret_cast<decltype(&InternetCloseHandle)>(aFunc);
-  return patchedInternetCloseHandle(sInternet);
-}
-
-bool TestInternetQueryDataAvailable(void* aFunc)
-{
-  auto patchedInternetQueryDataAvailable =
-    reinterpret_cast<decltype(&InternetQueryDataAvailable)>(aFunc);
-  return patchedInternetQueryDataAvailable(0, 0, 0, 0) == FALSE;
-}
-
-bool TestInternetReadFile(void* aFunc)
-{
-  auto patchedInternetReadFile =
-    reinterpret_cast<decltype(&InternetReadFile)>(aFunc);
-  return patchedInternetReadFile(0, 0, 0, 0) == FALSE;
-}
-
-bool TestInternetWriteFile(void* aFunc)
-{
-  auto patchedInternetWriteFile =
-    reinterpret_cast<decltype(&InternetWriteFile)>(aFunc);
-  return patchedInternetWriteFile(0, 0, 0, 0) == FALSE;
-}
-
-bool TestInternetSetOptionA(void* aFunc)
-{
-  auto patchedInternetSetOptionA =
-    reinterpret_cast<decltype(&InternetSetOptionA)>(aFunc);
-  return patchedInternetSetOptionA(0, 0, 0, 0) == FALSE;
-}
-
-bool TestHttpAddRequestHeadersA(void* aFunc)
-{
-  auto patchedHttpAddRequestHeadersA =
-    reinterpret_cast<decltype(&HttpAddRequestHeadersA)>(aFunc);
-  return patchedHttpAddRequestHeadersA(0, 0, 0, 0) == FALSE;
-}
-
-bool TestHttpOpenRequestA(void* aFunc)
-{
-  auto patchedHttpOpenRequestA =
-    reinterpret_cast<decltype(&HttpOpenRequestA)>(aFunc);
-  return patchedHttpOpenRequestA(0, 0, 0, 0, 0, 0, 0, 0) == 0;
-}
-
-bool TestHttpQueryInfoA(void* aFunc)
-{
-  auto patchedHttpQueryInfoA =
-    reinterpret_cast<decltype(&HttpQueryInfoA)>(aFunc);
-  return patchedHttpQueryInfoA(0, 0, 0, 0, 0) == FALSE;
-}
-
-bool TestHttpSendRequestA(void* aFunc)
-{
-  auto patchedHttpSendRequestA =
-    reinterpret_cast<decltype(&HttpSendRequestA)>(aFunc);
-  return patchedHttpSendRequestA(0, 0, 0, 0, 0) == FALSE;
-}
-
-bool TestHttpSendRequestExA(void* aFunc)
-{
-  auto patchedHttpSendRequestExA =
-    reinterpret_cast<decltype(&HttpSendRequestExA)>(aFunc);
-  return patchedHttpSendRequestExA(0, 0, 0, 0, 0) == FALSE;
-}
-
-bool TestHttpEndRequestA(void* aFunc)
-{
-  auto patchedHttpEndRequestA =
-    reinterpret_cast<decltype(&HttpEndRequestA)>(aFunc);
-  return patchedHttpEndRequestA(0, 0, 0, 0) == FALSE;
-}
-
-bool TestInternetQueryOptionA(void* aFunc)
-{
-  auto patchedInternetQueryOptionA =
-    reinterpret_cast<decltype(&InternetQueryOptionA)>(aFunc);
-  return patchedInternetQueryOptionA(0, 0, 0, 0) == FALSE;
-}
-
-bool TestInternetErrorDlg(void* aFunc)
-{
-  auto patchedInternetErrorDlg =
-    reinterpret_cast<decltype(&InternetErrorDlg)>(aFunc);
-  return patchedInternetErrorDlg(0, 0, 0, 0, 0) == ERROR_INVALID_HANDLE;
-}
-
-CredHandle sCredHandle;
-
-bool TestAcquireCredentialsHandleA(void* aFunc)
-{
-  auto patchedAcquireCredentialsHandleA =
-    reinterpret_cast<decltype(&AcquireCredentialsHandleA)>(aFunc);
-  SCHANNEL_CRED cred;
-  memset(&cred, 0, sizeof(cred));
-  cred.dwVersion = SCHANNEL_CRED_VERSION;
-  return patchedAcquireCredentialsHandleA(0, UNISP_NAME, SECPKG_CRED_OUTBOUND,
-                                          0, &cred, 0, 0, &sCredHandle, 0) == S_OK;
-}
-
-bool TestQueryCredentialsAttributesA(void* aFunc)
-{
-  auto patchedQueryCredentialsAttributesA =
-    reinterpret_cast<decltype(&QueryCredentialsAttributesA)>(aFunc);
-  return patchedQueryCredentialsAttributesA(&sCredHandle, 0, 0) == SEC_E_UNSUPPORTED_FUNCTION;
-}
-
-bool TestFreeCredentialsHandle(void* aFunc)
-{
-  auto patchedFreeCredentialsHandle =
-    reinterpret_cast<decltype(&FreeCredentialsHandle)>(aFunc);
-  return patchedFreeCredentialsHandle(&sCredHandle) == S_OK;
-}
-
 int main()
 {
   LARGE_INTEGER start;
   QueryPerformanceCounter(&start);
 
@@ -613,11 +416,11 @@
   p0 = rotatePayload(initial);
 
   {
     WindowsDllInterceptor ExeIntercept;
     ExeIntercept.Init("TestDllInterceptor.exe");
-    if (ExeIntercept.AddHook("rotatePayload", reinterpret_cast<intptr_t>(patched_rotatePayload), (void**) &orig_rotatePayload)) {
+    if (orig_rotatePayload.Set(ExeIntercept, "rotatePayload", &patched_rotatePayload)) {
       printf("TEST-PASS | WindowsDllInterceptor | Hook added\n");
     } else {
       printf("TEST-UNEXPECTED-FAIL | WindowsDllInterceptor | Failed to add hook\n");
       return 1;
     }
@@ -657,89 +460,89 @@
     printf("TEST-UNEXPECTED-FAIL | WindowsDllInterceptor | Original function didn't return the right information\n");
     return 1;
   }
 #endif
 
-  if (TestHook(TestGetWindowInfo, "user32.dll", "GetWindowInfo") &&
+  if (TEST_HOOK(user32.dll, GetWindowInfo, Equals, FALSE) &&
 #ifdef _WIN64
-      TestHook(TestSetWindowLongPtr, "user32.dll", "SetWindowLongPtrA") &&
-      TestHook(TestSetWindowLongPtr, "user32.dll", "SetWindowLongPtrW") &&
+      TEST_HOOK(user32.dll, SetWindowLongPtrA, Equals, 0) &&
+      TEST_HOOK(user32.dll, SetWindowLongPtrW, Equals, 0) &&
 #else
-      TestHook(TestSetWindowLong, "user32.dll", "SetWindowLongA") &&
-      TestHook(TestSetWindowLong, "user32.dll", "SetWindowLongW") &&
+      TEST_HOOK(user32.dll, SetWindowLongA, Equals, 0) &&
+      TEST_HOOK(user32.dll, SetWindowLongW, Equals, 0) &&
 #endif
-      TestHook(TestTrackPopupMenu, "user32.dll", "TrackPopupMenu") &&
+      TEST_HOOK(user32.dll, TrackPopupMenu, Equals, FALSE) &&
 #ifdef _M_IX86
       // We keep this test to hook complex code on x86. (Bug 850957)
-      TestHook(TestNtFlushBuffersFile, "ntdll.dll", "NtFlushBuffersFile") &&
+      TEST_HOOK(ntdll.dll, NtFlushBuffersFile, NotEquals, 0) &&
 #endif
-      TestHook(TestNtCreateFile, "ntdll.dll", "NtCreateFile") &&
-      TestHook(TestNtReadFile, "ntdll.dll", "NtReadFile") &&
-      TestHook(TestNtReadFileScatter, "ntdll.dll", "NtReadFileScatter") &&
-      TestHook(TestNtWriteFile, "ntdll.dll", "NtWriteFile") &&
-      TestHook(TestNtWriteFileGather, "ntdll.dll", "NtWriteFileGather") &&
-      TestHook(TestNtQueryFullAttributesFile, "ntdll.dll", "NtQueryFullAttributesFile") &&
+      TEST_HOOK(ntdll.dll, NtCreateFile, NotEquals, 0) &&
+      TEST_HOOK(ntdll.dll, NtReadFile, NotEquals, 0) &&
+      TEST_HOOK(ntdll.dll, NtReadFileScatter, NotEquals, 0) &&
+      TEST_HOOK(ntdll.dll, NtWriteFile, NotEquals, 0) &&
+      TEST_HOOK(ntdll.dll, NtWriteFileGather, NotEquals, 0) &&
+      TEST_HOOK(ntdll.dll, NtQueryFullAttributesFile, NotEquals, 0) &&
 #ifndef MOZ_ASAN
       // Bug 733892: toolkit/crashreporter/nsExceptionHandler.cpp
       // This fails on ASan because the ASan runtime already hooked this function
-      TestHook(TestSetUnhandledExceptionFilter, "kernel32.dll", "SetUnhandledExceptionFilter") &&
+      TEST_HOOK(kernel32.dll, SetUnhandledExceptionFilter, Ignore, nullptr) &&
 #endif
 #ifdef _M_IX86
       // Bug 670967: xpcom/base/AvailableMemoryTracker.cpp
-      TestHook(TestVirtualAlloc, "kernel32.dll", "VirtualAlloc") &&
-      TestHook(TestMapViewOfFile, "kernel32.dll", "MapViewOfFile") &&
-      TestHook(TestCreateDIBSection, "gdi32.dll", "CreateDIBSection") &&
-      TestHook(TestCreateFileW, "kernel32.dll", "CreateFileW") &&    // see Bug 1316415
+      TEST_HOOK(kernel32.dll, VirtualAlloc, Equals, nullptr) &&
+      TEST_HOOK(kernel32.dll, MapViewOfFile, Equals, nullptr) &&
+      TEST_HOOK(gdi32.dll, CreateDIBSection, Equals, nullptr) &&
+      TEST_HOOK_FOR_INVALID_HANDLE_VALUE(kernel32.dll, CreateFileW) &&
 #endif
-      TestHook(TestCreateFileA, "kernel32.dll", "CreateFileA") &&
-      TestHook(TestQueryDosDeviceW, "kernelbase.dll", "QueryDosDeviceW") &&
-      TestDetour("user32.dll", "CreateWindowExW") &&
-      TestHook(TestInSendMessageEx, "user32.dll", "InSendMessageEx") &&
-      TestHook(TestImmGetContext, "imm32.dll", "ImmGetContext") &&
-      TestHook(TestImmGetCompositionStringW, "imm32.dll", "ImmGetCompositionStringW") &&
-      TestHook(TestImmSetCandidateWindow, "imm32.dll", "ImmSetCandidateWindow") &&
-      TestHook(TestImmNotifyIME, "imm32.dll", "ImmNotifyIME") &&
-      TestHook(TestGetSaveFileNameW, "comdlg32.dll", "GetSaveFileNameW") &&
-      TestHook(TestGetOpenFileNameW, "comdlg32.dll", "GetOpenFileNameW") &&
+      TEST_HOOK_FOR_INVALID_HANDLE_VALUE(kernel32.dll, CreateFileA) &&
+      TEST_HOOK(kernelbase.dll, QueryDosDeviceW, Equals, 0) &&
+      TEST_DETOUR(user32.dll, CreateWindowExW, Equals, nullptr) &&
+      TEST_HOOK(user32.dll, InSendMessageEx, Equals, ISMEX_NOSEND) &&
+      TEST_HOOK(imm32.dll, ImmGetContext, Equals, nullptr) &&
+      TEST_HOOK(imm32.dll, ImmGetCompositionStringW, Ignore, 0) &&
+      TEST_HOOK_SKIP_EXEC(imm32.dll, ImmSetCandidateWindow) &&
+      TEST_HOOK(imm32.dll, ImmNotifyIME, Equals, 0) &&
+      TEST_HOOK(comdlg32.dll, GetSaveFileNameW, Ignore, FALSE) &&
+      TEST_HOOK(comdlg32.dll, GetOpenFileNameW, Ignore, FALSE) &&
 #ifdef _M_X64
-      TestHook(TestGetKeyState, "user32.dll", "GetKeyState") &&    // see Bug 1316415
-      TestHook(TestLdrUnloadDll, "ntdll.dll", "LdrUnloadDll") &&
-      MaybeTestHook(IsWin8OrLater(), TestLdrResolveDelayLoadedAPI, "ntdll.dll", "LdrResolveDelayLoadedAPI") &&
-      MaybeTestHook(!IsWin8OrLater(), TestRtlInstallFunctionTableCallback, "kernel32.dll", "RtlInstallFunctionTableCallback") &&
-      TestHook(TestPrintDlgW, "comdlg32.dll", "PrintDlgW") &&
+      TEST_HOOK(user32.dll, GetKeyState, Ignore, 0) &&    // see Bug 1316415
+      TEST_HOOK(ntdll.dll, LdrUnloadDll, NotEquals, 0) &&
+      MAYBE_TEST_HOOK_SKIP_EXEC(IsWin8OrLater(), ntdll.dll, LdrResolveDelayLoadedAPI) &&
+      MAYBE_TEST_HOOK(!IsWin8OrLater(), kernel32.dll, RtlInstallFunctionTableCallback, Equals, FALSE) &&
+      TEST_HOOK(comdlg32.dll, PrintDlgW, Ignore, 0) &&
 #endif
-      MaybeTestHook(ShouldTestTipTsf(), TestProcessCaretEvents, "tiptsf.dll", "ProcessCaretEvents") &&
+      MAYBE_TEST_HOOK(ShouldTestTipTsf(), tiptsf.dll, ProcessCaretEvents, Ignore, nullptr) &&
 #ifdef _M_IX86
-      TestHook(TestSendMessageTimeoutW, "user32.dll", "SendMessageTimeoutW") &&
+      TEST_HOOK(user32.dll, SendMessageTimeoutW, Equals, 0) &&
 #endif
-      TestHook(TestSetCursorPos, "user32.dll", "SetCursorPos") &&
-      TestHook(TestTlsAlloc, "kernel32.dll", "TlsAlloc") &&
-      TestHook(TestTlsFree, "kernel32.dll", "TlsFree") &&
-      TestHook(TestCloseHandle, "kernel32.dll", "CloseHandle") &&
-      TestHook(TestDuplicateHandle, "kernel32.dll", "DuplicateHandle") &&
-
-      TestHook(TestInternetOpenA, "wininet.dll", "InternetOpenA") &&
-      TestHook(TestInternetCloseHandle, "wininet.dll", "InternetCloseHandle") &&
-      TestHook(TestInternetConnectA, "wininet.dll", "InternetConnectA") &&
-      TestHook(TestInternetQueryDataAvailable, "wininet.dll", "InternetQueryDataAvailable") &&
-      TestHook(TestInternetReadFile, "wininet.dll", "InternetReadFile") &&
-      TestHook(TestInternetWriteFile, "wininet.dll", "InternetWriteFile") &&
-      TestHook(TestInternetSetOptionA, "wininet.dll", "InternetSetOptionA") &&
-      TestHook(TestHttpAddRequestHeadersA, "wininet.dll", "HttpAddRequestHeadersA") &&
-      TestHook(TestHttpOpenRequestA, "wininet.dll", "HttpOpenRequestA") &&
-      TestHook(TestHttpQueryInfoA, "wininet.dll", "HttpQueryInfoA") &&
-      TestHook(TestHttpSendRequestA, "wininet.dll", "HttpSendRequestA") &&
-      TestHook(TestHttpSendRequestExA, "wininet.dll", "HttpSendRequestExA") &&
-      TestHook(TestHttpEndRequestA, "wininet.dll", "HttpEndRequestA") &&
-      TestHook(TestInternetQueryOptionA, "wininet.dll", "InternetQueryOptionA") &&
-
-      TestHook(TestAcquireCredentialsHandleA, "sspicli.dll", "AcquireCredentialsHandleA") &&
-      TestHook(TestQueryCredentialsAttributesA, "sspicli.dll", "QueryCredentialsAttributesA") &&
-      TestHook(TestFreeCredentialsHandle, "sspicli.dll", "FreeCredentialsHandle") &&
-
-      TestDetour("kernel32.dll", "BaseThreadInitThunk") &&
-      TestDetour("ntdll.dll", "LdrLoadDll")) {
+      TEST_HOOK(user32.dll, SetCursorPos, NotEquals, FALSE) &&
+      TEST_HOOK(kernel32.dll, TlsAlloc, NotEquals, TLS_OUT_OF_INDEXES) &&
+      TEST_HOOK_PARAMS(kernel32.dll, TlsFree, Equals, FALSE, TLS_OUT_OF_INDEXES) &&
+      TEST_HOOK(kernel32.dll, CloseHandle, Equals, FALSE) &&
+      TEST_HOOK(kernel32.dll, DuplicateHandle, Equals, FALSE) &&
+
+      TEST_HOOK(wininet.dll, InternetOpenA, NotEquals, nullptr) &&
+      TEST_HOOK(wininet.dll, InternetCloseHandle, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, InternetConnectA, Equals, nullptr) &&
+      TEST_HOOK(wininet.dll, InternetQueryDataAvailable, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, InternetReadFile, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, InternetWriteFile, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, InternetSetOptionA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, HttpAddRequestHeadersA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, HttpOpenRequestA, Equals, nullptr) &&
+      TEST_HOOK(wininet.dll, HttpQueryInfoA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, HttpSendRequestA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, HttpSendRequestExA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, HttpEndRequestA, Equals, FALSE) &&
+      TEST_HOOK(wininet.dll, InternetQueryOptionA, Equals, FALSE) &&
+
+      TEST_HOOK(sspicli.dll, AcquireCredentialsHandleA, NotEquals, SEC_E_OK) &&
+      TEST_HOOK(sspicli.dll, QueryCredentialsAttributesA, NotEquals, SEC_E_OK) &&
+      TEST_HOOK(sspicli.dll, FreeCredentialsHandle, NotEquals, SEC_E_OK) &&
+
+      TEST_DETOUR_SKIP_EXEC(kernel32.dll, BaseThreadInitThunk) &&
+      TEST_DETOUR_SKIP_EXEC(ntdll.dll, LdrLoadDll)) {
     printf("TEST-PASS | WindowsDllInterceptor | all checks passed\n");
 
     LARGE_INTEGER end, freq;
     QueryPerformanceCounter(&end);
 
diff --git a/mozglue/tests/interceptor/TestDllInterceptorCrossProcess.cpp b/mozglue/tests/interceptor/TestDllInterceptorCrossProcess.cpp
--- a/mozglue/tests/interceptor/TestDllInterceptorCrossProcess.cpp
+++ b/mozglue/tests/interceptor/TestDllInterceptorCrossProcess.cpp
@@ -9,23 +9,23 @@
 
 #include <string>
 
 using std::wstring;
 
-static void* gOrigReturnResult;
-
 extern "C" __declspec(dllexport) int
 ReturnResult()
 {
   return 2;
 }
 
+static mozilla::CrossProcessDllInterceptor::FuncHookType<decltype(&ReturnResult)>
+  gOrigReturnResult;
+
 static int
 ReturnResultHook()
 {
-  auto origFn = reinterpret_cast<decltype(&ReturnResult)>(gOrigReturnResult);
-  if (origFn() != 2) {
+  if (gOrigReturnResult() != 2) {
     return 3;
   }
 
   return 0;
 }
@@ -71,13 +71,11 @@
   }
 
   mozilla::CrossProcessDllInterceptor intcpt(childProcess.get());
   intcpt.Init("TestDllInterceptorCrossProcess.exe");
 
-  if (!intcpt.AddHook("ReturnResult",
-                      reinterpret_cast<intptr_t>(&ReturnResultHook),
-                      &gOrigReturnResult)) {
+  if (!gOrigReturnResult.Set(intcpt, "ReturnResult", &ReturnResultHook)) {
     printf("TEST-UNEXPECTED-FAIL | DllInterceptorCrossProcess | Failed to add hook\n");
     return 1;
   }
 
   printf("TEST-PASS | DllInterceptorCrossProcess | Hook added\n");
diff --git a/netwerk/cache2/CacheFileInputStream.cpp b/netwerk/cache2/CacheFileInputStream.cpp
--- a/netwerk/cache2/CacheFileInputStream.cpp
+++ b/netwerk/cache2/CacheFileInputStream.cpp
@@ -167,14 +167,10 @@
         return NS_OK;
       }
       return NS_BASE_STREAM_WOULD_BLOCK;
     }
 
-    if (aCount == 0) {
-      break;
-    }
-
     CacheFileChunkReadHandle hnd = mChunk->GetReadHandle();
     int64_t canRead = CanRead(&hnd);
     if (NS_FAILED(mStatus)) {
       return mStatus;
     }
diff --git a/netwerk/dns/nsHostResolver.cpp b/netwerk/dns/nsHostResolver.cpp
--- a/netwerk/dns/nsHostResolver.cpp
+++ b/netwerk/dns/nsHostResolver.cpp
@@ -1889,20 +1889,21 @@
 nsHostResolver::Create(uint32_t maxCacheEntries,
                        uint32_t defaultCacheEntryLifetime,
                        uint32_t defaultGracePeriod,
                        nsHostResolver **result)
 {
-    auto *res = new nsHostResolver(maxCacheEntries, defaultCacheEntryLifetime,
-                                   defaultGracePeriod);
-    NS_ADDREF(res);
+    RefPtr<nsHostResolver> res =
+        new nsHostResolver(maxCacheEntries, defaultCacheEntryLifetime,
+                           defaultGracePeriod);
 
     nsresult rv = res->Init();
-    if (NS_FAILED(rv))
-        NS_RELEASE(res);
+    if (NS_FAILED(rv)) {
+        return rv;
+    }
 
-    *result = res;
-    return rv;
+    res.forget(result);
+    return NS_OK;
 }
 
 void
 nsHostResolver::GetDNSCacheEntries(nsTArray<DNSCacheEntries> *args)
 {
diff --git a/python/l10n/fluent_migrations/bug_1415733_preferences_search.py b/python/l10n/fluent_migrations/bug_1415733_preferences_search.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1415733_preferences_search.py
+++ /dev/null
@@ -1,237 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
-from fluent.migrate.transforms import REPLACE
-from fluent.migrate import COPY
-
-
-def migrate(ctx):
-    """Bug 1415733 - Migrate the "Search" section of Preferences to the new Localization API, part {index}"""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('search-bar-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'searchBar.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-bar-hidden'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'searchBar.hidden.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-bar-shown'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'searchBar.shown.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-engine-default-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'defaultSearchEngine.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-engine-default-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'chooseYourDefaultSearchEngine2.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-suggestions-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'provideSearchSuggestions.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'provideSearchSuggestions.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-show-suggestions-url-bar-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'showURLBarSuggestions2.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'showURLBarSuggestions2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-show-suggestions-above-history-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'showSearchSuggestionsAboveHistory.label'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-suggestions-cant-show'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'urlBarSuggestionsPermanentPB.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE(
-                            '-brand-short-name'
-                        )
-                    }
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-one-click-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'oneClickSearchEngines.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-one-click-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'chooseWhichOneToDisplay2.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-choose-engine-column'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'engineNameColumn.label'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-choose-keyword-column'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'engineKeywordColumn.label'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-restore-default'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'restoreDefaultSearchEngines.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'restoreDefaultSearchEngines.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-remove-engine'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'removeEngine.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/search.dtd',
-                            'removeEngine.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-find-more-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/search.dtd',
-                    'findMoreSearchEngines.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-keyword-warning-title'),
-                value=COPY(
-                    'browser/chrome/browser/engineManager.properties',
-                    'duplicateTitle'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-keyword-warning-engine'),
-                value=REPLACE(
-                    'browser/chrome/browser/engineManager.properties',
-                    'duplicateEngineMsg',
-                    {
-                        '%S': EXTERNAL_ARGUMENT(
-                            'name'
-                        )
-                    }
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-keyword-warning-bookmark'),
-                value=COPY(
-                    'browser/chrome/browser/engineManager.properties',
-                    'duplicateBookmarkMsg'
-                )
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1419547_preferences_containers.py b/python/l10n/fluent_migrations/bug_1419547_preferences_containers.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1419547_preferences_containers.py
+++ /dev/null
@@ -1,491 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
-from fluent.migrate import COPY, CONCAT, REPLACE
-
-
-def migrate(ctx):
-    """Bug 1419547 - Migrate Preferences::Containers to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('containers-back-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/containers.dtd',
-                    'backLink2.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.dtd',
-                    'paneContainers.title',
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-add-button'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'addButton.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'addButton.accesskey'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-preferences-button'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'preferencesButton.label'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-remove-button'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'removeButton.label'
-                        )
-                    ),
-                ]
-            ),
-        ]
-    )
-
-    ctx.add_transforms(
-        'browser/browser/preferences/containers.ftl',
-        'browser/browser/preferences/containers.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('containers-window-new'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'window.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/containers.dtd',
-                                'window.width',
-                            ),
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-window-update'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.updateContainerTitle',
-                            {
-                                '%S': EXTERNAL_ARGUMENT('name')
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/containers.dtd',
-                                'window.width',
-                            ),
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-window-close'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'windowClose.key',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Term(
-                id=FTL.Identifier('-containers-labels-style'),
-                value=CONCAT(
-                    FTL.TextElement('min-width: '),
-                    COPY(
-                        'browser/chrome/browser/preferences/containers.properties',
-                        'containers.labelMinWidth',
-                    ),
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-name-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/containers.dtd',
-                    'name2.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'name2.accesskey',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            MESSAGE_REFERENCE('-containers-labels-style'),
-                        )
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-name-text'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('placeholder'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'name.placeholder',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/containers.dtd',
-                    'icon2.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'icon2.accesskey',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            MESSAGE_REFERENCE('-containers-labels-style'),
-                        )
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/containers.dtd',
-                    'color2.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'color2.accesskey',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            MESSAGE_REFERENCE('-containers-labels-style'),
-                        )
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-button-done'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'button.ok.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.dtd',
-                            'button.ok.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-blue'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.blue.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-turquoise'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.turquoise.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-green'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.green.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-yellow'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.yellow.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-orange'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.orange.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-red'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.red.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-pink'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.pink.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-color-purple'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.purple.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-fingerprint'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.fingerprint.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-briefcase'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.briefcase.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-dollar'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.dollar.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-cart'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.cart.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-circle'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.circle.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-vacation'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.vacation.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-gift'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.gift.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-food'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.food.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-fruit'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.fruit.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-pet'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.pet.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-tree'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.tree.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-icon-chill'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/containers.properties',
-                            'containers.chill.label',
-                        ),
-                    ),
-                ],
-            ),
-
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1438375_preferences_extension_controlled.py b/python/l10n/fluent_migrations/bug_1438375_preferences_extension_controlled.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1438375_preferences_extension_controlled.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
-from fluent.migrate import CONCAT, REPLACE
-
-
-def migrate(ctx):
-    """Bug 1438375 - Migrate Extension Controlled settings in Preferences to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-homepage-override'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.homepage_override2',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-new-tab-url'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.newTabURL2',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-default-search'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.defaultSearch',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-privacy-containers'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.privacy.containers',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-websites-tracking-protection-mode'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.websites.trackingProtectionMode',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-proxy-config'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.proxyConfig',
-                    {
-                        '%1$S': CONCAT(
-                            FTL.TextElement('<img data-l10n-name="icon"/> '),
-                            EXTERNAL_ARGUMENT('name')
-                        ),
-                        '%2$S': MESSAGE_REFERENCE('-brand-short-name'),
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('extension-controlled-enable'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'extensionControlled.enable',
-                    {
-                        '%1$S': FTL.TextElement('<img data-l10n-name="addons-icon"/>'),
-                        '%2$S': FTL.TextElement('<img data-l10n-name="menu-icon"/>'),
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('network-proxy-connection-description'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'connectionDesc.label',
-                    {
-                        '%S': MESSAGE_REFERENCE('-brand-short-name'),
-                    }
-                )
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1445084_preferences_search_results.py b/python/l10n/fluent_migrations/bug_1445084_preferences_search_results.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1445084_preferences_search_results.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-
-def migrate(ctx):
-    """Bug 1445084 - Migrate search results pane of Preferences to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('search-input-box'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/preferences.dtd',
-                                'searchField.width'
-                            )
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('placeholder'),
-                        FTL.Pattern([
-                            FTL.Placeable(FTL.SelectExpression(
-                                expression=FTL.CallExpression(
-                                    callee=FTL.Function('PLATFORM')
-                                ),
-                                variants=[
-                                    FTL.Variant(
-                                        key=FTL.VariantName('windows'),
-                                        default=False,
-                                        value=COPY(
-                                            'browser/chrome/browser/preferences/preferences.properties',
-                                            'searchInput.labelWin'
-                                        )
-                                    ),
-                                    FTL.Variant(
-                                        key=FTL.VariantName('other'),
-                                        default=True,
-                                        value=COPY(
-                                            'browser/chrome/browser/preferences/preferences.properties',
-                                            'searchInput.labelUnix'
-                                        )
-                                    )
-                                ]
-                            ))
-                        ])
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-results-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.dtd',
-                    'paneSearchResults.title'
-                )
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1445694_preferences_sync.py b/python/l10n/fluent_migrations/bug_1445694_preferences_sync.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1445694_preferences_sync.py
+++ /dev/null
@@ -1,563 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
-from fluent.migrate import COPY, CONCAT, REPLACE
-
-# Custom extension of the CONCAT migration tailored to concat
-# two strings separated by a placeable.
-class CONCAT_BEFORE_AFTER(CONCAT):
-    def __call__(self, ctx):
-        assert len(self.elements) == 3
-        pattern_before, placeable, pattern_after = self.elements
-        elem_before = pattern_before.elements[0]
-        elem_after = pattern_after.elements[0]
-
-        if isinstance(elem_before, FTL.TextElement) and elem_before.value[-1] != " ":
-            elem_before.value += " "
-        if isinstance(elem_after, FTL.TextElement) and elem_after.value[0] != " ":
-            elem_after.value = " " + elem_after.value
-        return super(CONCAT_BEFORE_AFTER, self).__call__(ctx)
-
-def migrate(ctx):
-    """Bug 1445694 - Migrate Preferences::Sync to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/branding/sync-brand.ftl',
-        'browser/browser/branding/sync-brand.ftl',
-        [
-            FTL.Term(
-                id=FTL.Identifier('-fxaccount-brand-name'),
-                value=COPY(
-                    'browser/chrome/browser/syncBrand.dtd',
-                    'syncBrand.fxAccount.label'
-                )
-            ),
-        ]
-    )
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('sync-signedout-caption'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedOut.caption',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedout-description'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedOut.description',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedout-account-title'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedOut.accountBox.title',
-                    {
-                        '&syncBrand.fxAccount.label;': MESSAGE_REFERENCE('-fxaccount-brand-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedout-account-create'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedOut.accountBox.create2',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'signedOut.accountBox.create2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedout-account-signin'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'signedOut.accountBox.signin2',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'signedOut.accountBox.signin2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-profile-picture'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'profilePicture.tooltip',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-disconnect'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'disconnect3.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'disconnect3.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-manage-account'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'verifiedManage.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'verifiedManage.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedin-unverified'),
-                value=CONCAT_BEFORE_AFTER(
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'signedInUnverified.beforename.label',
-                    ),
-                    EXTERNAL_ARGUMENT('email'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'signedInUnverified.aftername.label',
-                    ),
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedin-login-failure'),
-                value=CONCAT_BEFORE_AFTER(
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'signedInLoginFailure.beforename.label',
-                    ),
-                    EXTERNAL_ARGUMENT('email'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'signedInLoginFailure.aftername.label',
-                    ),
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-resend-verification'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'resendVerification.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'resendVerification.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-remove-account'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'removeAccount.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'removeAccount.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-sign-in'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'signIn.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'signIn.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedin-settings-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedIn.settings.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-signedin-settings-desc'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'signedIn.settings.description',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-bookmarks'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.bookmarks.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.bookmarks.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-history'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.history.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.history.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-tabs'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.tabs.label2',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.tabs.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.tabs.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-logins'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.logins.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.logins.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.logins.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-addresses'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addresses.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addresses.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addresses.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-creditcards'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.creditcards.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.creditcards.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.creditcards.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-addons'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addons.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addons.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.addons.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-engine-prefs'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        FTL.Pattern([
-                            FTL.Placeable(FTL.SelectExpression(
-                                expression=FTL.CallExpression(
-                                    callee=FTL.Function('PLATFORM')
-                                ),
-                                variants=[
-                                    FTL.Variant(
-                                        key=FTL.VariantName('windows'),
-                                        default=False,
-                                        value=COPY(
-                                            'browser/chrome/browser/preferences/sync.dtd',
-                                            'engine.prefsWin.label'
-                                        )
-                                    ),
-                                    FTL.Variant(
-                                        key=FTL.VariantName('other'),
-                                        default=True,
-                                        value=COPY(
-                                            'browser/chrome/browser/preferences/sync.dtd',
-                                            'engine.prefs.label'
-                                        )
-                                    )
-                                ]
-                            )),
-                        ]),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltiptext'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.prefs.title'
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'engine.prefs.accesskey'
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-device-name-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'fxaSyncDeviceName.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-device-name-change'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'changeSyncDeviceName2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'changeSyncDeviceName2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-device-name-cancel'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'cancelChangeSyncDeviceName.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'cancelChangeSyncDeviceName.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-device-name-save'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'saveChangeSyncDeviceName.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/sync.dtd',
-                            'saveChangeSyncDeviceName.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-mobilepromo-single'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'mobilepromo.singledevice',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-mobilepromo-multi'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'mobilepromo.multidevice',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-tos-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'prefs.tosLink.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-fxa-privacy-notice'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/sync.dtd',
-                    'fxaPrivacyNotice.link.label',
-                ),
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1446180_preferences_privacy.py b/python/l10n/fluent_migrations/bug_1446180_preferences_privacy.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1446180_preferences_privacy.py
+++ /dev/null
@@ -1,1201 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE
-from fluent.migrate.transforms import REPLACE
-from fluent.migrate import COPY
-
-
-def migrate(ctx):
-    """Bug 1446180 - Migrate Preferences::Privacy to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/branding/official/brand.ftl',
-        'browser/branding/official/brand.ftl',
-        [
-            FTL.Term(
-                id=FTL.Identifier('-vendor-short-name'),
-                value=COPY(
-                    'browser/branding/official/brand.dtd',
-                    'vendorShortName'
-                )
-            ),
-        ]
-    )
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('privacy-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.dtd',
-                    'browserPrivacy.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('forms-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/security.dtd',
-                    'formsAndPasswords.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('forms-exceptions'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'passwordExceptions.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'passwordExceptions.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('forms-saved-logins'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'savedLogins.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'savedLogins.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('forms-master-pw-use'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'useMasterPassword.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'useMasterPassword.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('forms-master-pw-change'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'changeMasterPassword.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'changeMasterPassword.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'history.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-description'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'rememberDescription1.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-dontremember-description'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'dontrememberDescription.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-private-browsing-permanent'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'privateBrowsingPermanent2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'privateBrowsingPermanent2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'rememberHistory2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'rememberHistory2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-search-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'rememberSearchForm.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'rememberSearchForm.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-clear-on-close-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearOnClose.label',
-                            {
-                                '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearOnClose.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-clear-on-close-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearOnCloseSettings.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearOnCloseSettings.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-clear-button'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearHistoryButton.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'clearHistoryButton.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'siteData1.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-learn-more'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'siteDataLearnMoreLink.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-accept-cookies-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptCookies4.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptCookies4.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-block-cookies-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'blockCookies.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'blockCookies.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-keep-until'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'keepUntil2.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'keepUntil2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-accept-third-party-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'acceptThirdParty3.pre.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptThirdParty3.pre.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-accept-third-party-always-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptThirdParty.always.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-accept-third-party-visited-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptThirdParty.visited.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-accept-third-party-never-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'acceptThirdParty.never.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-clear'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'clearSiteData1.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'clearSiteData1.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'siteDataSettings1.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'siteDataSettings1.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sitedata-cookies-exceptions'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'cookieExceptions.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'cookieExceptions.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'addressBar.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-suggest'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'addressBar.suggest.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-locbar-history-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.history2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.history2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-locbar-bookmarks-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.bookmarks.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.bookmarks.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-locbar-openpage-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.openpage.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'locbar.openpage.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('addressbar-suggestions-settings'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'suggestionSettings2.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'trackingProtectionHeader2.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-mode-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'trackingProtection3.radioGroupLabel',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-mode-always'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionAlways.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionAlways.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-mode-private'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionPrivate.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionPrivate.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-mode-never'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionNever.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionNever.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-pbm-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'trackingProtectionPBM6.label',
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionPBM6.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-exceptions'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionExceptions.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'trackingProtectionExceptions.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-change-block-list'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'changeBlockList2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'changeBlockList2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'permissions.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-location'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/content.dtd',
-                    'locationPermissions.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-location-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'locationSettingsButton.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'locationSettingsButton.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-camera'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/content.dtd',
-                    'cameraPermissions.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-camera-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'cameraSettingsButton.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'cameraSettingsButton.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-microphone'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/content.dtd',
-                    'microphonePermissions.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-microphone-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'microphoneSettingsButton.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'microphoneSettingsButton.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-notification'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/content.dtd',
-                    'notificationPermissions.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-notification-settings'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'notificationSettingsButton.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'notificationSettingsButton.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-notification-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/content.dtd',
-                    'notificationPermissionsLearnMore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-notification-pause'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/preferences.properties',
-                            'pauseNotifications.label',
-                            {
-                                '%S': MESSAGE_REFERENCE('-brand-short-name')
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/preferences.properties',
-                            'pauseNotifications.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-block-popups'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'blockPopups.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'blockPopups.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-block-popups-exceptions'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'popupExceptions.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/content.dtd',
-                            'popupExceptions.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-addon-install-warning'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'warnOnAddonInstall2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'warnOnAddonInstall2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-addon-exceptions'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'addonExceptions.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'addonExceptions.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-a11y-privacy-checkbox'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'a11yPrivacy.checkbox.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'a11yPrivacy.checkbox.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-a11y-privacy-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'a11yPrivacy.learnmore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-header'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'dataCollection.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-description'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'dataCollectionDesc.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-privacy-notice'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'dataCollectionPrivacyNotice.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-health-report'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'enableHealthReport2.label',
-                            {
-                                '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name'),
-                                'Mozilla': MESSAGE_REFERENCE('-vendor-short-name'),
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'enableHealthReport2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-health-report-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'healthReportLearnMore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-health-report-disabled'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'healthReportingDisabled.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-browser-errors'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'collectBrowserErrors.label',
-                            {
-                                '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name'),
-                                'Mozilla': MESSAGE_REFERENCE('-vendor-short-name'),
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'collectBrowserErrors.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-browser-errors-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'collectBrowserErrorsLearnMore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-backlogged-crash-reports'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        REPLACE(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'sendBackloggedCrashReports.label',
-                            {
-                                '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                            },
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'sendBackloggedCrashReports.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('collection-backlogged-crash-reports-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'crashReporterLearnMore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/security.dtd',
-                    'security.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-browsing-protection'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/security.dtd',
-                    'browsingProtection.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-enable-safe-browsing'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'enableSafeBrowsing.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'enableSafeBrowsing.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-enable-safe-browsing-link'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'enableSafeBrowsingLearnMore.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-block-downloads'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'blockDownloads.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'blockDownloads.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('security-block-uncommon-software'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'blockUncommonAndUnwanted.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/security.dtd',
-                            'blockUncommonAndUnwanted.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'certificateTab.label',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-personal-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/advanced.dtd',
-                    'certPersonal2.description',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-select-auto-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'selectCerts.auto',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'selectCerts.auto.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-select-ask-option'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'selectCerts.ask',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'selectCerts.ask.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-enable-ocsp'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'enableOCSP.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'enableOCSP.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-view'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'viewCerts2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'viewCerts2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('certs-devices'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'viewSecurityDevices2.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/advanced.dtd',
-                            'viewSecurityDevices2.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_applicationManager.py b/python/l10n/fluent_migrations/bug_1451992_preferences_applicationManager.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_applicationManager.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import EXTERNAL_ARGUMENT
-from fluent.migrate import COPY, REPLACE
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::ApplicationManager to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/applicationManager.ftl',
-        'browser/browser/preferences/applicationManager.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('app-manager-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/applicationManager.dtd',
-                            'appManager.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        COPY(
-                            'browser/chrome/browser/preferences/applicationManager.dtd',
-                            'appManager.style',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-remove'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/applicationManager.dtd',
-                            'remove.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/applicationManager.dtd',
-                            'remove.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-handle-webfeeds'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/applicationManager.properties',
-                    'descriptionApplications',
-                    {
-                        '%S': COPY(
-                            'browser/chrome/browser/preferences/applicationManager.properties',
-                            'handleWebFeeds',
-                        )
-                    }
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-handle-protocol'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/applicationManager.properties',
-                    'descriptionApplications',
-                    {
-                        '%S': REPLACE(
-                            'browser/chrome/browser/preferences/applicationManager.properties',
-                            'handleProtocol',
-                            {
-                                '%S': EXTERNAL_ARGUMENT('type')
-                            }
-                        )
-                    }
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-handle-file'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/applicationManager.properties',
-                    'descriptionApplications',
-                    {
-                        '%S': REPLACE(
-                            'browser/chrome/browser/preferences/applicationManager.properties',
-                            'handleFile',
-                            {
-                                '%S': EXTERNAL_ARGUMENT('type')
-                            }
-                        )
-                    }
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-web-app-info'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/applicationManager.properties',
-                    'descriptionWebApp',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('app-manager-local-app-info'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/applicationManager.properties',
-                    'descriptionLocalApp',
-                ),
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_blocklists.py b/python/l10n/fluent_migrations/bug_1451992_preferences_blocklists.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_blocklists.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE
-from fluent.migrate import COPY, CONCAT, REPLACE
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Blocklists to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/blocklists.ftl',
-        'browser/browser/preferences/blocklists.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('blocklist-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'window.title',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/blocklists.dtd',
-                                'window.width'
-                            )
-                        )
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('blocklist-desc'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'blockliststext',
-                    {
-                        'Firefox': MESSAGE_REFERENCE('-brand-short-name')
-                    },
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('blocklist-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'windowClose.key',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('blocklist-treehead-list'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'treehead.list.label',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('blocklist-button-cancel'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'button.cancel.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'button.cancel.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('blocklist-button-ok'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'button.ok.label',
-                        ),
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/blocklists.dtd',
-                            'button.ok.accesskey',
-                        ),
-                    ),
-                ],
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_clearSiteData.py b/python/l10n/fluent_migrations/bug_1451992_preferences_clearSiteData.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_clearSiteData.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE
-from fluent.migrate import COPY, CONCAT, REPLACE
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::ClearSiteData to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/clearSiteData.ftl',
-        'browser/browser/preferences/clearSiteData.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'window.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/clearSiteData.dtd',
-                                'window.width'
-                            )
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-description'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/clearSiteData.dtd',
-                    'window.description',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-cookies-info'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/clearSiteData.dtd',
-                    'clearSiteData.description'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-cache-info'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/clearSiteData.dtd',
-                    'clearCache.description'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-cancel'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'button.cancel.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'button.cancel.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('clear-site-data-clear'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'button.clear.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/clearSiteData.dtd',
-                            'button.clear.accesskey'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_colors.py b/python/l10n/fluent_migrations/bug_1451992_preferences_colors.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_colors.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Colors to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/colors.ftl',
-        'browser/browser/preferences/colors.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('colors-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'colorsDialog.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        FTL.Pattern(
-                            elements=[
-                                FTL.Placeable(
-                                    expression=FTL.SelectExpression(
-                                        expression=FTL.CallExpression(
-                                            callee=FTL.Function('PLATFORM')
-                                        ),
-                                        variants=[
-                                            FTL.Variant(
-                                                key=FTL.VariantName('macos'),
-                                                default=False,
-                                                value=CONCAT(
-                                                    FTL.TextElement('width: '),
-                                                    COPY(
-                                                        'browser/chrome/browser/preferences/colors.dtd',
-                                                        'window.macWidth'
-                                                    )
-                                                )
-                                            ),
-                                            FTL.Variant(
-                                                key=FTL.VariantName('other'),
-                                                default=True,
-                                                value=CONCAT(
-                                                    FTL.TextElement('width: '),
-                                                    COPY(
-                                                        'browser/chrome/browser/preferences/colors.dtd',
-                                                        'window.width'
-                                                    )
-                                                )
-                                            )
-                                        ]
-                                    )
-                                )
-                            ]
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'toolkit/chrome/global/preferences.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-page-override'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'overrideDefaultPageColors2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'overrideDefaultPageColors2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-page-override-option-always'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'overrideDefaultPageColors.always.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-page-override-option-auto'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'overrideDefaultPageColors.auto.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-page-override-option-never'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'overrideDefaultPageColors.never.label'
-                        ),
-                    ),
-                ],
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-text-and-background'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'color'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-text-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'textColor2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'textColor2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-background'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'backgroundColor2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'backgroundColor2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-use-system'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'useSystemColors.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'useSystemColors.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-underline-links'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'underlineLinks.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'underlineLinks.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-links-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'links'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-unvisited-links'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'linkColor2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'linkColor2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('colors-visited-links'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/colors.dtd',
-                    'visitedLinkColor2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/colors.dtd',
-                            'visitedLinkColor2.accesskey'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_connection.py b/python/l10n/fluent_migrations/bug_1451992_preferences_connection.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_connection.py
+++ /dev/null
@@ -1,466 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Connection to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/connection.ftl',
-        'browser/browser/preferences/connection.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('connection-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'connectionsDialog.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        FTL.Pattern(
-                            elements=[
-                                FTL.Placeable(
-                                    expression=FTL.SelectExpression(
-                                        expression=FTL.CallExpression(
-                                            callee=FTL.Function('PLATFORM')
-                                        ),
-                                        variants=[
-                                            FTL.Variant(
-                                                key=FTL.VariantName('macos'),
-                                                default=False,
-                                                value=CONCAT(
-                                                    FTL.TextElement('width: '),
-                                                    COPY(
-                                                        'browser/chrome/browser/preferences/connection.dtd',
-                                                        'window.macWidth2'
-                                                    )
-                                                )
-                                            ),
-                                            FTL.Variant(
-                                                key=FTL.VariantName('other'),
-                                                default=True,
-                                                value=CONCAT(
-                                                    FTL.TextElement('width: '),
-                                                    COPY(
-                                                        'browser/chrome/browser/preferences/connection.dtd',
-                                                        'window.width2'
-                                                    )
-                                                )
-                                            )
-                                        ]
-                                    )
-                                )
-                            ]
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'toolkit/chrome/global/preferences.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-disable-extension'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/main.dtd',
-                            'disableExtension.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-configure'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'proxyTitle.label2'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-option-no'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'noProxyTypeRadio.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'noProxyTypeRadio.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-option-system'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'systemTypeRadio.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'systemTypeRadio.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-option-auto'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'WPADTypeRadio.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'WPADTypeRadio.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-option-manual'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'manualTypeRadio2.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'manualTypeRadio2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-http'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'http2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'http2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-http-port'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'port2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'HTTPport.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-http-share'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'shareproxy.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'shareproxy.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-ssl'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'ssl2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'ssl2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-ssl-port'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'port2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'SSLport.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-ftp'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'ftp2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'ftp2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-ftp-port'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'port2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'FTPport.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-socks'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'socks2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socks2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-socks-port'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'port2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'SOCKSport.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-socks4'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socks4.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socks4.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-socks5'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socks5.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socks5.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-noproxy'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'noproxy2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'noproxy2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-noproxy-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/connection.dtd',
-                    'noproxyExplain.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-autotype'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'autoTypeRadio2.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'autoTypeRadio2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-reload'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'reload.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'reload.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-autologin'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'autologinproxy.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'autologinproxy.accesskey'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('tooltip'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'autologinproxy.tooltip'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('connection-proxy-socks-remote-dns'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socksRemoteDNS.label2'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/connection.dtd',
-                            'socksRemoteDNS.accesskey'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_fonts.py b/python/l10n/fluent_migrations/bug_1451992_preferences_fonts.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_fonts.py
+++ /dev/null
@@ -1,796 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Fonts to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/fonts.ftl',
-        'browser/browser/preferences/fonts.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('fonts-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'fontsDialog.title'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-window-close'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'toolkit/chrome/global/preferences.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'fonts.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'fonts.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-arabic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.arabic'
-                        )
-                    )
-                ]
-            ),
-
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-armenian'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.armenian'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-bengali'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.bengali'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-simpl-chinese'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.simpl-chinese'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-trad-chinese-hk'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.trad-chinese-hk'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-trad-chinese'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.trad-chinese'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-cyrillic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.cyrillic'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-devanagari'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.devanagari'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-ethiopic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.ethiopic'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-georgian'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.georgian'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-el'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.el'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-gujarati'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.gujarati'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-gurmukhi'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.gurmukhi'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-japanese'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.japanese'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-hebrew'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.hebrew'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-kannada'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.kannada'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-khmer'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.khmer'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-korean'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.korean'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-latin'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.latin'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-malayalam'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.malayalam'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-math'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.math'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-odia'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.odia'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-sinhala'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.sinhala'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-tamil'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.tamil'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-telugu'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.telugu'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-thai'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.thai'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-tibetan'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.tibetan'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-canadian'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.canadian'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-langgroup-other'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'font.langGroup.other'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-proportional-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'proportional2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'proportional2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-default-serif'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'useDefaultFontSerif.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-default-sans-serif'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'useDefaultFontSansSerif.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-proportional-size'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'size2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'sizeProportional.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-serif'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'serif2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'serif2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-sans-serif'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'sans-serif2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'sans-serif2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-monospace'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'monospace2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'monospace2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-monospace-size'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'size2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'sizeMonospace.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-minsize'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'minSize2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'minSize2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-minsize-none'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'minSize.none'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-allow-own'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'allowPagesToUseOwn.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'allowPagesToUseOwn.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'languages.customize.Fallback2.grouplabel'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'languages.customize.Fallback2.desc'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-label'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/fonts.dtd',
-                    'languages.customize.Fallback3.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback3.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-auto'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.auto'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-arabic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.arabic'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-baltic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.baltic'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-ceiso'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.ceiso'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-cewindows'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.cewindows'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-simplified'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.simplified'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-traditional'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.traditional'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-cyrillic'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.cyrillic'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-greek'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.greek'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-hebrew'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.hebrew'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-japanese'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.japanese'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-korean'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.korean'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-thai'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.thai'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-turkish'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.turkish'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-vietnamese'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.vietnamese'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('fonts-languages-fallback-name-other'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/fonts.dtd',
-                            'languages.customize.Fallback.other'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_languages.py b/python/l10n/fluent_migrations/bug_1451992_preferences_languages.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_languages.py
+++ /dev/null
@@ -1,159 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Languages to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/languages.ftl',
-        'browser/browser/preferences/languages.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('languages-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.Header'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/languages.dtd',
-                                'window.width'
-                            )
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'toolkit/chrome/global/preferences.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-description'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/languages.dtd',
-                    'languages.customize2.description'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-spoof-english'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.spoofEnglish'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-moveup'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.moveUp.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.moveUp.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-movedown'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.moveDown.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.moveDown.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-remove'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.deleteButton.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.deleteButton.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-select-language'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('placeholder'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.selectLanguage.label'
-                        )
-                    ),
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('languages-customize-add'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.addButton.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/languages.dtd',
-                            'languages.customize.addButton.accesskey'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_permissions.py b/python/l10n/fluent_migrations/bug_1451992_preferences_permissions.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_permissions.py
+++ /dev/null
@@ -1,237 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Permissions to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/permissions.ftl',
-        'browser/browser/preferences/permissions.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('permissions-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'window.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/permissions.dtd',
-                                'window.width'
-                            )
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-address'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/permissions.dtd',
-                    'address2.label'
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'address2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-block'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'block.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'block.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-session'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'session.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'session.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-allow'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'allow.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'allow.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-site-name'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'treehead.sitename2.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-status'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'treehead.status.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-remove'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'removepermission2.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'removepermission2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-remove-all'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'removeallpermissions2.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'removeallpermissions2.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-button-cancel'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'button.cancel.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'button.cancel.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-button-ok'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'button.ok.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'button.ok.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('permissions-searchbox'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('placeholder'),
-                        COPY(
-                            'browser/chrome/browser/preferences/permissions.dtd',
-                            'searchbox.placeholder'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_selectbookmark.py b/python/l10n/fluent_migrations/bug_1451992_preferences_selectbookmark.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_selectbookmark.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Select Bookmark to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/selectBookmark.ftl',
-        'browser/browser/preferences/selectBookmark.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('select-bookmark-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/selectBookmark.dtd',
-                            'selectBookmark.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: 32em;')
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('select-bookmark-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/selectBookmark.dtd',
-                    'selectBookmark.label'
-                )
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_sitedata.py b/python/l10n/fluent_migrations/bug_1451992_preferences_sitedata.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_sitedata.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Site Data to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/siteDataSettings.ftl',
-        'browser/browser/preferences/siteDataSettings.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('site-data-settings-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'window2.title'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-search-textbox'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('placeholder'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'searchTextboxPlaceHolder'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'searchTextboxPlaceHolder.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-column-host'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'hostCol.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-column-cookies'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'cookiesCol.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-column-storage'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'usageCol.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-column-last-used'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'lastAccessedCol.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-remove-selected'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'removeSelected.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'removeSelected.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-button-cancel'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'cancel.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'cancel.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-button-save'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'save.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                            'save.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-removing-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        CONCAT(
-                            MESSAGE_REFERENCE('site-data-removing-header'),
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-removing-header'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                    'removingDialog1.title'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-removing-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                    'removingSelected1.description'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('site-data-removing-table'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/siteDataSettings.dtd',
-                    'siteTree3.label'
-                )
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1451992_preferences_translation.py b/python/l10n/fluent_migrations/bug_1451992_preferences_translation.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1451992_preferences_translation.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import COPY, CONCAT
-
-def migrate(ctx):
-    """Bug 1451992 - Migrate Preferences::Subdialogs::Translation to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/translation.ftl',
-        'browser/browser/preferences/translation.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('translation-window'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('title'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'window.title'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('style'),
-                        CONCAT(
-                            FTL.TextElement('width: '),
-                            COPY(
-                                'browser/chrome/browser/preferences/translation.dtd',
-                                'window.width'
-                            )
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-close-key'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('key'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'windowClose.key'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-languages-disabled-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/translation.dtd',
-                    'noTranslationForLanguages2.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-languages-column'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'treehead.languageName.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-languages-button-remove'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeLanguage.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeLanguage.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-languages-button-remove-all'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeAllLanguages.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeAllLanguages.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-sites-disabled-desc'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/translation.dtd',
-                    'noTranslationForSites2.label'
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-sites-column'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'treehead.siteName2.label'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-sites-button-remove'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeSite.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeSite.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-sites-button-remove-all'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeAllSites.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'removeAllSites.accesskey'
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('translation-button-close'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'button.close.label'
-                        )
-                    ),
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/translation.dtd',
-                            'button.close.accesskey'
-                        )
-                    )
-                ]
-            )
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1453480_preferences_dom2_resources.py b/python/l10n/fluent_migrations/bug_1453480_preferences_dom2_resources.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1453480_preferences_dom2_resources.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import MESSAGE_REFERENCE, EXTERNAL_ARGUMENT
-from fluent.migrate import COPY, CONCAT, REPLACE
-
-def migrate(ctx):
-    """Bug 1453480 - Migrate Fluent resources to use DOM Overlays, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('search-results-empty-message'),
-                value=FTL.Pattern(
-                    elements=[
-                        FTL.Placeable(
-                            expression=FTL.SelectExpression(
-                                expression=FTL.CallExpression(
-                                    callee=FTL.Function('PLATFORM')
-                                ),
-                                variants=[
-                                    FTL.Variant(
-                                        key=FTL.VariantName('windows'),
-                                        default=False,
-                                        value=REPLACE(
-                                            'browser/chrome/browser/preferences/preferences.properties',
-                                            'searchResults.sorryMessageWin',
-                                            {
-                                                '%S': FTL.TextElement('<span data-l10n-name="query"></span>')
-                                            }
-                                        )
-                                    ),
-                                    FTL.Variant(
-                                        key=FTL.VariantName('other'),
-                                        default=True,
-                                        value=REPLACE(
-                                            'browser/chrome/browser/preferences/preferences.properties',
-                                            'searchResults.sorryMessageUnix',
-                                            {
-                                                '%S': FTL.TextElement('<span data-l10n-name="query"></span>')
-                                            }
-                                        )
-                                    )
-                                ]
-                            )
-                        )
-                    ]
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('search-results-help-link'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'searchResults.needHelp3',
-                    {
-                        '%S': CONCAT(
-                            FTL.TextElement('<a data-l10n-name="url">'),
-                            REPLACE(
-                                'browser/chrome/browser/preferences/preferences.properties',
-                                'searchResults.needHelpSupportLink',
-                                {
-                                    '%S': MESSAGE_REFERENCE('-brand-short-name'),
-                                }
-                            ),
-                            FTL.TextElement('</a>')
-                        )
-                    }
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('update-application-version'),
-                value=CONCAT(
-                    COPY(
-                        'browser/chrome/browser/preferences/advanced.dtd',
-                        'updateApplication.version.pre'
-                    ),
-                    EXTERNAL_ARGUMENT('version'),
-                    COPY(
-                        'browser/chrome/browser/preferences/advanced.dtd',
-                        'updateApplication.version.post'
-                    ),
-                    FTL.TextElement(' <a data-l10n-name="learn-more">'),
-                    COPY(
-                        'browser/chrome/browser/aboutDialog.dtd',
-                        'releaseNotes.link'
-                    ),
-                    FTL.TextElement('</a>')
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('performance-limit-content-process-blocked-desc'),
-                value=CONCAT(
-                    REPLACE(
-                        'browser/chrome/browser/preferences/advanced.dtd',
-                        'limitContentProcessOption.disabledDescription',
-                        {
-                            '&brandShortName;': MESSAGE_REFERENCE('-brand-short-name')
-                        }
-                    ),
-                    FTL.TextElement(' <a data-l10n-name="learn-more">'),
-                    COPY(
-                        'browser/chrome/browser/preferences/advanced.dtd',
-                        'limitContentProcessOption.disabledDescriptionLink'
-                    ),
-                    FTL.TextElement('</a>')
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('tracking-desc'),
-                value=CONCAT(
-                    COPY(
-                        'browser/chrome/browser/preferences/privacy.dtd',
-                        'trackingProtection3.description'
-                    ),
-                    FTL.TextElement(' <a data-l10n-name="learn-more">'),
-                    COPY(
-                        'browser/chrome/browser/preferences/privacy.dtd',
-                        'trackingProtectionLearnMore2.label'
-                    ),
-                    FTL.TextElement('</a>')
-                )
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1453540_preferences_remaining_dtd.py b/python/l10n/fluent_migrations/bug_1453540_preferences_remaining_dtd.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1453540_preferences_remaining_dtd.py
+++ /dev/null
@@ -1,140 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.transforms import REPLACE
-from fluent.migrate.helpers import MESSAGE_REFERENCE
-from fluent.migrate import COPY, CONCAT
-
-
-# Custom extension of the CONCAT migration tailored to concat
-# two strings separated by a placeable.
-class CONCAT_BEFORE_AFTER(CONCAT):
-    def __call__(self, ctx):
-        assert len(self.elements) == 3
-        pattern_before, middle, pattern_after = self.elements
-        elem_before = pattern_before.elements[0]
-        elem_after = pattern_after.elements[0]
-
-        if isinstance(elem_before, FTL.TextElement) and \
-           len(elem_before.value) > 0 and \
-           elem_before.value[-1] != " ":
-            elem_before.value += " "
-        if isinstance(elem_after, FTL.TextElement) and \
-           len(elem_after.value) > 0 and \
-           elem_after.value[0] != " ":
-            elem_after.value = " " + elem_after.value
-        return super(CONCAT_BEFORE_AFTER, self).__call__(ctx)
-
-def migrate(ctx):
-    """Bug 1453540 - Migrate remaining DTDs in Preferences to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('translate-attribution'),
-                value=CONCAT_BEFORE_AFTER(
-                    COPY(
-                        'browser/chrome/browser/preferences/content.dtd',
-                        'translation.options.attribution.beforeLogo',
-                    ),
-                    FTL.TextElement('<img data-l10n-name="logo"/>'),
-                    COPY(
-                        'browser/chrome/browser/preferences/content.dtd',
-                        'translation.options.attribution.afterLogo',
-                    ),
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('sync-mobile-promo'),
-                value=CONCAT(
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'mobilePromo3.start',
-                    ),
-                    FTL.TextElement('<img data-l10n-name="android-icon"/> <a data-l10n-name="android-link">'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'mobilePromo3.androidLink',
-                    ),
-                    FTL.TextElement('</a>'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'mobilePromo3.iOSBefore',
-                    ),
-                    FTL.TextElement('<img data-l10n-name="ios-icon"/> <a data-l10n-name="ios-link">'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'mobilePromo3.iOSLink',
-                    ),
-                    FTL.TextElement('</a>'),
-                    COPY(
-                        'browser/chrome/browser/preferences/sync.dtd',
-                        'mobilePromo3.end',
-                    ),
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-label'),
-                value=REPLACE(
-                    'browser/chrome/browser/preferences/privacy.dtd',
-                    'historyHeader2.pre.label',
-                    {
-                        '&brandShortName;': MESSAGE_REFERENCE(
-                            '-brand-short-name'
-                        )
-                    }
-                ),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('accesskey'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'historyHeader2.pre.accesskey',
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-option-all'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'historyHeader.remember.label',
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-option-never'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'historyHeader.dontremember.label',
-                        )
-                    )
-                ]
-            ),
-            FTL.Message(
-                id=FTL.Identifier('history-remember-option-custom'),
-                attributes=[
-                    FTL.Attribute(
-                        FTL.Identifier('label'),
-                        COPY(
-                            'browser/chrome/browser/preferences/privacy.dtd',
-                            'historyHeader.custom.label',
-                        )
-                    )
-                ]
-            ),
-        ]
-    )
diff --git a/python/l10n/fluent_migrations/bug_1453800_container_removal.py b/python/l10n/fluent_migrations/bug_1453800_container_removal.py
deleted file mode 100644
--- a/python/l10n/fluent_migrations/bug_1453800_container_removal.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# coding=utf8
-
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import EXTERNAL_ARGUMENT
-from fluent.migrate import COPY
-from fluent.migrate.transforms import PLURALS, REPLACE_IN_TEXT
-
-
-def migrate(ctx):
-    """Bug 1453800 - Migrate Container removal strings to Fluent, part {index}."""
-
-    ctx.add_transforms(
-        'browser/browser/preferences/preferences.ftl',
-        'browser/browser/preferences/preferences.ftl',
-        [
-            FTL.Message(
-                id=FTL.Identifier('containers-remove-alert-title'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'removeContainerAlertTitle',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-remove-alert-msg'),
-                value=PLURALS(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'removeContainerMsg',
-                    EXTERNAL_ARGUMENT('count'),
-                    lambda text: REPLACE_IN_TEXT(
-                        text,
-                        {
-                            '#S': EXTERNAL_ARGUMENT('count')
-                        }
-                    )
-                )
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-remove-ok-button'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'removeContainerOkButton',
-                ),
-            ),
-            FTL.Message(
-                id=FTL.Identifier('containers-remove-cancel-button'),
-                value=COPY(
-                    'browser/chrome/browser/preferences/preferences.properties',
-                    'removeContainerButton2',
-                ),
-            ),
-        ]
-    )
diff --git a/python/mozboot/bin/bootstrap-msys2.vbs b/python/mozboot/bin/bootstrap-msys2.vbs
--- a/python/mozboot/bin/bootstrap-msys2.vbs
+++ b/python/mozboot/bin/bootstrap-msys2.vbs
@@ -67,11 +67,11 @@
 
 ' Install ConEmu
 ' Download installer
 On Error Resume Next
 Download "https://conemu.github.io/install2.ps1", "install2.ps1"
-conemuSettingsURI = "https://api.pub.build.mozilla.org/tooltool/sha512/9aa384ecc8025a974999e913c83064b3b797e05d19806e62ef558c8300e4c3f72967e9464ace59759f76216fc2fc66f338a1e5cdea3b9aa264529487f091d929"
+conemuSettingsURI = "https://tooltool.mozilla-releng.net/sha512/9aa384ecc8025a974999e913c83064b3b797e05d19806e62ef558c8300e4c3f72967e9464ace59759f76216fc2fc66f338a1e5cdea3b9aa264529487f091d929"
 ' Run installer
 errorCode = shell.Run("powershell.exe -NoProfile -ExecutionPolicy Unrestricted set dst '" & conemuPath & "'; set ver 'stable'; set lnk 'Mozilla Development Shell'; set xml '" & conemuSettingsURI & "'; set run $FALSE; .\install2.ps1", 0, true)
 ' Delete ConEmu installer
 fso.DeleteFile("install2.ps1")
 If Err.Number <> 0 Then
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1673,11 +1673,11 @@
         # Flag header-filter is passed to 'run-clang-tidy' in order to limit
         # the diagnostic messages only to the specified header files.
         # When no value is specified the default value is considered to be the source
         # in order to limit the dianostic message to the source files or folders.
         common_args.append('-header-filter=%s' %
-                           (header_filter if len(header_filter) else ''.join(source)))
+                           (header_filter if len(header_filter) else '|'.join(source)))
 
         if fix:
             common_args.append('-fix')
 
         compile_db = json.loads(open(self._compile_db, 'r').read())
@@ -1690,11 +1690,11 @@
 
         if not total:
             return 0
 
         args = [python, self._run_clang_tidy_path, '-p', self.topobjdir]
-        args += ['-j', str(jobs)] + source + common_args
+        args += ['-j', str(jobs)] + common_args + source
         cwd = self.topobjdir
 
         monitor = StaticAnalysisMonitor(self.topsrcdir, self.topobjdir, total)
 
         footer = StaticAnalysisFooter(self.log_manager.terminal, monitor)
diff --git a/security/sandbox/win/SandboxInitialization.cpp b/security/sandbox/win/SandboxInitialization.cpp
--- a/security/sandbox/win/SandboxInitialization.cpp
+++ b/security/sandbox/win/SandboxInitialization.cpp
@@ -13,20 +13,21 @@
 
 namespace mozilla {
 namespace sandboxing {
 
 typedef BOOL(WINAPI* CloseHandle_func) (HANDLE hObject);
-static CloseHandle_func stub_CloseHandle = nullptr;
+static WindowsDllInterceptor::FuncHookType<CloseHandle_func> stub_CloseHandle;
 
 typedef BOOL(WINAPI* DuplicateHandle_func)(HANDLE hSourceProcessHandle,
                                            HANDLE hSourceHandle,
                                            HANDLE hTargetProcessHandle,
                                            LPHANDLE lpTargetHandle,
                                            DWORD dwDesiredAccess,
                                            BOOL bInheritHandle,
                                            DWORD dwOptions);
-static DuplicateHandle_func stub_DuplicateHandle = nullptr;
+static WindowsDllInterceptor::FuncHookType<DuplicateHandle_func>
+  stub_DuplicateHandle;
 
 static BOOL WINAPI
 patched_CloseHandle(HANDLE hObject)
 {
   // Check all handles being closed against the sandbox's tracked handles.
@@ -60,21 +61,18 @@
 static bool
 EnableHandleCloseMonitoring()
 {
   Kernel32Intercept.Init("kernel32.dll");
   bool hooked =
-    Kernel32Intercept.AddHook("CloseHandle",
-                              reinterpret_cast<intptr_t>(patched_CloseHandle),
-                              (void**)&stub_CloseHandle);
+    stub_CloseHandle.Set(Kernel32Intercept, "CloseHandle", &patched_CloseHandle);
   if (!hooked) {
     return false;
   }
 
   hooked =
-    Kernel32Intercept.AddHook("DuplicateHandle",
-                              reinterpret_cast<intptr_t>(patched_DuplicateHandle),
-                              (void**)&stub_DuplicateHandle);
+    stub_DuplicateHandle.Set(Kernel32Intercept, "DuplicateHandle",
+                             &patched_DuplicateHandle);
   if (!hooked) {
     return false;
   }
 
   return true;
diff --git a/services/fxaccounts/FxAccounts.jsm b/services/fxaccounts/FxAccounts.jsm
--- a/services/fxaccounts/FxAccounts.jsm
+++ b/services/fxaccounts/FxAccounts.jsm
@@ -24,12 +24,12 @@
   "resource://services-crypto/jwcrypto.jsm");
 
 ChromeUtils.defineModuleGetter(this, "FxAccountsOAuthGrantClient",
   "resource://gre/modules/FxAccountsOAuthGrantClient.jsm");
 
-ChromeUtils.defineModuleGetter(this, "FxAccountsMessages",
-  "resource://gre/modules/FxAccountsMessages.js");
+ChromeUtils.defineModuleGetter(this, "FxAccountsCommands",
+  "resource://gre/modules/FxAccountsCommands.js");
 
 ChromeUtils.defineModuleGetter(this, "FxAccountsProfile",
   "resource://gre/modules/FxAccountsProfile.jsm");
 
 ChromeUtils.defineModuleGetter(this, "Utils",
@@ -42,10 +42,11 @@
 var publicProperties = [
   "_withCurrentAccountState", // fxaccounts package only!
   "accountStatus",
   "canGetKeys",
   "checkVerificationStatus",
+  "commands",
   "getAccountsClient",
   "getAssertion",
   "getDeviceId",
   "getDeviceList",
   "getKeys",
@@ -59,11 +60,10 @@
   "handleEmailUpdated",
   "hasLocalSession",
   "invalidateCertificate",
   "loadAndPoll",
   "localtimeOffsetMsec",
-  "messages",
   "notifyDevices",
   "now",
   "removeCachedOAuthToken",
   "resendVerificationEmail",
   "resetCredentials",
@@ -410,26 +410,26 @@
       });
     }
     return this._profile;
   },
 
-  _messages: null,
-  get messages() {
-    if (!this._messages) {
-      this._messages = new FxAccountsMessages(this);
+  _commands: null,
+  get commands() {
+    if (!this._commands) {
+      this._commands = new FxAccountsCommands(this);
     }
-    return this._messages;
+    return this._commands;
   },
 
   // A hook-point for tests who may want a mocked AccountState or mocked storage.
   newAccountState(credentials) {
     let storage = new FxAccountsStorageManager();
     storage.initialize(credentials);
     return new AccountState(storage);
   },
 
-  // "Friend" classes of FxAccounts (e.g. FxAccountsMessages) know about the
+  // "Friend" classes of FxAccounts (e.g. FxAccountsCommands) know about the
   // "current account state" system. This method allows them to read and write
   // safely in it.
   // Example of usage:
   // fxAccounts._withCurrentAccountState(async (getUserData, updateUserData) => {
   //   const userData = await getUserData(['device']);
@@ -604,13 +604,13 @@
     await currentAccountState.promiseInitialized;
     // Starting point for polling if new user
     if (!this.isUserEmailVerified(credentials)) {
       this.startVerifiedCheck(credentials);
     }
-    await this.updateDeviceRegistration();
     Services.telemetry.getHistogramById("FXA_CONFIGURED").add(1);
     await this.notifyObservers(ONLOGIN_NOTIFICATION);
+    await this.updateDeviceRegistration();
     return currentAccountState.resolve();
   },
 
   /**
    * Update account data for the currently signed in user.
@@ -704,21 +704,28 @@
         }
       });
       data = await this.currentAccountState.getUserAccountData();
     }
     const {device} = data;
-    if (!device || !device.registrationVersion ||
-        device.registrationVersion < this.DEVICE_REGISTRATION_VERSION) {
-      // There is no device registered or the device registration is outdated.
-      // Either way, we should register the device with FxA
-      // before returning the id to the caller.
+    if ((await this.checkDeviceUpdateNeeded(device))) {
       return this._registerOrUpdateDevice(data);
     }
     // Return the device id that we already registered with the server.
     return device.id;
   },
 
+  async checkDeviceUpdateNeeded(device) {
+    // There is no device registered or the device registration is outdated.
+    // Either way, we should register the device with FxA
+    // before returning the id to the caller.
+    const availableCommandsKeys = Object.keys((await this.availableCommands())).sort();
+    return !device || !device.registrationVersion ||
+           device.registrationVersion < this.DEVICE_REGISTRATION_VERSION ||
+           !device.registeredCommandsKeys ||
+           !CommonUtils.arrayEqual(device.registeredCommandsKeys, availableCommandsKeys);
+  },
+
   async getDeviceList() {
     const accountData = await this._getVerifiedAccountOrReject();
     const devices = await this.fxAccountsClient.getDeviceList(accountData.sessionToken);
 
     // Check if our push registration is still good.
@@ -765,12 +772,12 @@
     }
     if (this._profile) {
       this._profile.tearDown();
       this._profile = null;
     }
-    if (this._messages) {
-      this._messages = null;
+    if (this._commands) {
+      this._commands = null;
     }
     // We "abort" the accountState and assume our caller is about to throw it
     // away and replace it with a new one.
     return this.currentAccountState.abort();
   },
@@ -1047,10 +1054,13 @@
     await currentState.updateUserAccountData(updateData);
     // We are now ready for business. This should only be invoked once
     // per setSignedInUser(), regardless of whether we've rebooted since
     // setSignedInUser() was called.
     await this.notifyObservers(ONVERIFIED_NOTIFICATION);
+    // Some parts of the device registration depend on the Sync keys being available,
+    // so let's re-trigger it now that we have them.
+    await this.updateDeviceRegistration();
     data = await currentState.getUserAccountData();
     return currentState.resolve(data);
   },
 
   _deriveKeys(uid, kBbytes) {
@@ -1681,17 +1691,21 @@
   // @returns Promise<Subscription>.
   getPushSubscription() {
     return this.fxaPushService.getSubscription();
   },
 
-  // Once FxA messages is stable, remove this, hardcode the capabilities,
-  // and reset the device registration version.
-  get deviceCapabilities() {
-    if (Services.prefs.getBoolPref("identity.fxaccounts.messages.enabled", true)) {
-      return [CAPABILITY_MESSAGES, CAPABILITY_MESSAGES_SENDTAB];
+  async availableCommands() {
+    if (!Services.prefs.getBoolPref("identity.fxaccounts.commands.enabled", true)) {
+      return {};
+    }
+    const sendTabKey = await this.commands.sendTab.getEncryptedKey();
+    if (!sendTabKey) { // This will happen if the account is not verified yet.
+      return {};
     }
-    return [];
+    return {
+      [COMMAND_SENDTAB]: sendTabKey
+    };
   },
 
   // If you change what we send to the FxA servers during device registration,
   // you'll have to bump the DEVICE_REGISTRATION_VERSION number to force older
   // devices to re-register when Firefox updates
@@ -1714,11 +1728,12 @@
         if (publicKey && authKey) {
           deviceOptions.pushPublicKey = urlsafeBase64Encode(publicKey);
           deviceOptions.pushAuthKey = urlsafeBase64Encode(authKey);
         }
       }
-      deviceOptions.capabilities = this.deviceCapabilities;
+      deviceOptions.availableCommands = await this.availableCommands();
+      const availableCommandsKeys = Object.keys(deviceOptions.availableCommands).sort();
 
       let device;
       if (currentDevice && currentDevice.id) {
         log.debug("updating existing device details");
         device = await this.fxAccountsClient.updateDevice(
@@ -1727,15 +1742,18 @@
         log.debug("registering new device details");
         device = await this.fxAccountsClient.registerDevice(
           sessionToken, deviceName, this._getDeviceType(), deviceOptions);
       }
 
+      // Get the freshest device props before updating them.
+      let {device: deviceProps} = await this.getSignedInUser();
       await this.currentAccountState.updateUserAccountData({
         device: {
-          ...currentDevice, // Copy the other properties (e.g. messagesIndex).
+          ...deviceProps, // Copy the other properties (e.g. handledCommands).
           id: device.id,
-          registrationVersion: this.DEVICE_REGISTRATION_VERSION
+          registrationVersion: this.DEVICE_REGISTRATION_VERSION,
+          registeredCommandsKeys: availableCommandsKeys,
         }
       });
       return device.id;
     } catch (error) {
       return this._handleDeviceError(error, sessionToken);
diff --git a/services/fxaccounts/FxAccountsClient.jsm b/services/fxaccounts/FxAccountsClient.jsm
--- a/services/fxaccounts/FxAccountsClient.jsm
+++ b/services/fxaccounts/FxAccountsClient.jsm
@@ -379,10 +379,12 @@
    *         Device name
    * @param  type
    *         Device type (mobile|desktop)
    * @param  [options]
    *         Extra device options
+   * @param  [options.availableCommands]
+   *         Available commands for this device
    * @param  [options.pushCallback]
    *         `pushCallback` push endpoint callback
    * @param  [options.pushPublicKey]
    *         `pushPublicKey` push public key (URLSafe Base64 string)
    * @param  [options.pushAuthKey]
@@ -407,10 +409,11 @@
     }
     if (options.pushPublicKey && options.pushAuthKey) {
       body.pushPublicKey = options.pushPublicKey;
       body.pushAuthKey = options.pushAuthKey;
     }
+    body.availableCommands = options.availableCommands;
 
     return this._request(path, "POST", creds, body);
   },
 
   /**
@@ -445,49 +448,49 @@
     return this._request("/account/devices/notify", "POST",
       deriveHawkCredentials(sessionTokenHex, "sessionToken"), body);
   },
 
   /**
-   * Retrieves messages from our device's message box.
+   * Retrieves pending commands for our device.
    *
-   * @method getMessages
+   * @method getCommands
    * @param  sessionTokenHex - Session token obtained from signIn
    * @param  [index] - If specified, only messages received after the one who
    *                   had that index will be retrieved.
    * @param  [limit] - Maximum number of messages to retrieve.
    */
-  getMessages(sessionTokenHex, {index, limit}) {
+  getCommands(sessionTokenHex, {index, limit}) {
     const params = new URLSearchParams();
     if (index != undefined) {
       params.set("index", index);
     }
     if (limit != undefined) {
       params.set("limit", limit);
     }
-    const path = `/account/device/messages?${params.toString()}`;
+    const path = `/account/device/commands?${params.toString()}`;
     return this._request(path, "GET",
       deriveHawkCredentials(sessionTokenHex, "sessionToken"));
   },
 
   /**
-   * Stores a message in the recipient's message box.
+   * Invokes a command on another device.
    *
-   * @method sendMessage
+   * @method invokeCommand
    * @param  sessionTokenHex - Session token obtained from signIn
-   * @param  topic
-   * @param  to - Recipient device ID.
-   * @param  data
+   * @param  command - Name of the command to invoke
+   * @param  target - Recipient device ID.
+   * @param  payload
    * @return Promise
    *         Resolves to the request's response, (which should be an empty object)
    */
-  sendMessage(sessionTokenHex, topic, to, data) {
+  invokeCommand(sessionTokenHex, command, target, payload) {
     const body = {
-      topic,
-      to,
-      data
+      command,
+      target,
+      payload
     };
-    return this._request("/account/devices/messages", "POST",
+    return this._request("/account/devices/invoke_command", "POST",
       deriveHawkCredentials(sessionTokenHex, "sessionToken"), body);
   },
 
   /**
    * Update the session or name for an existing device
@@ -499,12 +502,12 @@
    *         Device identifier
    * @param  name
    *         Device name
    * @param  [options]
    *         Extra device options
-   * @param  options.capabilities
-   *         Device capabilities
+   * @param  [options.availableCommands]
+   *         Available commands for this device
    * @param  [options.pushCallback]
    *         `pushCallback` push endpoint callback
    * @param  [options.pushPublicKey]
    *         `pushPublicKey` push public key (URLSafe Base64 string)
    * @param  [options.pushAuthKey]
@@ -526,11 +529,11 @@
     }
     if (options.pushPublicKey && options.pushAuthKey) {
       body.pushPublicKey = options.pushPublicKey;
       body.pushAuthKey = options.pushAuthKey;
     }
-    body.capabilities = options.capabilities;
+    body.availableCommands = options.availableCommands;
 
     return this._request(path, "POST", creds, body);
   },
 
   /**
diff --git a/services/fxaccounts/FxAccountsCommands.js b/services/fxaccounts/FxAccountsCommands.js
new file mode 100644
--- /dev/null
+++ b/services/fxaccounts/FxAccountsCommands.js
@@ -0,0 +1,302 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.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 EXPORTED_SYMBOLS = ["SendTab", "FxAccountsCommands"];
+
+ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
+ChromeUtils.import("resource://gre/modules/Preferences.jsm");
+ChromeUtils.defineModuleGetter(this, "PushCrypto",
+  "resource://gre/modules/PushCrypto.jsm");
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://services-common/observers.js");
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  BulkKeyBundle: "resource://services-sync/keys.js",
+  CommonUtils: "resource://services-common/utils.js",
+  CryptoUtils: "resource://services-crypto/utils.js",
+  CryptoWrapper: "resource://services-sync/record.js",
+});
+
+class FxAccountsCommands {
+  constructor(fxAccounts) {
+    this._fxAccounts = fxAccounts;
+    this.sendTab = new SendTab(this, fxAccounts);
+  }
+
+  async invoke(command, device, payload) {
+    const userData = await this._fxAccounts.getSignedInUser();
+    if (!userData) {
+      throw new Error("No user.");
+    }
+    const {sessionToken} = userData;
+    if (!sessionToken) {
+      throw new Error("_send called without a session token.");
+    }
+    const client = this._fxAccounts.getAccountsClient();
+    await client.invokeCommand(sessionToken, command, device.id, payload);
+    log.info(`Payload sent to device ${device.id}.`);
+  }
+
+  async consumeRemoteCommand(index) {
+    if (!Services.prefs.getBoolPref("identity.fxaccounts.commands.enabled", true)) {
+      return false;
+    }
+    log.info(`Consuming command with index ${index}.`);
+    const {messages} = await this._fetchRemoteCommands(index, 1);
+    if (messages.length != 1) {
+      log.warn(`Should have retrieved 1 and only 1 message, got ${messages.length}.`);
+    }
+    return this._fxAccounts._withCurrentAccountState(async (getUserData, updateUserData) => {
+      const {device} = await getUserData(["device"]);
+      if (!device) {
+        throw new Error("No device registration.");
+      }
+      const handledCommands = (device.handledCommands || []).concat(messages.map(m => m.index));
+      await updateUserData({
+        device: {...device, handledCommands}
+      });
+      await this._handleCommands(messages);
+
+      // Once the handledCommands array length passes a threshold, check the
+      // potentially missed remote commands in order to clear it.
+      if (handledCommands.length > 20) {
+        await this.fetchMissedRemoteCommands();
+      }
+    });
+  }
+
+  fetchMissedRemoteCommands() {
+    if (!Services.prefs.getBoolPref("identity.fxaccounts.commands.enabled", true)) {
+      return false;
+    }
+    log.info(`Consuming missed commands.`);
+    return this._fxAccounts._withCurrentAccountState(async (getUserData, updateUserData) => {
+      const {device} = await getUserData(["device"]);
+      if (!device) {
+        throw new Error("No device registration.");
+      }
+      const lastCommandIndex = device.lastCommandIndex || 0;
+      const handledCommands = device.handledCommands || [];
+      handledCommands.push(lastCommandIndex); // Because the server also returns this command.
+      const {index, messages} = await this._fetchRemoteCommands(lastCommandIndex);
+      const missedMessages = messages.filter(m => !handledCommands.includes(m.index));
+      await updateUserData({
+        device: {...device, lastCommandIndex: index, handledCommands: []}
+      });
+      if (missedMessages.length) {
+        log.info(`Handling ${missedMessages.length} missed messages`);
+        await this._handleCommands(missedMessages);
+      }
+    });
+  }
+
+  async _fetchRemoteCommands(index, limit = null) {
+    const userData = await this._fxAccounts.getSignedInUser();
+    if (!userData) {
+      throw new Error("No user.");
+    }
+    const {sessionToken} = userData;
+    if (!sessionToken) {
+      throw new Error("No session token.");
+    }
+    const client = this._fxAccounts.getAccountsClient();
+    const opts = {index};
+    if (limit != null) {
+      opts.limit = limit;
+    }
+    return client.getCommands(sessionToken, opts);
+  }
+
+  async _handleCommands(messages) {
+    const fxaDevices = await this._fxAccounts.getDeviceList();
+    for (const {data} of messages) {
+      let {command, payload, sender} = data;
+      if (sender) {
+        sender = fxaDevices.find(d => d.id == sender);
+      }
+      switch (command) {
+        case COMMAND_SENDTAB:
+          try {
+            await this.sendTab.handle(sender, payload);
+          } catch (e) {
+            log.error(`Error while handling incoming Send Tab payload.`, e);
+          }
+        default:
+          log.info(`Unknown command: ${command}.`);
+      }
+    }
+  }
+}
+
+/**
+ * Send Tab is built on top of FxA commands.
+ *
+ * Devices exchange keys wrapped in kSync between themselves (getEncryptedKey)
+ * during the device registration flow. The FxA server can theorically never
+ * retrieve the send tab keys since it doesn't know kSync.
+ */
+class SendTab {
+  constructor(commands, fxAccounts) {
+    this._commands = commands;
+    this._fxAccounts = fxAccounts;
+  }
+  /**
+   * @param {Device[]} to - Device objects (typically returned by fxAccounts.getDevicesList()).
+   * @param {Object} tab
+   * @param {string} tab.url
+   * @param {string} tab.title
+   * @returns A report object, in the shape of
+   *          {succeded: [Device], error: [{device: Device, error: Exception}]}
+   */
+  async send(to, tab) {
+    log.info(`Sending a tab to ${to.length} devices.`);
+    const encoder = new TextEncoder("utf8");
+    const data = {
+      entries: [{title: tab.title, url: tab.url}]
+    };
+    const bytes = encoder.encode(JSON.stringify(data));
+    const report = {
+      succeeded: [],
+      failed: [],
+    };
+    for (let device of to) {
+      try {
+        const encrypted = await this._encrypt(bytes, device);
+        const payload = {encrypted};
+        await this._commands.invoke(COMMAND_SENDTAB, device, payload); // FxA needs an object.
+        report.succeeded.push(device);
+      } catch (error) {
+        log.error("Error while invoking a send tab command.", error);
+        report.failed.push({device, error});
+      }
+    }
+    return report;
+  }
+
+  // Returns true if the target device is compatible with FxA Commands Send tab.
+  async isDeviceCompatible(device) {
+    if (!Services.prefs.getBoolPref("identity.fxaccounts.commands.enabled", true) ||
+        !device.availableCommands || !device.availableCommands[COMMAND_SENDTAB]) {
+      return false;
+    }
+    const {kid: theirKid} = JSON.parse(device.availableCommands[COMMAND_SENDTAB]);
+    const ourKid = await this._getKid();
+    return theirKid == ourKid;
+  }
+
+  // Handle incoming send tab payload, called by FxAccountsCommands.
+  async handle(sender, {encrypted}) {
+    if (!sender) {
+      log.warn("Incoming tab is from an unknown device (maybe disconnected?)");
+    }
+    const bytes = await this._decrypt(encrypted);
+    const decoder = new TextDecoder("utf8");
+    const data = JSON.parse(decoder.decode(bytes));
+    const current = data.hasOwnProperty("current") ? data.current :
+                                                     data.entries.length - 1;
+    const tabSender = {
+      id: sender ? sender.id : "",
+      name: sender ? sender.name : ""
+    };
+    const {title, url: uri} = data.entries[current];
+    console.log(`Tab received with FxA commands: ${title} from ${tabSender.name}.`);
+    Observers.notify("fxaccounts:commands:open-uri", [{uri, title, sender: tabSender}]);
+  }
+
+  async _getKid() {
+    let {kXCS} = await this._fxAccounts.getKeys();
+    return kXCS;
+  }
+
+  async _encrypt(bytes, device) {
+    let bundle = device.availableCommands[COMMAND_SENDTAB];
+    if (!bundle) {
+      throw new Error(`Device ${device.id} does not have send tab keys.`);
+    }
+    const json = JSON.parse(bundle);
+    const wrapper = new CryptoWrapper();
+    wrapper.deserialize({payload: json});
+    const {kSync} = await this._fxAccounts.getKeys();
+    const syncKeyBundle = BulkKeyBundle.fromHexKey(kSync);
+    let {publicKey, authSecret} = await wrapper.decrypt(syncKeyBundle);
+    authSecret = urlsafeBase64Decode(authSecret);
+    publicKey = urlsafeBase64Decode(publicKey);
+
+    const {ciphertext: encrypted} = await PushCrypto.encrypt(bytes, publicKey, authSecret);
+    return urlsafeBase64Encode(encrypted);
+  }
+
+  async _getKeys() {
+    const {device} = await this._fxAccounts.getSignedInUser();
+    return device && device.sendTabKeys;
+  }
+
+  async _decrypt(ciphertext) {
+    let {privateKey, publicKey, authSecret} = await this._getKeys();
+    publicKey = urlsafeBase64Decode(publicKey);
+    authSecret = urlsafeBase64Decode(authSecret);
+    ciphertext = new Uint8Array(urlsafeBase64Decode(ciphertext));
+    return PushCrypto.decrypt(privateKey, publicKey, authSecret,
+                              // The only Push encoding we support.
+                              {encoding: "aes128gcm"}, ciphertext);
+  }
+
+  async _generateAndPersistKeys() {
+    let [publicKey, privateKey] = await PushCrypto.generateKeys();
+    publicKey = urlsafeBase64Encode(publicKey);
+    let authSecret = PushCrypto.generateAuthenticationSecret();
+    authSecret = urlsafeBase64Encode(authSecret);
+    const sendTabKeys = {
+      publicKey,
+      privateKey,
+      authSecret
+    };
+    await this._fxAccounts._withCurrentAccountState(async (getUserData, updateUserData) => {
+      const {device} = await getUserData();
+      await updateUserData({
+        device: {
+          ...device,
+          sendTabKeys,
+        }
+      });
+    });
+    return sendTabKeys;
+  }
+
+  async getEncryptedKey() {
+    let sendTabKeys = await this._getKeys();
+    if (!sendTabKeys) {
+      sendTabKeys = await this._generateAndPersistKeys();
+    }
+    // Strip the private key from the bundle to encrypt.
+    const keyToEncrypt = {
+      publicKey: sendTabKeys.publicKey,
+      authSecret: sendTabKeys.authSecret,
+    };
+    const {kSync} = await this._fxAccounts.getSignedInUser();
+    if (!kSync) {
+      return null;
+    }
+    const wrapper = new CryptoWrapper();
+    wrapper.cleartext = keyToEncrypt;
+    const keyBundle = BulkKeyBundle.fromHexKey(kSync);
+    await wrapper.encrypt(keyBundle);
+    const kid = await this._getKid();
+    return JSON.stringify({
+      kid,
+      IV: wrapper.IV,
+      hmac: wrapper.hmac,
+      ciphertext: wrapper.ciphertext,
+    });
+  }
+}
+
+function urlsafeBase64Encode(buffer) {
+  return ChromeUtils.base64URLEncode(new Uint8Array(buffer), {pad: false});
+}
+
+function urlsafeBase64Decode(str) {
+  return ChromeUtils.base64URLDecode(str, {padding: "reject"});
+}
diff --git a/services/fxaccounts/FxAccountsCommon.js b/services/fxaccounts/FxAccountsCommon.js
--- a/services/fxaccounts/FxAccountsCommon.js
+++ b/services/fxaccounts/FxAccountsCommon.js
@@ -66,18 +66,18 @@
 exports.ON_PASSWORD_CHANGED_NOTIFICATION = "fxaccounts:password_changed";
 exports.ON_PASSWORD_RESET_NOTIFICATION = "fxaccounts:password_reset";
 exports.ON_ACCOUNT_DESTROYED_NOTIFICATION = "fxaccounts:account_destroyed";
 exports.ON_COLLECTION_CHANGED_NOTIFICATION = "sync:collection_changed";
 exports.ON_VERIFY_LOGIN_NOTIFICATION = "fxaccounts:verify_login";
+exports.ON_COMMAND_RECEIVED_NOTIFICATION = "fxaccounts:command_received";
 
 exports.FXA_PUSH_SCOPE_ACCOUNT_UPDATE = "chrome://fxa-device-update";
 
 exports.ON_PROFILE_CHANGE_NOTIFICATION = "fxaccounts:profilechange"; // WebChannel
 exports.ON_ACCOUNT_STATE_CHANGE_NOTIFICATION = "fxaccounts:statechange";
 
-exports.CAPABILITY_MESSAGES = "messages";
-exports.CAPABILITY_MESSAGES_SENDTAB = "messages.sendtab";
+exports.COMMAND_SENDTAB = "https://identity.mozilla.com/cmd/open-uri";
 
 // UI Requests.
 exports.UI_REQUEST_SIGN_IN_FLOW = "signInFlow";
 exports.UI_REQUEST_REFRESH_AUTH = "refreshAuthentication";
 
diff --git a/services/fxaccounts/FxAccountsMessages.js b/services/fxaccounts/FxAccountsMessages.js
deleted file mode 100644
--- a/services/fxaccounts/FxAccountsMessages.js
+++ /dev/null
@@ -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 http://mozilla.org/MPL/2.0/. */
-
-const EXPORTED_SYMBOLS = ["FxAccountsMessages", /* the rest are for testing only */
-                          "FxAccountsMessagesSender", "FxAccountsMessagesReceiver",
-                          "FxAccountsMessagesHandler"];
-
-ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
-ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-ChromeUtils.defineModuleGetter(this, "PushCrypto",
-  "resource://gre/modules/PushCrypto.jsm");
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://services-common/observers.js");
-
-const AES128GCM_ENCODING = "aes128gcm"; // The only Push encoding we support.
-const TOPICS = {
-  SEND_TAB: "sendtab"
-};
-
-class FxAccountsMessages {
-  constructor(fxAccounts, options = {}) {
-    this.fxAccounts = fxAccounts;
-    this.sender = options.sender || new FxAccountsMessagesSender(fxAccounts);
-    this.receiver = options.receiver || new FxAccountsMessagesReceiver(fxAccounts);
-  }
-
-  _isDeviceMessagesAware(device) {
-    return device.capabilities && device.capabilities.includes(CAPABILITY_MESSAGES);
-  }
-
-  canReceiveSendTabMessages(device) {
-    return this._isDeviceMessagesAware(device) &&
-           device.capabilities.includes(CAPABILITY_MESSAGES_SENDTAB);
-  }
-
-  consumeRemoteMessages() {
-    if (!Services.prefs.getBoolPref("identity.fxaccounts.messages.enabled", true)) {
-      return Promise.resolve();
-    }
-    return this.receiver.consumeRemoteMessages();
-  }
-
-  /**
-   * @param {Device[]} to - Device objects (typically returned by fxAccounts.getDevicesList()).
-   * @param {Object} tab
-   * @param {string} tab.url
-   * @param {string} tab.title
-   */
-  async sendTab(to, tab) {
-    log.info(`Sending a tab to ${to.length} devices.`);
-    const ourDeviceId = await this.fxAccounts.getDeviceId();
-    const payload = {
-      topic: TOPICS.SEND_TAB,
-      data: {
-        from: ourDeviceId,
-        entries: [{title: tab.title, url: tab.url}]
-      }
-    };
-    return this.sender.send(TOPICS.SEND_TAB, to, payload);
-  }
-}
-
-class FxAccountsMessagesSender {
-  constructor(fxAccounts) {
-    this.fxAccounts = fxAccounts;
-  }
-
-  async send(topic, to, data) {
-    const userData = await this.fxAccounts.getSignedInUser();
-    if (!userData) {
-      throw new Error("No user.");
-    }
-    const {sessionToken} = userData;
-    if (!sessionToken) {
-      throw new Error("_send called without a session token.");
-    }
-    const encoder = new TextEncoder("utf8");
-    const client = this.fxAccounts.getAccountsClient();
-    for (const device of to) {
-      try {
-        const bytes = encoder.encode(JSON.stringify(data));
-        const payload = await this._encrypt(bytes, device, encoder);
-        await client.sendMessage(sessionToken, topic, device.id, payload);
-        log.info(`Payload sent to device ${device.id}.`);
-      } catch (e) {
-        log.error(`Could not send data to device ${device.id}.`, e);
-      }
-    }
-  }
-
-  async _encrypt(bytes, device) {
-    let {pushPublicKey, pushAuthKey} = device;
-    if (!pushPublicKey || !pushAuthKey) {
-      throw new Error(`Device ${device.id} does not have push keys.`);
-    }
-    pushPublicKey = ChromeUtils.base64URLDecode(pushPublicKey, {padding: "ignore"});
-    pushAuthKey = ChromeUtils.base64URLDecode(pushAuthKey, {padding: "ignore"});
-    const {ciphertext} = await PushCrypto.encrypt(bytes, pushPublicKey, pushAuthKey);
-    return ChromeUtils.base64URLEncode(ciphertext, {pad: false});
-  }
-}
-
-class FxAccountsMessagesReceiver {
-  constructor(fxAccounts, options = {}) {
-    this.fxAccounts = fxAccounts;
-    this.handler = options.handler || new FxAccountsMessagesHandler(this.fxAccounts);
-  }
-
-  async consumeRemoteMessages() {
-    log.info(`Consuming unread messages.`);
-    const messages = await this._fetchMessages();
-    if (!messages || !messages.length) {
-      log.info(`No new messages.`);
-      return;
-    }
-    const decoder = new TextDecoder("utf8");
-    const keys = await this._getOwnKeys();
-    const payloads = [];
-    for (const {index, data} of messages) {
-      try {
-        const bytes = await this._decrypt(data, keys);
-        const payload = JSON.parse(decoder.decode(bytes));
-        payloads.push(payload);
-      } catch (e) {
-        log.error(`Could not unwrap message ${index}`, e);
-      }
-    }
-    if (payloads.length) {
-      await this.handler.handle(payloads);
-    }
-  }
-
-  async _fetchMessages() {
-    return this.fxAccounts._withCurrentAccountState(async (getUserData, updateUserData) => {
-      const userData = await getUserData(["sessionToken", "device"]);
-      if (!userData) {
-        throw new Error("No user.");
-      }
-      const {sessionToken, device} = userData;
-      if (!sessionToken) {
-        throw new Error("No session token.");
-      }
-      if (!device) {
-        throw new Error("No device registration.");
-      }
-      const opts = {};
-      if (device.messagesIndex) {
-        opts.index = device.messagesIndex;
-      }
-      const client = this.fxAccounts.getAccountsClient();
-      log.info(`Fetching unread messages with ${JSON.stringify(opts)}.`);
-      const {index: newIndex, messages} = await client.getMessages(sessionToken, opts);
-      await updateUserData({
-        device: {...device, messagesIndex: newIndex}
-      });
-      return messages;
-    });
-  }
-
-  async _getOwnKeys() {
-    const subscription = await this.fxAccounts.getPushSubscription();
-    return {
-      pushPrivateKey: subscription.p256dhPrivateKey,
-      pushPublicKey: new Uint8Array(subscription.getKey("p256dh")),
-      pushAuthKey: new Uint8Array(subscription.getKey("auth"))
-    };
-  }
-
-  async _decrypt(ciphertext, {pushPrivateKey, pushPublicKey, pushAuthKey}) {
-    ciphertext = ChromeUtils.base64URLDecode(ciphertext, {padding: "reject"});
-    return PushCrypto.decrypt(pushPrivateKey, pushPublicKey,
-                              pushAuthKey,
-                              {encoding: AES128GCM_ENCODING},
-                              ciphertext);
-  }
-}
-
-class FxAccountsMessagesHandler {
-  constructor(fxAccounts) {
-    this.fxAccounts = fxAccounts;
-  }
-
-  async handle(payloads) {
-    const sendTabPayloads = [];
-    for (const payload of payloads) {
-      switch (payload.topic) {
-        case TOPICS.SEND_TAB:
-          sendTabPayloads.push(payload.data);
-        default:
-          log.info(`Unknown messages topic: ${payload.topic}.`);
-      }
-    }
-
-    // Only one type of payload so far!
-    if (sendTabPayloads.length) {
-      await this._handleSendTabPayloads(sendTabPayloads);
-    }
-  }
-
-  async _handleSendTabPayloads(payloads) {
-    const toDisplay = [];
-    const fxaDevices = await this.fxAccounts.getDeviceList();
-    for (const payload of payloads) {
-      const current = payload.hasOwnProperty("current") ? payload.current :
-                                                          payload.entries.length - 1;
-      const device = fxaDevices.find(d => d.id == payload.from);
-      if (!device) {
-        log.warn("Incoming tab is from an unknown device (maybe disconnected?)");
-      }
-      const sender = {
-        id: device ? device.id : "",
-        name: device ? device.name : ""
-      };
-      const {title, url: uri} = payload.entries[current];
-      toDisplay.push({uri, title, sender});
-    }
-
-    Observers.notify("fxaccounts:messages:display-tabs", toDisplay);
-  }
-}
-
diff --git a/services/fxaccounts/FxAccountsPush.js b/services/fxaccounts/FxAccountsPush.js
--- a/services/fxaccounts/FxAccountsPush.js
+++ b/services/fxaccounts/FxAccountsPush.js
@@ -5,10 +5,12 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://services-sync/util.js");
 ChromeUtils.import("resource://gre/modules/FxAccountsCommon.js");
 
+XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
+
 /**
  * FxAccountsPushService manages Push notifications for Firefox Accounts in the browser
  *
  * @param [options]
  *        Object, custom options that used for testing
@@ -156,17 +158,15 @@
       this.log.debug("empty push message - checking account status");
       this.fxAccounts.checkVerificationStatus();
       return;
     }
     let payload = message.data.json();
-    if (payload.topic) {
-      this.log.debug(`received messages tickle with topic ${payload.topic}`);
-      this.fxAccounts.messages.consumeRemoteMessages();
-      return;
-    }
     this.log.debug(`push command: ${payload.command}`);
     switch (payload.command) {
+      case ON_COMMAND_RECEIVED_NOTIFICATION:
+        this.fxAccounts.commands.consumeRemoteCommand(payload.data.index);
+        break;
       case ON_DEVICE_CONNECTED_NOTIFICATION:
         Services.obs.notifyObservers(null, ON_DEVICE_CONNECTED_NOTIFICATION, payload.data.deviceName);
         break;
       case ON_DEVICE_DISCONNECTED_NOTIFICATION:
         this.fxAccounts.handleDeviceDisconnection(payload.data.id);
diff --git a/services/fxaccounts/FxAccountsWebChannel.jsm b/services/fxaccounts/FxAccountsWebChannel.jsm
--- a/services/fxaccounts/FxAccountsWebChannel.jsm
+++ b/services/fxaccounts/FxAccountsWebChannel.jsm
@@ -414,11 +414,11 @@
         return false;
       }
     });
   },
 
-  changePassword(credentials) {
+  async changePassword(credentials) {
     // If |credentials| has fields that aren't handled by accounts storage,
     // updateUserAccountData will throw - mainly to prevent errors in code
     // that hard-codes field names.
     // However, in this case the field names aren't really in our control.
     // We *could* still insist the server know what fields names are valid,
@@ -434,12 +434,19 @@
         newCredentials[name] = credentials[name];
       } else {
         log.info("changePassword ignoring unsupported field", name);
       }
     }
-    return this._fxAccounts.updateUserAccountData(newCredentials)
-      .then(() => this._fxAccounts.updateDeviceRegistration());
+    await this._fxAccounts.updateUserAccountData(newCredentials);
+    // Force the keys derivation, to be able to register a send-tab command
+    // in updateDeviceRegistration.
+    try {
+      await this._fxAccounts.getKeys();
+    } catch (e) {
+      log.error("getKeys errored", e);
+    }
+    await this._fxAccounts.updateDeviceRegistration();
   },
 
   /**
    * Get the hash of account name of the previously signed in account
    */
diff --git a/services/fxaccounts/moz.build b/services/fxaccounts/moz.build
--- a/services/fxaccounts/moz.build
+++ b/services/fxaccounts/moz.build
@@ -22,13 +22,13 @@
 
 EXTRA_JS_MODULES += [
   'Credentials.jsm',
   'FxAccounts.jsm',
   'FxAccountsClient.jsm',
+  'FxAccountsCommands.js',
   'FxAccountsCommon.js',
   'FxAccountsConfig.jsm',
-  'FxAccountsMessages.js',
   'FxAccountsOAuthGrantClient.jsm',
   'FxAccountsProfile.jsm',
   'FxAccountsProfileClient.jsm',
   'FxAccountsStorage.jsm',
   'FxAccountsWebChannel.jsm',
diff --git a/services/fxaccounts/tests/xpcshell/test_accounts_device_registration.js b/services/fxaccounts/tests/xpcshell/test_accounts_device_registration.js
--- a/services/fxaccounts/tests/xpcshell/test_accounts_device_registration.js
+++ b/services/fxaccounts/tests/xpcshell/test_accounts_device_registration.js
@@ -100,10 +100,13 @@
       return new AccountState(storage);
     },
     _getDeviceName() {
       return device.name || "mock device name";
     },
+    async availableCommands() {
+      return {};
+    },
     fxAccountsClient: new MockFxAccountsClient(device),
     fxaPushService: {
       registerPushEndpoint() {
         return new Promise((resolve) => {
           resolve({
@@ -188,10 +191,11 @@
   const credentials = getTestUser("pb");
   const fxa = new MockFxAccounts({ name: deviceName });
   await fxa.internal.setSignedInUser(credentials);
   await fxa.updateUserAccountData({uid: credentials.uid, device: {
     id: deviceId,
+    registeredCommandsKeys: [],
     registrationVersion: 1 // < 42
   }});
 
   const spy = {
     registerDevice: { count: 0, args: [] },
@@ -245,10 +249,11 @@
   const credentials = getTestUser("baz");
   const fxa = new MockFxAccounts({ name: deviceName });
   await fxa.internal.setSignedInUser(credentials);
   await fxa.updateUserAccountData({uid: credentials.uid, device: {
     id: currentDeviceId,
+    registeredCommandsKeys: [],
     registrationVersion: 1 // < 42
   }});
 
   const spy = {
     registerDevice: { count: 0, args: [] },
@@ -309,10 +314,11 @@
   const credentials = getTestUser("baz");
   const fxa = new MockFxAccounts({ name: deviceName });
   await fxa.internal.setSignedInUser(credentials);
   await fxa.updateUserAccountData({uid: credentials.uid, device: {
     id: currentDeviceId,
+    registeredCommandsKeys: [],
     registrationVersion: 1 // < 42
   }});
 
   const spy = {
     registerDevice: { count: 0, args: [] },
@@ -451,11 +457,11 @@
   const fxa = new MockFxAccounts();
   await fxa.internal.setSignedInUser(credentials);
 
   const spy = { count: 0, args: [] };
   fxa.internal.currentAccountState.getUserAccountData =
-    () => Promise.resolve({ device: {id: "my id", registrationVersion: 0}});
+    () => Promise.resolve({ device: {id: "my id", registrationVersion: 0, registeredCommandsKeys: []}});
   fxa.internal._registerOrUpdateDevice = function() {
     spy.count += 1;
     spy.args.push(arguments);
     return Promise.resolve("wibble");
   };
@@ -474,11 +480,11 @@
   const fxa = new MockFxAccounts();
   await fxa.internal.setSignedInUser(credentials);
 
   const spy = { count: 0 };
   fxa.internal.currentAccountState.getUserAccountData =
-    () => Promise.resolve({ device: {id: "foo's device id", registrationVersion: DEVICE_REGISTRATION_VERSION}});
+    async () => ({ device: {id: "foo's device id", registrationVersion: DEVICE_REGISTRATION_VERSION, registeredCommandsKeys: []}});
   fxa.internal._registerOrUpdateDevice = function() {
     spy.count += 1;
     return Promise.resolve("bar");
   };
 
@@ -525,11 +531,11 @@
   const result = await fxa.internal.getDeviceId();
   Assert.equal(result, "mydeviceid");
 
   const state = fxa.internal.currentAccountState;
   const data = await state.getUserAccountData();
-  Assert.deepEqual(data.device, {id: "mydeviceid", registrationVersion: DEVICE_REGISTRATION_VERSION});
+  Assert.deepEqual(data.device, {id: "mydeviceid", registrationVersion: DEVICE_REGISTRATION_VERSION, registeredCommandsKeys: []});
   Assert.ok(!data.deviceId);
   Assert.ok(!data.deviceRegistrationVersion);
 });
 
 add_task(async function test_devicelist_pushendpointexpired() {
@@ -538,10 +544,11 @@
   credentials.verified = true;
   const fxa = new MockFxAccounts();
   await fxa.internal.setSignedInUser(credentials);
   await fxa.updateUserAccountData({uid: credentials.uid, device: {
     id: deviceId,
+    registeredCommandsKeys: [],
     registrationVersion: 1 // < 42
   }});
 
   const spy = {
     updateDevice: { count: 0, args: [] },
diff --git a/services/fxaccounts/tests/xpcshell/test_commands.js b/services/fxaccounts/tests/xpcshell/test_commands.js
new file mode 100644
--- /dev/null
+++ b/services/fxaccounts/tests/xpcshell/test_commands.js
@@ -0,0 +1,108 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+ChromeUtils.import("resource://testing-common/Assert.jsm");
+ChromeUtils.import("resource://gre/modules/FxAccountsCommands.js");
+
+add_task(async function test_sendtab_isDeviceCompatible() {
+  const fxAccounts = {
+    getKeys() {
+      return {
+        kXCS: "abcd"
+      };
+    }
+  };
+  const sendTab = new SendTab(null, fxAccounts);
+  let device = {name: "My device"};
+  Assert.ok(!(await sendTab.isDeviceCompatible(device)));
+  device = {name: "My device", availableCommands: {}};
+  Assert.ok(!(await sendTab.isDeviceCompatible(device)));
+  device = {name: "My device", availableCommands: {
+    "https://identity.mozilla.com/cmd/open-uri": JSON.stringify({
+      kid: "dcba"
+    })
+  }};
+  Assert.ok(!(await sendTab.isDeviceCompatible(device)));
+  device = {name: "My device", availableCommands: {
+    "https://identity.mozilla.com/cmd/open-uri": JSON.stringify({
+      kid: "abcd"
+    })
+  }};
+  Assert.ok((await sendTab.isDeviceCompatible(device)));
+});
+
+add_task(async function test_sendtab_send() {
+  const commands = {
+    invoke: sinon.spy((cmd, device, payload) => {
+      if (device.name == "Device 1") {
+        throw new Error("Invoke error!");
+      }
+      Assert.equal(payload.encrypted, "encryptedpayload");
+    })
+  };
+  const sendTab = new SendTab(commands, null);
+  sendTab._encrypt = (bytes, device) => {
+    if (device.name == "Device 2") {
+      throw new Error("Encrypt error!");
+    }
+    return "encryptedpayload";
+  };
+  const to = [
+    {name: "Device 1"},
+    {name: "Device 2"},
+    {name: "Device 3"},
+  ];
+  const tab = {title: "Foo", url: "https://foo.bar/"};
+  const report = await sendTab.send(to, tab);
+  Assert.equal(report.succeeded.length, 1);
+  Assert.equal(report.failed.length, 2);
+  Assert.equal(report.succeeded[0].name, "Device 3");
+  Assert.equal(report.failed[0].device.name, "Device 1");
+  Assert.equal(report.failed[0].error.message, "Invoke error!");
+  Assert.equal(report.failed[1].device.name, "Device 2");
+  Assert.equal(report.failed[1].error.message, "Encrypt error!");
+  Assert.ok(commands.invoke.calledTwice);
+});
+
+add_task(async function test_commands_fetchMissedRemoteCommands() {
+  const accountState = {
+    data: {
+      device: {
+        handledCommands: [8, 9, 10, 11],
+        lastCommandIndex: 11,
+      }
+    }
+  };
+  const fxAccounts = {
+    async _withCurrentAccountState(cb) {
+      const get = () => accountState.data;
+      const set = (val) => { accountState.data = val; };
+      await cb(get, set);
+    }
+  };
+  const commands = new FxAccountsCommands(fxAccounts);
+  commands._fetchRemoteCommands = () => {
+    return {
+      index: 12,
+      messages: [
+        {
+          index: 11,
+          data: {}
+        },
+        {
+          index: 12,
+          data: {}
+        }
+      ]
+    };
+  };
+  commands._handleCommands = sinon.spy();
+  await commands.fetchMissedRemoteCommands();
+
+  Assert.equal(accountState.data.device.handledCommands.length, 0);
+  Assert.equal(accountState.data.device.lastCommandIndex, 12);
+  const callArgs = commands._handleCommands.args[0][0];
+  Assert.equal(callArgs[0].index, 12);
+});
diff --git a/services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js b/services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
--- a/services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
+++ b/services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
@@ -46,10 +46,11 @@
       async recoveryEmailStatus() {
         return { verified: true };
       },
       async signOut() {},
     },
+    updateDeviceRegistration() {},
     _getDeviceName() {
       return "mock device name";
     },
     observerPreloads: [],
     fxaPushService: {
diff --git a/services/fxaccounts/tests/xpcshell/test_messages.js b/services/fxaccounts/tests/xpcshell/test_messages.js
deleted file mode 100644
--- a/services/fxaccounts/tests/xpcshell/test_messages.js
+++ /dev/null
@@ -1,210 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-ChromeUtils.import("resource://testing-common/Assert.jsm");
-ChromeUtils.import("resource://gre/modules/FxAccountsMessages.js");
-
-add_task(async function test_sendTab() {
-  const fxAccounts = {
-    async getDeviceId() {
-      return "my-device-id";
-    }
-  };
-  const sender = {
-    send: sinon.spy()
-  };
-  const fxAccountsMessages = new FxAccountsMessages(fxAccounts, {sender});
-
-  const to = [{
-    id: "deviceid-1",
-    pushPublicKey: "pubkey-1",
-    pushAuthKey: "authkey-1"
-  }];
-  const tab = {url: "https://foo.com", title: "Foo"};
-  await fxAccountsMessages.sendTab(to, tab);
-  Assert.ok(sender.send.calledOnce);
-  Assert.equal(sender.send.args[0][0], "sendtab");
-  Assert.deepEqual(sender.send.args[0][1], to);
-  Assert.deepEqual(sender.send.args[0][2], {
-    topic: "sendtab",
-    data: {
-      from: "my-device-id",
-      entries: [{title: "Foo", url: "https://foo.com"}]
-    }
-  });
-});
-
-add_task(async function test_consumeRemoteMessages() {
-  const fxAccounts = {};
-  const receiver = {
-    consumeRemoteMessages: sinon.spy()
-  };
-  const fxAccountsMessages = new FxAccountsMessages(fxAccounts, {receiver});
-  fxAccountsMessages.consumeRemoteMessages();
-  Assert.ok(receiver.consumeRemoteMessages.calledOnce);
-});
-
-add_task(async function test_canReceiveSendTabMessages() {
-  const fxAccounts = {};
-  const messages = new FxAccountsMessages(fxAccounts);
-  Assert.ok(!messages.canReceiveSendTabMessages({id: "device-id-1"}));
-  Assert.ok(!messages.canReceiveSendTabMessages({id: "device-id-1", capabilities: []}));
-  Assert.ok(!messages.canReceiveSendTabMessages({id: "device-id-1", capabilities: ["messages"]}));
-  Assert.ok(messages.canReceiveSendTabMessages({id: "device-id-1", capabilities: ["messages", "messages.sendtab"]}));
-});
-
-add_task(async function test_sender_send() {
-  const sandbox = sinon.sandbox.create();
-  const fxaClient = {
-    sendMessage: sinon.spy()
-  };
-  const sessionToken = "toktok";
-  const fxAccounts = {
-    async getSignedInUser() {
-      return {sessionToken};
-    },
-    getAccountsClient() {
-      return fxaClient;
-    }
-  };
-  const sender = new FxAccountsMessagesSender(fxAccounts);
-  sandbox.stub(sender, "_encrypt").callsFake((_, device) => {
-    if (device.pushPublicKey == "pubkey-1") {
-      return "encrypted-text-1";
-    }
-    return "encrypted-text-2";
-  });
-
-  const topic = "mytopic";
-  const to = [{
-    id: "deviceid-1",
-    pushPublicKey: "pubkey-1",
-    pushAuthKey: "authkey-1"
-  }, {
-    id: "deviceid-2",
-    pushPublicKey: "pubkey-2",
-    pushAuthKey: "authkey-2"
-  }];
-  const payload = {foo: "bar"};
-
-  await sender.send(topic, to, payload);
-
-  Assert.ok(fxaClient.sendMessage.calledTwice);
-  const checkCallArgs = (callNum, deviceId, encrypted) => {
-    Assert.equal(fxaClient.sendMessage.args[callNum][0], sessionToken);
-    Assert.equal(fxaClient.sendMessage.args[callNum][1], topic);
-    Assert.equal(fxaClient.sendMessage.args[callNum][2], deviceId);
-    Assert.equal(fxaClient.sendMessage.args[callNum][3], encrypted);
-  };
-  checkCallArgs(0, "deviceid-1", "encrypted-text-1");
-  checkCallArgs(1, "deviceid-2", "encrypted-text-2");
-  sandbox.restore();
-});
-
-add_task(async function test_receiver_consumeRemoteMessages() {
-  const fxaClient = {
-    getMessages: sinon.spy(async () => {
-      return {
-        index: "idx-2",
-        messages: [{
-          index: "idx-1",
-          data: "#giberish#"
-        }, {
-          index: "idx-2",
-          data: "#encrypted#"
-        }]
-      };
-    })
-  };
-  const fxAccounts = {
-    accountState: {sessionToken: "toktok", device: {}},
-    _withCurrentAccountState(fun) {
-      const get = () => this.accountState;
-      const update = (obj) => { this.accountState = {...this.accountState, ...obj}; };
-      return fun(get, update);
-    },
-    getAccountsClient() {
-      return fxaClient;
-    }
-  };
-  const sandbox = sinon.sandbox.create();
-  const messagesHandler = {
-    handle: sinon.spy()
-  };
-  const receiver = new FxAccountsMessagesReceiver(fxAccounts, {
-    handler: messagesHandler
-  });
-  sandbox.stub(receiver, "_getOwnKeys").callsFake(async () => {});
-  sandbox.stub(receiver, "_decrypt").callsFake((ciphertext) => {
-    if (ciphertext == "#encrypted#") {
-      return new TextEncoder("utf-8").encode(JSON.stringify({"foo": "bar"}));
-    }
-    throw new Error("Boom!");
-  });
-
-  await receiver.consumeRemoteMessages();
-
-  Assert.ok(fxaClient.getMessages.calledOnce);
-  Assert.equal(fxaClient.getMessages.args[0][0], "toktok");
-  Assert.deepEqual(fxaClient.getMessages.args[0][1], {});
-  Assert.ok(messagesHandler.handle.calledOnce);
-  Assert.deepEqual(messagesHandler.handle.args[0][0], [{"foo": "bar"}]);
-  fxaClient.getMessages.reset();
-
-  await receiver.consumeRemoteMessages();
-
-  Assert.ok(fxaClient.getMessages.calledOnce);
-  Assert.equal(fxaClient.getMessages.args[0][0], "toktok");
-  Assert.deepEqual(fxaClient.getMessages.args[0][1], {"index": "idx-2"});
-
-  sandbox.restore();
-});
-
-add_task(async function test_handler_handle_sendtab() {
-  const fxAccounts = {
-    async getDeviceList() {
-      return [{id: "1234a", name: "My Computer"}];
-    }
-  };
-  const handler = new FxAccountsMessagesHandler(fxAccounts);
-  const payloads = [{
-    topic: "sendtab",
-    data: {
-      from: "1234a",
-      current: 0,
-      entries: [{title: "Foo", url: "https://foo.com"},
-                {title: "Bar", url: "https://bar.com"}]
-    }
-  }, {
-    topic: "sendtab",
-    data: {
-      from: "unknown_device",
-      entries: [{title: "Foo2", url: "https://foo2.com"},
-                {title: "Bar2", url: "https://bar2.com"}]
-    }
-  }, {
-    topic: "unknowntopic",
-    data: {foo: "bar"}
-  }];
-  const notificationPromise = promiseObserver("fxaccounts:messages:display-tabs");
-  await handler.handle(payloads);
-  const {subject} = await notificationPromise;
-  const toDisplay = subject.wrappedJSObject.object;
-  const expected = [
-    {uri: "https://foo.com", title: "Foo", sender: {id: "1234a", name: "My Computer"}},
-    {uri: "https://bar2.com", title: "Bar2", sender: {id: "", name: ""}}
-  ];
-  Assert.deepEqual(toDisplay, expected);
-});
-
-function promiseObserver(aTopic) {
-  return new Promise(resolve => {
-    Services.obs.addObserver(function onNotification(subject, topic, data) {
-      Services.obs.removeObserver(onNotification, topic);
-        resolve({subject, data});
-      }, aTopic);
-  });
-}
-
diff --git a/services/fxaccounts/tests/xpcshell/test_push_service.js b/services/fxaccounts/tests/xpcshell/test_push_service.js
--- a/services/fxaccounts/tests/xpcshell/test_push_service.js
+++ b/services/fxaccounts/tests/xpcshell/test_push_service.js
@@ -407,26 +407,29 @@
   };
 
   pushService.observe(msg, mockPushService.pushTopic, FXA_PUSH_SCOPE_ACCOUNT_UPDATE);
 });
 
-add_task(async function messagesTickle() {
+add_task(async function commandReceived() {
   let msg = {
     data: {
       json: () => ({
-        topic: "sendtab"
+        command: "fxaccounts:command_received",
+        data: {
+          url: "https://api.accounts.firefox.com/auth/v1/account/device/commands?index=42&limit=1"
+        }
       })
     },
     QueryInterface() {
       return this;
     }
   };
 
   let fxAccountsMock = {};
   const promiseConsumeRemoteMessagesCalled = new Promise(res => {
-    fxAccountsMock.messages = {
-      consumeRemoteMessages() {
+    fxAccountsMock.commands = {
+      consumeRemoteCommand() {
         res();
       }
     };
   });
 
diff --git a/services/fxaccounts/tests/xpcshell/xpcshell.ini b/services/fxaccounts/tests/xpcshell/xpcshell.ini
--- a/services/fxaccounts/tests/xpcshell/xpcshell.ini
+++ b/services/fxaccounts/tests/xpcshell/xpcshell.ini
@@ -7,13 +7,13 @@
 
 [test_accounts.js]
 [test_accounts_config.js]
 [test_accounts_device_registration.js]
 [test_client.js]
+[test_commands.js]
 [test_credentials.js]
 [test_loginmgr_storage.js]
-[test_messages.js]
 [test_oauth_grant_client.js]
 [test_oauth_grant_client_server.js]
 [test_oauth_tokens.js]
 [test_oauth_token_storage.js]
 [test_profile_client.js]
diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js
--- a/services/sync/modules/policies.js
+++ b/services/sync/modules/policies.js
@@ -531,15 +531,10 @@
     if (!Async.isAppReady()) {
       this._log.debug("Not initiating sync: app is shutting down");
       return;
     }
     Services.tm.dispatchToMainThread(() => {
-      // Terrible hack below: we do the fxa messages polling in the sync
-      // scheduler to get free post-wake/link-state etc detection.
-      fxAccounts.messages.consumeRemoteMessages().catch(e => {
-        this._log.error("Error while polling for FxA messages.", e);
-      });
       this.service.sync({engines, why});
     });
   },
 
   /**
diff --git a/servo/components/style/gecko/global_style_data.rs b/servo/components/style/gecko/global_style_data.rs
--- a/servo/components/style/gecko/global_style_data.rs
+++ b/servo/components/style/gecko/global_style_data.rs
@@ -63,11 +63,16 @@
     pub static ref STYLE_THREAD_POOL: StyleThreadPool = {
         let stylo_threads = env::var("STYLO_THREADS")
             .map(|s| s.parse::<usize>().expect("invalid STYLO_THREADS value"));
         let mut num_threads = match stylo_threads {
             Ok(num) => num,
-            _ => cmp::max(num_cpus::get() * 3 / 4, 1),
+            // The default heuristic is num_virtual_cores * .75. This gives us
+            // three threads on a hyper-threaded dual core, and six threads on
+            // a hyper-threaded quad core. The performance benefit of additional
+            // threads seems to level off at around six, so we cap it there on
+            // many-core machines (see bug 1431285 comment 14).
+            _ => cmp::min(cmp::max(num_cpus::get() * 3 / 4, 1), 6),
         };
 
         // If num_threads is one, there's no point in creating a thread pool, so
         // force it to zero.
         //
diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -10,10 +10,11 @@
             by-test-platform:
                 android-em.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
                 android-hw.*:
+                    - android/android_common.py
                     - android/android_hw.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -19,10 +19,11 @@
                     - android/androidx86_7_0.py
                 android-em.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
                 android-hw.*:
+                    - android/android_common.py
                     - android/android_hw.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
                 macosx.*:
diff --git a/taskcluster/taskgraph/actions/cancel.py b/taskcluster/taskgraph/actions/cancel.py
new file mode 100644
--- /dev/null
+++ b/taskcluster/taskgraph/actions/cancel.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-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/.
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+from taskgraph.util.taskcluster import cancel_task
+from .registry import register_callback_action
+
+
+@register_callback_action(
+    title='Cancel Task',
+    name='cancel',
+    symbol='cx',
+    kind='hook',
+    generic=True,
+    description=(
+        'Cancel the given task'
+    ),
+    order=100,
+    context=[{}]
+)
+def cancel_action(parameters, graph_config, input, task_group_id, task_id, task):
+    # Note that this is limited by the scopes afforded to generic actions to
+    # only cancel tasks with the level-specific schedulerId.
+    cancel_task(task_id, use_proxy=True)
diff --git a/taskcluster/taskgraph/actions/create_interactive.py b/taskcluster/taskgraph/actions/create_interactive.py
new file mode 100644
--- /dev/null
+++ b/taskcluster/taskgraph/actions/create_interactive.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-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/.
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import logging
+
+from .util import (
+    create_tasks,
+    fetch_graph_and_labels
+)
+from taskgraph.util.taskcluster import send_email
+from .registry import register_callback_action
+
+logger = logging.getLogger(__name__)
+
+EMAIL_SUBJECT = 'Your Interactive Task for {label}'
+EMAIL_CONTENT = '''\
+As you requested, Firefox CI has created an interactive task to run {label}
+on revision {revision} in {repo}. Click the button below to connect to the
+task. You may need to wait for it to begin running.
+'''
+
+
+@register_callback_action(
+    title='Create Interactive Task',
+    name='create-interactive',
+    symbol='create-inter',
+    kind='hook',
+    generic=True,
+    description=(
+        'Create a a copy of the task that you can interact with'
+    ),
+    order=1,
+    context=[{'worker-implementation': 'docker-worker'}],
+    schema={
+        'type': 'object',
+        'properties': {
+            'notify': {
+                'type': 'string',
+                'format': 'email',
+                'title': 'Who to notify of the pending interactive task',
+                'description': (
+                    'Enter your email here to get an email containing a link '
+                    'to interact with the task'
+                ),
+                # include a default for ease of users' editing
+                'default': 'noreply@noreply.mozilla.org',
+            },
+        },
+        'additionalProperties': False,
+    },
+)
+def create_interactive_action(parameters, graph_config, input, task_group_id, task_id, task):
+    # fetch the original task definition from the taskgraph, to avoid
+    # creating interactive copies of unexpected tasks.  Note that this only applies
+    # to docker-worker tasks, so we can assume the docker-worker payload format.
+    decision_task_id, full_task_graph, label_to_taskid = fetch_graph_and_labels(
+        parameters, graph_config)
+    label = task['metadata']['name']
+
+    def edit(task):
+        if task.label != label:
+            return task
+        task_def = task.task
+
+        # drop task routes (don't index this!)
+        task_def['routes'] = []
+
+        # only try this once
+        task_def['retries'] = 0
+
+        # short expirations, at least 3 hour maxRunTime
+        task_def['deadline'] = {'relative-datestamp': '12 hours'}
+        task_def['created'] = {'relative-datestamp': '0 hours'}
+        task_def['expires'] = {'relative-datestamp': '1 day'}
+        payload = task_def['payload']
+        payload['maxRunTime'] = max(3600 * 3, payload.get('maxRunTime', 0))
+
+        # no caches
+        task_def['scopes'] = [s for s in task_def['scopes']
+                              if not s.startswith('docker-worker:cache:')]
+        payload['cache'] = {}
+
+        # no artifacts
+        payload['artifacts'] = {}
+
+        # enable interactive mode
+        payload.setdefault('features', {})['interactive'] = True
+        payload.setdefault('env', {})['TASKCLUSTER_INTERACTIVE'] = 'true'
+
+        return task
+
+    # Create the task and any of its dependencies. This uses a new taskGroupId to avoid
+    # polluting the existing taskGroup with interactive tasks.
+    label_to_taskid = create_tasks([label], full_task_graph, label_to_taskid,
+                                   parameters, modifier=edit)
+
+    taskId = label_to_taskid[label]
+
+    if input and 'notify' in input:
+        email = input['notify']
+        # no point sending to a noreply address!
+        if email == 'noreply@noreply.mozilla.org':
+            return
+
+        info = {
+            'url': 'https://tools.taskcluster.net/tasks/{}/connect'.format(taskId),
+            'label': label,
+            'revision': parameters['head_rev'],
+            'repo': parameters['head_repository'],
+        }
+        send_email(
+            email,
+            subject=EMAIL_SUBJECT.format(**info),
+            content=EMAIL_CONTENT.format(**info),
+            link={
+                'text': 'Connect',
+                'href': info['url'],
+            },
+            use_proxy=True)
diff --git a/taskcluster/taskgraph/actions/util.py b/taskcluster/taskgraph/actions/util.py
--- a/taskcluster/taskgraph/actions/util.py
+++ b/taskcluster/taskgraph/actions/util.py
@@ -121,11 +121,13 @@
     Optionally this function takes a `modifier` function that is passed in each
     task before it is put into a new graph. It should return a valid task. Note
     that this is passed _all_ tasks in the graph, not just the set in to_run. You
     may want to skip modifying tasks not in your to_run list.
 
-    If you wish to create the tasks in a new group, leave out decision_task_id."""
+    If you wish to create the tasks in a new group, leave out decision_task_id.
+
+    Returns an updated label_to_taskid containing the new tasks"""
     if suffix != '':
         suffix = '-{}'.format(suffix)
     to_run = set(to_run)
 
     #  Copy to avoid side-effects later
@@ -143,5 +145,6 @@
                                                                 label_to_taskid)
     write_artifact('task-graph{}.json'.format(suffix), optimized_task_graph.to_json())
     write_artifact('label-to-taskid{}.json'.format(suffix), label_to_taskid)
     write_artifact('to-run{}.json'.format(suffix), list(to_run))
     create.create_tasks(optimized_task_graph, label_to_taskid, params, decision_task_id)
+    return label_to_taskid
diff --git a/taskcluster/taskgraph/util/taskcluster.py b/taskcluster/taskgraph/util/taskcluster.py
--- a/taskcluster/taskgraph/util/taskcluster.py
+++ b/taskcluster/taskgraph/util/taskcluster.py
@@ -226,5 +226,20 @@
         tmpl = _PRIVATE_TC_ARTIFACT_LOCATION
 
     return tmpl.format(
         task_id=task_id, postfix=postfix, artifact_prefix=artifact_prefix
     )
+
+
+def send_email(address, subject, content, link, use_proxy=False):
+    """Sends an email using the notify service"""
+    logger.info('Sending email to {}.'.format(address))
+    if use_proxy:
+        url = 'http://taskcluster/notify/v1/email'
+    else:
+        url = 'https://notify.taskcluster.net/v1/email'
+    _do_request(url, json={
+        'address': address,
+        'subject': subject,
+        'content': content,
+        'link': link,
+    })
diff --git a/testing/firefox-ui/tests/functional/sessionstore/session_store_test_case.py b/testing/firefox-ui/tests/functional/sessionstore/session_store_test_case.py
--- a/testing/firefox-ui/tests/functional/sessionstore/session_store_test_case.py
+++ b/testing/firefox-ui/tests/functional/sessionstore/session_store_test_case.py
@@ -1,285 +1,285 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.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 firefox_puppeteer import PuppeteerMixin
-from marionette_harness import MarionetteTestCase
-
-
-class SessionStoreTestCase(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self, startup_page=1, include_private=True, no_auto_updates=True):
-        super(SessionStoreTestCase, self).setUp()
-        # Each list element represents a window of tabs loaded at
-        # some testing URL
-        self.test_windows = set([
-            # Window 1. Note the comma after the absolute_url call -
-            # this is Python's way of declaring a 1 item tuple.
-            (self.marionette.absolute_url('layout/mozilla.html'), ),
-
-            # Window 2
-            (self.marionette.absolute_url('layout/mozilla_organizations.html'),
-             self.marionette.absolute_url('layout/mozilla_community.html')),
-
-            # Window 3
-            (self.marionette.absolute_url('layout/mozilla_governance.html'),
-             self.marionette.absolute_url('layout/mozilla_grants.html')),
-        ])
-
-        self.private_windows = set([
-            (self.marionette.absolute_url('layout/mozilla_mission.html'),
-             self.marionette.absolute_url('layout/mozilla_organizations.html')),
-
-            (self.marionette.absolute_url('layout/mozilla_projects.html'),
-             self.marionette.absolute_url('layout/mozilla_mission.html')),
-        ])
-
-        self.marionette.enforce_gecko_prefs({
-            # Set browser restore previous session pref,
-            # depending on what the test requires.
-            'browser.startup.page': startup_page,
-            # Make the content load right away instead of waiting for
-            # the user to click on the background tabs
-            'browser.sessionstore.restore_on_demand': False,
-            # Avoid race conditions by having the content process never
-            # send us session updates unless the parent has explicitly asked
-            # for them via the TabStateFlusher.
-            'browser.sessionstore.debug.no_auto_updates': no_auto_updates,
-        })
-
-        self.all_windows = self.test_windows.copy()
-        self.open_windows(self.test_windows)
-
-        if include_private:
-            self.all_windows.update(self.private_windows)
-            self.open_windows(self.private_windows, is_private=True)
-
-    def tearDown(self):
-        try:
-            # Create a fresh profile for subsequent tests.
-            self.restart(clean=True)
-        finally:
-            super(SessionStoreTestCase, self).tearDown()
-
-    def open_windows(self, window_sets, is_private=False):
-        """ Opens a set of windows with tabs pointing at some
-        URLs.
-
-        @param window_sets (list)
-               A set of URL tuples. Each tuple within window_sets
-               represents a window, and each URL in the URL
-               tuples represents what will be loaded in a tab.
-
-               Note that if is_private is False, then the first
-               URL tuple will be opened in the current window, and
-               subequent tuples will be opened in new windows.
-
-               Example:
-
-               set(
-                   (self.marionette.absolute_url('layout/mozilla_1.html'),
-                    self.marionette.absolute_url('layout/mozilla_2.html')),
-
-                   (self.marionette.absolute_url('layout/mozilla_3.html'),
-                    self.marionette.absolute_url('layout/mozilla_4.html')),
-               )
-
-               This would take the currently open window, and load
-               mozilla_1.html and mozilla_2.html in new tabs. It would
-               then open a new, second window, and load tabs at
-               mozilla_3.html and mozilla_4.html.
-        @param is_private (boolean, optional)
-               Whether or not any new windows should be a private browsing
-               windows.
-        """
-
-        if (is_private):
-            win = self.browser.open_browser(is_private=True)
-            win.switch_to()
-        else:
-            win = self.browser
-
-        for index, urls in enumerate(window_sets):
-            if index > 0:
-                win = self.browser.open_browser(is_private=is_private)
-            win.switch_to()
-            self.open_tabs(win, urls)
-
-    def open_tabs(self, win, urls):
-        """ Opens a set of URLs inside a window in new tabs.
-
-        @param win (browser window)
-               The browser window to load the tabs in.
-        @param urls (tuple)
-               A tuple of URLs to load in this window. The
-               first URL will be loaded in the currently selected
-               browser tab. Subsequent URLs will be loaded in
-               new tabs.
-        """
-        # If there are any remaining URLs for this window,
-        # open some new tabs and navigate to them.
-        with self.marionette.using_context('content'):
-            if isinstance(urls, str):
-                self.marionette.navigate(urls)
-            else:
-                for index, url in enumerate(urls):
-                    if index > 0:
-                        with self.marionette.using_context('chrome'):
-                            win.tabbar.open_tab()
-                    self.marionette.navigate(url)
-
-    def convert_open_windows_to_set(self):
-        windows = self.puppeteer.windows.all
-
-        # There's no guarantee that Marionette will return us an
-        # iterator for the opened windows that will match the
-        # order within our window list. Instead, we'll convert
-        # the list of URLs within each open window to a set of
-        # tuples that will allow us to do a direct comparison
-        # while allowing the windows to be in any order.
-
-        opened_windows = set()
-        for win in windows:
-            urls = tuple()
-            for tab in win.tabbar.tabs:
-                urls = urls + tuple([tab.location])
-            opened_windows.add(urls)
-        return opened_windows
-
-    def simulate_os_shutdown(self):
-        """ Simulate an OS shutdown.
-
-        :raises: Exception: if not supported on the current platform
-        :raises: WindowsError: if a Windows API call failed
-        """
-
-        if self.marionette.session_capabilities['platformName'] != 'windows_nt':
-            raise Exception('Unsupported platform for simulate_os_shutdown')
-
-        self._shutdown_with_windows_restart_manager(self.marionette.process_id)
-
-    def _shutdown_with_windows_restart_manager(self, pid):
-        """ Shut down a process using the Windows Restart Manager.
-
-        When Windows shuts down, it uses a protocol including the
-        WM_QUERYENDSESSION and WM_ENDSESSION messages to give
-        applications a chance to shut down safely. The best way to
-        simulate this is via the Restart Manager, which allows a process
-        (such as an installer) to use the same mechanism to shut down
-        any other processes which are using registered resources.
-
-        This function starts a Restart Manager session, registers the
-        process as a resource, and shuts down the process.
-
-        :param pid: The process id (int) of the process to shutdown
-
-        :raises: WindowsError: if a Windows API call fails
-        """
-
-        import ctypes
-        from ctypes import Structure, POINTER, WINFUNCTYPE, windll, pointer, WinError
-        from ctypes.wintypes import HANDLE, DWORD, BOOL, WCHAR, UINT, ULONG, LPCWSTR
-
-        # set up Windows SDK types
-        OpenProcess = windll.kernel32.OpenProcess
-        OpenProcess.restype = HANDLE
-        OpenProcess.argtypes = [DWORD,  # dwDesiredAccess
-                                BOOL,   # bInheritHandle
-                                DWORD]  # dwProcessId
-        PROCESS_QUERY_INFORMATION = 0x0400
-
-        class FILETIME(Structure):
-            _fields_ = [('dwLowDateTime', DWORD),
-                        ('dwHighDateTime', DWORD)]
-        LPFILETIME = POINTER(FILETIME)
-
-        GetProcessTimes = windll.kernel32.GetProcessTimes
-        GetProcessTimes.restype = BOOL
-        GetProcessTimes.argtypes = [HANDLE,      # hProcess
-                                    LPFILETIME,  # lpCreationTime
-                                    LPFILETIME,  # lpExitTime
-                                    LPFILETIME,  # lpKernelTime
-                                    LPFILETIME]  # lpUserTime
-
-        ERROR_SUCCESS = 0
-
-        class RM_UNIQUE_PROCESS(Structure):
-            _fields_ = [('dwProcessId', DWORD),
-                        ('ProcessStartTime', FILETIME)]
-
-        RmStartSession = windll.rstrtmgr.RmStartSession
-        RmStartSession.restype = DWORD
-        RmStartSession.argtypes = [POINTER(DWORD),  # pSessionHandle
-                                   DWORD,           # dwSessionFlags
-                                   POINTER(WCHAR)]  # strSessionKey
-
-        class GUID(ctypes.Structure):
-            _fields_ = [('Data1', ctypes.c_ulong),
-                        ('Data2', ctypes.c_ushort),
-                        ('Data3', ctypes.c_ushort),
-                        ('Data4', ctypes.c_ubyte * 8)]
-        CCH_RM_SESSION_KEY = ctypes.sizeof(GUID) * 2
-
-        RmRegisterResources = windll.rstrtmgr.RmRegisterResources
-        RmRegisterResources.restype = DWORD
-        RmRegisterResources.argtypes = [DWORD,             # dwSessionHandle
-                                        UINT,              # nFiles
-                                        POINTER(LPCWSTR),  # rgsFilenames
-                                        UINT,              # nApplications
-                                        POINTER(RM_UNIQUE_PROCESS),  # rgApplications
-                                        UINT,              # nServices
-                                        POINTER(LPCWSTR)]  # rgsServiceNames
-
-        RM_WRITE_STATUS_CALLBACK = WINFUNCTYPE(None, UINT)
-        RmShutdown = windll.rstrtmgr.RmShutdown
-        RmShutdown.restype = DWORD
-        RmShutdown.argtypes = [DWORD,  # dwSessionHandle
-                               ULONG,  # lActionFlags
-                               RM_WRITE_STATUS_CALLBACK]  # fnStatus
-
-        RmEndSession = windll.rstrtmgr.RmEndSession
-        RmEndSession.restype = DWORD
-        RmEndSession.argtypes = [DWORD]  # dwSessionHandle
-
-        # Get the info needed to uniquely identify the process
-        hProc = OpenProcess(PROCESS_QUERY_INFORMATION, False, pid)
-        if not hProc:
-            raise WinError()
-
-        creationTime = FILETIME()
-        exitTime = FILETIME()
-        kernelTime = FILETIME()
-        userTime = FILETIME()
-        if not GetProcessTimes(hProc,
-                               pointer(creationTime),
-                               pointer(exitTime),
-                               pointer(kernelTime),
-                               pointer(userTime)):
-            raise WinError()
-
-        # Start the Restart Manager Session
-        dwSessionHandle = DWORD()
-        sessionKeyType = WCHAR * (CCH_RM_SESSION_KEY + 1)
-        sessionKey = sessionKeyType()
-        if RmStartSession(pointer(dwSessionHandle), 0, sessionKey) != ERROR_SUCCESS:
-            raise WinError()
-
-        try:
-            UProcs_count = 1
-            UProcsArrayType = RM_UNIQUE_PROCESS * UProcs_count
-            UProcs = UProcsArrayType(RM_UNIQUE_PROCESS(pid, creationTime))
-
-            # Register the process as a resource
-            if RmRegisterResources(dwSessionHandle,
-                                   0, None,
-                                   UProcs_count, UProcs,
-                                   0, None) != ERROR_SUCCESS:
-                raise WinError()
-
-            # Shut down all processes using registered resources
-            if RmShutdown(dwSessionHandle, 0,
-                          ctypes.cast(None, RM_WRITE_STATUS_CALLBACK)) != ERROR_SUCCESS:
-                raise WinError()
-
-        finally:
-            RmEndSession(dwSessionHandle)
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.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 firefox_puppeteer import PuppeteerMixin
+from marionette_harness import MarionetteTestCase
+
+
+class SessionStoreTestCase(PuppeteerMixin, MarionetteTestCase):
+
+    def setUp(self, startup_page=1, include_private=True, no_auto_updates=True):
+        super(SessionStoreTestCase, self).setUp()
+        # Each list element represents a window of tabs loaded at
+        # some testing URL
+        self.test_windows = set([
+            # Window 1. Note the comma after the absolute_url call -
+            # this is Python's way of declaring a 1 item tuple.
+            (self.marionette.absolute_url('layout/mozilla.html'), ),
+
+            # Window 2
+            (self.marionette.absolute_url('layout/mozilla_organizations.html'),
+             self.marionette.absolute_url('layout/mozilla_community.html')),
+
+            # Window 3
+            (self.marionette.absolute_url('layout/mozilla_governance.html'),
+             self.marionette.absolute_url('layout/mozilla_grants.html')),
+        ])
+
+        self.private_windows = set([
+            (self.marionette.absolute_url('layout/mozilla_mission.html'),
+             self.marionette.absolute_url('layout/mozilla_organizations.html')),
+
+            (self.marionette.absolute_url('layout/mozilla_projects.html'),
+             self.marionette.absolute_url('layout/mozilla_mission.html')),
+        ])
+
+        self.marionette.enforce_gecko_prefs({
+            # Set browser restore previous session pref,
+            # depending on what the test requires.
+            'browser.startup.page': startup_page,
+            # Make the content load right away instead of waiting for
+            # the user to click on the background tabs
+            'browser.sessionstore.restore_on_demand': False,
+            # Avoid race conditions by having the content process never
+            # send us session updates unless the parent has explicitly asked
+            # for them via the TabStateFlusher.
+            'browser.sessionstore.debug.no_auto_updates': no_auto_updates,
+        })
+
+        self.all_windows = self.test_windows.copy()
+        self.open_windows(self.test_windows)
+
+        if include_private:
+            self.all_windows.update(self.private_windows)
+            self.open_windows(self.private_windows, is_private=True)
+
+    def tearDown(self):
+        try:
+            # Create a fresh profile for subsequent tests.
+            self.restart(clean=True)
+        finally:
+            super(SessionStoreTestCase, self).tearDown()
+
+    def open_windows(self, window_sets, is_private=False):
+        """ Opens a set of windows with tabs pointing at some
+        URLs.
+
+        @param window_sets (list)
+               A set of URL tuples. Each tuple within window_sets
+               represents a window, and each URL in the URL
+               tuples represents what will be loaded in a tab.
+
+               Note that if is_private is False, then the first
+               URL tuple will be opened in the current window, and
+               subequent tuples will be opened in new windows.
+
+               Example:
+
+               set(
+                   (self.marionette.absolute_url('layout/mozilla_1.html'),
+                    self.marionette.absolute_url('layout/mozilla_2.html')),
+
+                   (self.marionette.absolute_url('layout/mozilla_3.html'),
+                    self.marionette.absolute_url('layout/mozilla_4.html')),
+               )
+
+               This would take the currently open window, and load
+               mozilla_1.html and mozilla_2.html in new tabs. It would
+               then open a new, second window, and load tabs at
+               mozilla_3.html and mozilla_4.html.
+        @param is_private (boolean, optional)
+               Whether or not any new windows should be a private browsing
+               windows.
+        """
+
+        if (is_private):
+            win = self.browser.open_browser(is_private=True)
+            win.switch_to()
+        else:
+            win = self.browser
+
+        for index, urls in enumerate(window_sets):
+            if index > 0:
+                win = self.browser.open_browser(is_private=is_private)
+            win.switch_to()
+            self.open_tabs(win, urls)
+
+    def open_tabs(self, win, urls):
+        """ Opens a set of URLs inside a window in new tabs.
+
+        @param win (browser window)
+               The browser window to load the tabs in.
+        @param urls (tuple)
+               A tuple of URLs to load in this window. The
+               first URL will be loaded in the currently selected
+               browser tab. Subsequent URLs will be loaded in
+               new tabs.
+        """
+        # If there are any remaining URLs for this window,
+        # open some new tabs and navigate to them.
+        with self.marionette.using_context('content'):
+            if isinstance(urls, str):
+                self.marionette.navigate(urls)
+            else:
+                for index, url in enumerate(urls):
+                    if index > 0:
+                        with self.marionette.using_context('chrome'):
+                            win.tabbar.open_tab()
+                    self.marionette.navigate(url)
+
+    def convert_open_windows_to_set(self):
+        windows = self.puppeteer.windows.all
+
+        # There's no guarantee that Marionette will return us an
+        # iterator for the opened windows that will match the
+        # order within our window list. Instead, we'll convert
+        # the list of URLs within each open window to a set of
+        # tuples that will allow us to do a direct comparison
+        # while allowing the windows to be in any order.
+
+        opened_windows = set()
+        for win in windows:
+            urls = tuple()
+            for tab in win.tabbar.tabs:
+                urls = urls + tuple([tab.location])
+            opened_windows.add(urls)
+        return opened_windows
+
+    def simulate_os_shutdown(self):
+        """ Simulate an OS shutdown.
+
+        :raises: Exception: if not supported on the current platform
+        :raises: WindowsError: if a Windows API call failed
+        """
+
+        if self.marionette.session_capabilities['platformName'] != 'windows':
+            raise Exception('Unsupported platform for simulate_os_shutdown')
+
+        self._shutdown_with_windows_restart_manager(self.marionette.process_id)
+
+    def _shutdown_with_windows_restart_manager(self, pid):
+        """ Shut down a process using the Windows Restart Manager.
+
+        When Windows shuts down, it uses a protocol including the
+        WM_QUERYENDSESSION and WM_ENDSESSION messages to give
+        applications a chance to shut down safely. The best way to
+        simulate this is via the Restart Manager, which allows a process
+        (such as an installer) to use the same mechanism to shut down
+        any other processes which are using registered resources.
+
+        This function starts a Restart Manager session, registers the
+        process as a resource, and shuts down the process.
+
+        :param pid: The process id (int) of the process to shutdown
+
+        :raises: WindowsError: if a Windows API call fails
+        """
+
+        import ctypes
+        from ctypes import Structure, POINTER, WINFUNCTYPE, windll, pointer, WinError
+        from ctypes.wintypes import HANDLE, DWORD, BOOL, WCHAR, UINT, ULONG, LPCWSTR
+
+        # set up Windows SDK types
+        OpenProcess = windll.kernel32.OpenProcess
+        OpenProcess.restype = HANDLE
+        OpenProcess.argtypes = [DWORD,  # dwDesiredAccess
+                                BOOL,   # bInheritHandle
+                                DWORD]  # dwProcessId
+        PROCESS_QUERY_INFORMATION = 0x0400
+
+        class FILETIME(Structure):
+            _fields_ = [('dwLowDateTime', DWORD),
+                        ('dwHighDateTime', DWORD)]
+        LPFILETIME = POINTER(FILETIME)
+
+        GetProcessTimes = windll.kernel32.GetProcessTimes
+        GetProcessTimes.restype = BOOL
+        GetProcessTimes.argtypes = [HANDLE,      # hProcess
+                                    LPFILETIME,  # lpCreationTime
+                                    LPFILETIME,  # lpExitTime
+                                    LPFILETIME,  # lpKernelTime
+                                    LPFILETIME]  # lpUserTime
+
+        ERROR_SUCCESS = 0
+
+        class RM_UNIQUE_PROCESS(Structure):
+            _fields_ = [('dwProcessId', DWORD),
+                        ('ProcessStartTime', FILETIME)]
+
+        RmStartSession = windll.rstrtmgr.RmStartSession
+        RmStartSession.restype = DWORD
+        RmStartSession.argtypes = [POINTER(DWORD),  # pSessionHandle
+                                   DWORD,           # dwSessionFlags
+                                   POINTER(WCHAR)]  # strSessionKey
+
+        class GUID(ctypes.Structure):
+            _fields_ = [('Data1', ctypes.c_ulong),
+                        ('Data2', ctypes.c_ushort),
+                        ('Data3', ctypes.c_ushort),
+                        ('Data4', ctypes.c_ubyte * 8)]
+        CCH_RM_SESSION_KEY = ctypes.sizeof(GUID) * 2
+
+        RmRegisterResources = windll.rstrtmgr.RmRegisterResources
+        RmRegisterResources.restype = DWORD
+        RmRegisterResources.argtypes = [DWORD,             # dwSessionHandle
+                                        UINT,              # nFiles
+                                        POINTER(LPCWSTR),  # rgsFilenames
+                                        UINT,              # nApplications
+                                        POINTER(RM_UNIQUE_PROCESS),  # rgApplications
+                                        UINT,              # nServices
+                                        POINTER(LPCWSTR)]  # rgsServiceNames
+
+        RM_WRITE_STATUS_CALLBACK = WINFUNCTYPE(None, UINT)
+        RmShutdown = windll.rstrtmgr.RmShutdown
+        RmShutdown.restype = DWORD
+        RmShutdown.argtypes = [DWORD,  # dwSessionHandle
+                               ULONG,  # lActionFlags
+                               RM_WRITE_STATUS_CALLBACK]  # fnStatus
+
+        RmEndSession = windll.rstrtmgr.RmEndSession
+        RmEndSession.restype = DWORD
+        RmEndSession.argtypes = [DWORD]  # dwSessionHandle
+
+        # Get the info needed to uniquely identify the process
+        hProc = OpenProcess(PROCESS_QUERY_INFORMATION, False, pid)
+        if not hProc:
+            raise WinError()
+
+        creationTime = FILETIME()
+        exitTime = FILETIME()
+        kernelTime = FILETIME()
+        userTime = FILETIME()
+        if not GetProcessTimes(hProc,
+                               pointer(creationTime),
+                               pointer(exitTime),
+                               pointer(kernelTime),
+                               pointer(userTime)):
+            raise WinError()
+
+        # Start the Restart Manager Session
+        dwSessionHandle = DWORD()
+        sessionKeyType = WCHAR * (CCH_RM_SESSION_KEY + 1)
+        sessionKey = sessionKeyType()
+        if RmStartSession(pointer(dwSessionHandle), 0, sessionKey) != ERROR_SUCCESS:
+            raise WinError()
+
+        try:
+            UProcs_count = 1
+            UProcsArrayType = RM_UNIQUE_PROCESS * UProcs_count
+            UProcs = UProcsArrayType(RM_UNIQUE_PROCESS(pid, creationTime))
+
+            # Register the process as a resource
+            if RmRegisterResources(dwSessionHandle,
+                                   0, None,
+                                   UProcs_count, UProcs,
+                                   0, None) != ERROR_SUCCESS:
+                raise WinError()
+
+            # Shut down all processes using registered resources
+            if RmShutdown(dwSessionHandle, 0,
+                          ctypes.cast(None, RM_WRITE_STATUS_CALLBACK)) != ERROR_SUCCESS:
+                raise WinError()
+
+        finally:
+            RmEndSession(dwSessionHandle)
diff --git a/testing/firefox-ui/tests/puppeteer/test_page_info_window.py b/testing/firefox-ui/tests/puppeteer/test_page_info_window.py
--- a/testing/firefox-ui/tests/puppeteer/test_page_info_window.py
+++ b/testing/firefox-ui/tests/puppeteer/test_page_info_window.py
@@ -67,11 +67,11 @@
                            opener,
                            )
 
         platformName = self.marionette.session_capabilities['platformName']
         for trigger in open_strategies:
-            if trigger == 'shortcut' and platformName == 'windows_nt':
+            if trigger == 'shortcut' and platformName == 'windows':
                 # The shortcut for page info window does not exist on windows.
                 self.assertRaises(ValueError, self.browser.open_page_info_window,
                                   trigger=trigger)
                 continue
 
@@ -91,11 +91,11 @@
                             closer,
                             )
         platformName = self.marionette.session_capabilities['platformName']
         for trigger in close_strategies:
             # menu only works on OS X
-            if trigger == 'menu' and platformName != 'darwin':
+            if trigger == 'menu' and platformName != 'mac':
                 continue
 
             page_info = self.browser.open_page_info_window()
             page_info.close(trigger=trigger)
             self.assertTrue(page_info.closed)
diff --git a/testing/marionette/session.js b/testing/marionette/capabilities.js
rename from testing/marionette/session.js
rename to testing/marionette/capabilities.js
--- a/testing/marionette/session.js
+++ b/testing/marionette/capabilities.js
@@ -16,37 +16,35 @@
   pprint,
 } = ChromeUtils.import("chrome://marionette/content/format.js", {});
 
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 
-this.EXPORTED_SYMBOLS = ["session"];
+this.EXPORTED_SYMBOLS = [
+  "Capabilities",
+  "PageLoadStrategy",
+  "Proxy",
+  "Timeouts",
+];
 
 // Enable testing this module, as Services.appinfo.* is not available
 // in xpcshell tests.
 const appinfo = {name: "<missing>", version: "<missing>"};
 try { appinfo.name = Services.appinfo.name.toLowerCase(); } catch (e) {}
 try { appinfo.version = Services.appinfo.version; } catch (e) {}
 
-/**
- * State associated with a WebDriver session.
- *
- * @namespace
- */
-this.session = {};
-
 /** Representation of WebDriver session timeouts. */
-session.Timeouts = class {
+class Timeouts {
   constructor() {
     // disabled
     this.implicit = 0;
     // five mintues
     this.pageLoad = 300000;
     // 30 seconds
     this.script = 30000;
   }
 
-  toString() { return "[object session.Timeouts]"; }
+  toString() { return "[object Timeouts]"; }
 
   /** Marshals timeout durations to a JSON Object. */
   toJSON() {
     return {
       implicit: this.implicit,
@@ -56,11 +54,11 @@
   }
 
   static fromJSON(json) {
     assert.object(json,
         pprint`Expected "timeouts" to be an object, got ${json}`);
-    let t = new session.Timeouts();
+    let t = new Timeouts();
 
     for (let [type, ms] of Object.entries(json)) {
       switch (type) {
         case "implicit":
           t.implicit = assert.positiveInteger(ms,
@@ -82,18 +80,18 @@
       }
     }
 
     return t;
   }
-};
+}
 
 /**
  * Enum of page loading strategies.
  *
  * @enum
  */
-session.PageLoadStrategy = {
+const PageLoadStrategy = {
   /** No page load strategy.  Navigation will return immediately. */
   None: "none",
   /**
    * Eager, causing navigation to complete when the document reaches
    * the <code>interactive</code> ready state.
@@ -105,11 +103,11 @@
    */
   Normal: "normal",
 };
 
 /** Proxy configuration object representation. */
-session.Proxy = class {
+class Proxy {
   /** @class */
   constructor() {
     this.proxyType = null;
     this.ftpProxy = null;
     this.ftpProxyPort = null;
@@ -255,11 +253,11 @@
       }
 
       return [hostname, port];
     }
 
-    let p = new session.Proxy();
+    let p = new Proxy();
     if (typeof json == "undefined" || json === null) {
       return p;
     }
 
     assert.object(json, pprint`Expected "proxy" to be an object, got ${json}`);
@@ -354,27 +352,27 @@
       socksVersion: this.socksVersion,
       proxyAutoconfigUrl: this.proxyAutoconfigUrl,
     });
   }
 
-  toString() { return "[object session.Proxy]"; }
-};
+  toString() { return "[object Proxy]"; }
+}
 
 /** WebDriver session capabilities representation. */
-session.Capabilities = class extends Map {
+class Capabilities extends Map {
   /** @class */
   constructor() {
     super([
       // webdriver
       ["browserName", appinfo.name],
       ["browserVersion", appinfo.version],
-      ["platformName", Services.sysinfo.getProperty("name").toLowerCase()],
+      ["platformName", getWebDriverPlatformName()],
       ["platformVersion", Services.sysinfo.getProperty("version")],
-      ["pageLoadStrategy", session.PageLoadStrategy.Normal],
+      ["pageLoadStrategy", PageLoadStrategy.Normal],
       ["acceptInsecureCerts", false],
-      ["timeouts", new session.Timeouts()],
-      ["proxy", new session.Proxy()],
+      ["timeouts", new Timeouts()],
+      ["proxy", new Proxy()],
 
       // features
       ["rotatable", appinfo.name == "B2G"],
 
       // proprietary
@@ -392,21 +390,20 @@
    *     Capability key.
    * @param {(string|number|boolean)} value
    *     JSON-safe capability value.
    */
   set(key, value) {
-    if (key === "timeouts" && !(value instanceof session.Timeouts)) {
+    if (key === "timeouts" && !(value instanceof Timeouts)) {
       throw new TypeError();
-    } else if (key === "proxy" && !(value instanceof session.Proxy)) {
+    } else if (key === "proxy" && !(value instanceof Proxy)) {
       throw new TypeError();
     }
 
     return super.set(key, value);
   }
 
-  /** @return {string} */
-  toString() { return "[object session.Capabilities]"; }
+  toString() { return "[object Capabilities]"; }
 
   /**
    * JSON serialisation of capabilities object.
    *
    * @return {Object.<string, ?>}
@@ -419,26 +416,26 @@
    * Unmarshal a JSON object representation of WebDriver capabilities.
    *
    * @param {Object.<string, *>=} json
    *     WebDriver capabilities.
    *
-   * @return {session.Capabilities}
+   * @return {Capabilities}
    *     Internal representation of WebDriver capabilities.
    */
   static fromJSON(json) {
     if (typeof json == "undefined" || json === null) {
       json = {};
     }
     assert.object(json,
         pprint`Expected "capabilities" to be an object, got ${json}"`);
 
-    return session.Capabilities.match_(json);
+    return Capabilities.match_(json);
   }
 
   // Matches capabilities as described by WebDriver.
   static match_(json = {}) {
-    let matched = new session.Capabilities();
+    let matched = new Capabilities();
 
     for (let [k, v] of Object.entries(json)) {
       switch (k) {
         case "acceptInsecureCerts":
           assert.boolean(v,
@@ -446,32 +443,32 @@
           matched.set("acceptInsecureCerts", v);
           break;
 
         case "pageLoadStrategy":
           if (v === null) {
-            matched.set("pageLoadStrategy", session.PageLoadStrategy.Normal);
+            matched.set("pageLoadStrategy", PageLoadStrategy.Normal);
           } else {
             assert.string(v,
                 pprint`Expected ${k} to be a string, got ${v}`);
 
-            if (Object.values(session.PageLoadStrategy).includes(v)) {
+            if (Object.values(PageLoadStrategy).includes(v)) {
               matched.set("pageLoadStrategy", v);
             } else {
               throw new InvalidArgumentError(
                   "Unknown page load strategy: " + v);
             }
           }
 
           break;
 
         case "proxy":
-          let proxy = session.Proxy.fromJSON(v);
+          let proxy = Proxy.fromJSON(v);
           matched.set("proxy", proxy);
           break;
 
         case "timeouts":
-          let timeouts = session.Timeouts.fromJSON(v);
+          let timeouts = Timeouts.fromJSON(v);
           matched.set("timeouts", timeouts);
           break;
 
         case "moz:accessibilityChecks":
           assert.boolean(v,
@@ -493,11 +490,31 @@
       }
     }
 
     return matched;
   }
-};
+}
+
+this.Capabilities = Capabilities;
+this.PageLoadStrategy = PageLoadStrategy;
+this.Proxy = Proxy;
+this.Timeouts = Timeouts;
+
+function getWebDriverPlatformName() {
+  let name = Services.sysinfo.getProperty("name");
+
+  switch (name) {
+    case "Windows_NT":
+      return "windows";
+
+    case "Darwin":
+      return "mac";
+
+    default:
+      return name.toLowerCase();
+  }
+}
 
 // Specialisation of |JSON.stringify| that produces JSON-safe object
 // literals, dropping empty objects and entries which values are undefined
 // or null.  Objects are allowed to produce their own JSON representations
 // by implementing a |toJSON| function.
diff --git a/testing/marionette/doc/internals/capabilities.rst b/testing/marionette/doc/internals/capabilities.rst
new file mode 100644
--- /dev/null
+++ b/testing/marionette/doc/internals/capabilities.rst
@@ -0,0 +1,22 @@
+capabilities module
+===================
+
+Timeouts
+--------
+.. js:autoclass:: Timeouts
+  :members:
+
+PageLoadStrategy
+----------------
+.. js:autoclass:: PageLoadStrategy
+  :members:
+
+Proxy
+-----
+.. js:autoclass:: Proxy
+  :members:
+
+Capabilities
+------------
+.. js:autoclass:: Capabilities
+  :members:
diff --git a/testing/marionette/doc/internals/session.rst b/testing/marionette/doc/internals/session.rst
deleted file mode 100644
--- a/testing/marionette/doc/internals/session.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-session module
-==============
-
-Timeouts
---------
-.. js:autoclass:: session.Timeouts
-  :members:
-
-PageLoadStrategy
-----------------
-.. js:autoclass:: session.PageLoadStrategy
-  :members:
-
-Proxy
------
-.. js:autoclass:: session.Proxy
-  :members:
-
-Capabilities
-------------
-.. js:autoclass:: session.Capabilities
-  :members:
diff --git a/testing/marionette/driver.js b/testing/marionette/driver.js
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -15,10 +15,14 @@
 const {
   browser,
   Context,
   WindowState,
 } = ChromeUtils.import("chrome://marionette/content/browser.js", {});
+const {
+  Capabilities,
+  Timeouts,
+} = ChromeUtils.import("chrome://marionette/content/capabilities.js", {});
 ChromeUtils.import("chrome://marionette/content/capture.js");
 const {
   CertificateOverrideManager,
   InsecureSweepingOverride,
 } = ChromeUtils.import("chrome://marionette/content/cert.js", {});
@@ -49,11 +53,10 @@
 const {Log} = ChromeUtils.import("chrome://marionette/content/log.js", {});
 ChromeUtils.import("chrome://marionette/content/modal.js");
 const {MarionettePrefs} = ChromeUtils.import("chrome://marionette/content/prefs.js", {});
 ChromeUtils.import("chrome://marionette/content/proxy.js");
 ChromeUtils.import("chrome://marionette/content/reftest.js");
-ChromeUtils.import("chrome://marionette/content/session.js");
 const {
   PollPromise,
   TimedPromise,
 } = ChromeUtils.import("chrome://marionette/content/sync.js", {});
 
@@ -142,11 +145,11 @@
   this.context = Context.Content;
 
   this.sandboxes = new Sandboxes(() => this.getCurrentWindow());
   this.legacyactions = new legacyaction.Chain();
 
-  this.capabilities = new session.Capabilities();
+  this.capabilities = new Capabilities();
 
   this.mm = globalMessageManager;
   this.listener = proxy.toListener(
       this.sendAsync.bind(this), () => this.curBrowser);
 
@@ -701,11 +704,11 @@
     throw new SessionNotCreatedError("Maximum number of active sessions");
   }
   this.sessionID = WebElement.generateUUID();
 
   try {
-    this.capabilities = session.Capabilities.fromJSON(cmd.parameters);
+    this.capabilities = Capabilities.fromJSON(cmd.parameters);
 
     if (!this.secureTLS) {
       logger.warn("TLS certificate errors will be ignored for this session");
       let acceptAllCerts = new InsecureSweepingOverride();
       CertificateOverrideManager.install(acceptAllCerts);
@@ -1870,11 +1873,11 @@
  *     not an integer.
  */
 GeckoDriver.prototype.setTimeouts = function(cmd) {
   // merge with existing timeouts
   let merged = Object.assign(this.timeouts.toJSON(), cmd.parameters);
-  this.timeouts = session.Timeouts.fromJSON(merged);
+  this.timeouts = Timeouts.fromJSON(merged);
 };
 
 /** Single tap. */
 GeckoDriver.prototype.singleTap = async function(cmd) {
   assert.open(this.getCurrentWindow());
@@ -2853,11 +2856,11 @@
 
   this.sandboxes.clear();
   CertificateOverrideManager.uninstall();
 
   this.sessionID = null;
-  this.capabilities = new session.Capabilities();
+  this.capabilities = new Capabilities();
 };
 
 /**
  * Takes a screenshot of a web element, current frame, or viewport.
  *
diff --git a/testing/marionette/format.js b/testing/marionette/format.js
--- a/testing/marionette/format.js
+++ b/testing/marionette/format.js
@@ -10,18 +10,18 @@
 
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
 this.EXPORTED_SYMBOLS = ["pprint", "truncate"];
 
+const ELEMENT_NODE = 1;
 const MAX_STRING_LENGTH = 250;
 
 /**
  * Pretty-print values passed to template strings.
  *
- * Usage:
+ * Usage::
  *
- * <pre><code>
  *     const {pprint} = Cu.import("chrome://marionette/content/error.js", {});
  *     let bool = {value: true};
  *     pprint`Expected boolean, got ${bool}`;
  *     => 'Expected boolean, got [object Object] {"value": true}'
  *
@@ -29,17 +29,16 @@
  *     pprint`Expected element ${htmlElement}`;
  *     => 'Expected element <input id="foo" class="bar baz" type="input">'
  *
  *     pprint`Current window: ${window}`;
  *     => '[object Window https://www.mozilla.org/]'
- * </code></pre>
  */
 function pprint(ss, ...values) {
   function pretty(val) {
     let proto = Object.prototype.toString.call(val);
-
-    if (val && val.nodeType === 1) {
+    if (typeof val == "object" && val !== null &&
+        "nodeType" in val && val.nodeType === ELEMENT_NODE) {
       return prettyElement(val);
     } else if (["[object Window]", "[object ChromeWindow]"].includes(proto)) {
       return prettyWindowGlobal(val);
     } else if (proto == "[object Attr]") {
       return prettyAttr(val);
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py b/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_capabilities.py
@@ -19,12 +19,21 @@
                   name: Services.appinfo.name,
                   version: Services.appinfo.version,
                   processID: Services.appinfo.processID,
                 }
                 """)
-            self.os_name = self.marionette.execute_script(
-                "return Services.sysinfo.getProperty('name')").lower()
+            self.os_name = self.marionette.execute_script("""
+                let name = Services.sysinfo.getProperty("name");
+                switch (name) {
+                  case "Windows_NT":
+                    return "windows";
+                  case "Darwin":
+                    return "mac";
+                  default:
+                    return name.toLowerCase();
+                }
+                """)
             self.os_version = self.marionette.execute_script(
                 "return Services.sysinfo.getProperty('version')")
 
     def get_fennec_profile(self):
         profile = self.marionette.instance.runner.device.app_ctx.remote_profile
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_key_actions.py b/testing/marionette/harness/marionette_harness/tests/unit/test_key_actions.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_key_actions.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_key_actions.py
@@ -19,11 +19,11 @@
 
 class TestKeyActions(WindowManagerMixin, MarionetteTestCase):
 
     def setUp(self):
         super(TestKeyActions, self).setUp()
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
         test_html = self.marionette.absolute_url("keyboard.html")
         self.marionette.navigate(test_html)
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py b/testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_legacy_mouse_action.py
@@ -20,11 +20,11 @@
 class BaseLegacyMouseAction(MarionetteTestCase):
 
     def setUp(self):
         super(BaseLegacyMouseAction, self).setUp()
 
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
 
         self.action = Actions(self.marionette)
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py b/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_mouse_action.py
@@ -63,11 +63,11 @@
 class BaseMouseAction(MarionetteTestCase):
 
     def setUp(self):
         super(BaseMouseAction, self).setUp()
 
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
 
         self.action = Actions(self.marionette)
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py b/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_navigation.py
@@ -48,11 +48,11 @@
         self.test_page_not_remote = "about:robots"
         self.test_page_push_state = self.marionette.absolute_url("navigation_pushstate.html")
         self.test_page_remote = self.marionette.absolute_url("test.html")
         self.test_page_slow_resource = self.marionette.absolute_url("slow_resource.html")
 
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
 
         def open_with_link():
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py b/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_switch_window_content.py
@@ -13,11 +13,11 @@
 class TestSwitchToWindowContent(WindowManagerMixin, MarionetteTestCase):
 
     def setUp(self):
         super(TestSwitchToWindowContent, self).setUp()
 
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
 
         self.empty_page = self.marionette.absolute_url("empty.html")
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_typing.py b/testing/marionette/harness/marionette_harness/tests/unit/test_typing.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_typing.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_typing.py
@@ -20,11 +20,11 @@
 class TypingTestCase(MarionetteTestCase):
 
     def setUp(self):
         super(TypingTestCase, self).setUp()
 
-        if self.marionette.session_capabilities["platformName"] == "darwin":
+        if self.marionette.session_capabilities["platformName"] == "mac":
             self.mod_key = Keys.META
         else:
             self.mod_key = Keys.CONTROL
 
 
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_window_maximize.py b/testing/marionette/harness/marionette_harness/tests/unit/test_window_maximize.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_window_maximize.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_window_maximize.py
@@ -29,11 +29,11 @@
     def tearDown(self):
         self.marionette.set_window_rect(
             width=self.original_size["width"], height=self.original_size["height"])
 
     def assert_window_maximized(self, actual, delta=None):
-        if self.marionette.session_capabilities["platformName"] == "windows_nt":
+        if self.marionette.session_capabilities["platformName"] == "windows":
             delta = 16
         else:
             delta = 22
 
         self.assertGreaterEqual(
diff --git a/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py b/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_window_rect.py
@@ -184,17 +184,17 @@
             self.assertLessEqual(new_position["y"], 0)
 
         # On macOS, windows can only be moved off the screen on the
         # horizontal axis.  The system menu bar also blocks windows from
         # being moved to (0,0).
-        elif os == "darwin":
+        elif os == "mac":
             self.assertEqual(-8, new_position["x"])
             self.assertEqual(23, new_position["y"])
 
         # It turns out that Windows is the only platform on which the
         # window can be reliably positioned off-screen.
-        elif os == "windows_nt":
+        elif os == "windows":
             self.assertEqual(-8, new_position["x"])
             self.assertEqual(-8, new_position["y"])
 
     def test_resize_larger_than_screen(self):
         new_size = self.marionette.set_window_rect(
diff --git a/testing/marionette/jar.mn b/testing/marionette/jar.mn
--- a/testing/marionette/jar.mn
+++ b/testing/marionette/jar.mn
@@ -8,10 +8,11 @@
   content/action.js (action.js)
   content/addon.js (addon.js)
   content/assert.js (assert.js)
   content/atom.js (atom.js)
   content/browser.js (browser.js)
+  content/capabilities.js (capabilities.js)
   content/capture.js (capture.js)
   content/cert.js (cert.js)
   content/cookie.js (cookie.js)
   content/dom.js (dom.js)
   content/driver.js (driver.js)
@@ -32,11 +33,10 @@
   content/prefs.js (prefs.js)
   content/proxy.js (proxy.js)
   content/reftest.js (reftest.js)
   content/reftest.xul (reftest.xul)
   content/server.js (server.js)
-  content/session.js (session.js)
   content/stream-utils.js (stream-utils.js)
   content/sync.js (sync.js)
   content/transport.js (transport.js)
 #ifdef ENABLE_TESTS
   content/test2.xul (chrome/test2.xul)
diff --git a/testing/marionette/listener.js b/testing/marionette/listener.js
--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -15,10 +15,14 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 ChromeUtils.import("chrome://marionette/content/accessibility.js");
 ChromeUtils.import("chrome://marionette/content/action.js");
 ChromeUtils.import("chrome://marionette/content/atom.js");
+const {
+  Capabilities,
+  PageLoadStrategy,
+} = ChromeUtils.import("chrome://marionette/content/capabilities.js", {});
 ChromeUtils.import("chrome://marionette/content/capture.js");
 const {
   element,
   WebElement,
 } = ChromeUtils.import("chrome://marionette/content/element.js", {});
@@ -39,11 +43,10 @@
 ChromeUtils.import("chrome://marionette/content/interaction.js");
 ChromeUtils.import("chrome://marionette/content/legacyaction.js");
 const {Log} = ChromeUtils.import("chrome://marionette/content/log.js", {});
 ChromeUtils.import("chrome://marionette/content/navigate.js");
 ChromeUtils.import("chrome://marionette/content/proxy.js");
-ChromeUtils.import("chrome://marionette/content/session.js");
 
 XPCOMUtils.defineLazyGetter(this, "logger", () => Log.getWithPrefix(outerWindowID));
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 
 let {outerWindowID} = winUtil;
@@ -68,11 +71,11 @@
 ]);
 
 Object.defineProperty(this, "capabilities", {
   get() {
     let payload = sendSyncMessage("Marionette:WebDriver:GetCapabilities");
-    return session.Capabilities.fromJSON(payload[0]);
+    return Capabilities.fromJSON(payload[0]);
   },
   configurable: true,
 });
 
 let legacyactions = new legacyaction.Chain();
@@ -276,12 +279,11 @@
         // special-case about:blocked pages which should be treated as
         // non-error pages but do not raise a pageshow event. about:blank
         // is also treaded specifically here, because it gets temporary
         // loaded for new content processes, and we only want to rely on
         // complete loads for it.
-        } else if ((capabilities.get("pageLoadStrategy") ===
-            session.PageLoadStrategy.Eager &&
+        } else if ((capabilities.get("pageLoadStrategy") === PageLoadStrategy.Eager &&
             documentURI != "about:blank") ||
             /about:blocked\?/.exec(documentURI)) {
           this.stop();
           sendOk(this.commandID);
           finished = true;
@@ -395,12 +397,11 @@
   navigate(trigger, commandID, timeout, loadEventExpected = true,
       useUnloadTimer = false) {
 
     // Only wait if the page load strategy is not `none`
     loadEventExpected = loadEventExpected &&
-        (capabilities.get("pageLoadStrategy") !==
-        session.PageLoadStrategy.None);
+        (capabilities.get("pageLoadStrategy") !== PageLoadStrategy.None);
 
     if (loadEventExpected) {
       let startTime = new Date().getTime();
       this.start(commandID, timeout, startTime, true);
     }
diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/api/keys.py
@@ -6,14 +6,16 @@
 
 import marionette_driver
 
 
 class Keys(marionette_driver.keys.Keys):
-    """Proxy to marionette's keys with an "accel" provided for convenience
-    testing across platforms."""
+    """
+    Proxy to Marionette's keys with an "accel" provided for convenience
+    testing across platforms.
+    """
 
     def __init__(self, marionette):
-        self.isDarwin = marionette.session_capabilities['platformName'] == 'darwin'
+        self.is_mac = marionette.session_capabilities["platformName"] == "mac"
 
     @property
     def ACCEL(self):
-        return self.META if self.isDarwin else self.CONTROL
+        return self.META if self.is_mac else self.CONTROL
diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/window.py
@@ -244,11 +244,11 @@
             if callable(trigger):
                 trigger(win)
             elif trigger == 'menu':
                 self.menubar.select_by_id('tools-menu', 'menu_pageInfo')
             elif trigger == 'shortcut':
-                if win.marionette.session_capabilities['platformName'] == 'windows_nt':
+                if win.marionette.session_capabilities['platformName'] == 'windows':
                     raise ValueError('Page info shortcut not available on Windows.')
                 win.send_shortcut(win.localize_entity('pageInfoCmd.commandkey'),
                                   accel=True)
             elif trigger == 'context_menu':
                 # TODO: Add once we can do right clicks
diff --git a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/windows.py
@@ -392,11 +392,11 @@
         """
 
         platform = self.marionette.session_capabilities['platformName']
 
         keymap = {
-            'accel': Keys.META if platform == 'darwin' else Keys.CONTROL,
+            'accel': Keys.META if platform == "mac" else Keys.CONTROL,
             'alt': Keys.ALT,
             'cmd': Keys.COMMAND,
             'ctrl': Keys.CONTROL,
             'meta': Keys.META,
             'shift': Keys.SHIFT,
diff --git a/testing/marionette/test/unit/test_session.js b/testing/marionette/test/unit/test_capabilities.js
rename from testing/marionette/test/unit/test_session.js
rename to testing/marionette/test/unit/test_capabilities.js
--- a/testing/marionette/test/unit/test_session.js
+++ b/testing/marionette/test/unit/test_capabilities.js
@@ -6,29 +6,34 @@
 
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const {InvalidArgumentError} = ChromeUtils.import("chrome://marionette/content/error.js", {});
-ChromeUtils.import("chrome://marionette/content/session.js");
+const {
+  Capabilities,
+  PageLoadStrategy,
+  Proxy,
+  Timeouts,
+} = ChromeUtils.import("chrome://marionette/content/capabilities.js", {});
 
 add_test(function test_Timeouts_ctor() {
-  let ts = new session.Timeouts();
+  let ts = new Timeouts();
   equal(ts.implicit, 0);
   equal(ts.pageLoad, 300000);
   equal(ts.script, 30000);
 
   run_next_test();
 });
 
 add_test(function test_Timeouts_toString() {
-  equal(new session.Timeouts().toString(), "[object session.Timeouts]");
+  equal(new Timeouts().toString(), "[object Timeouts]");
 
   run_next_test();
 });
 
 add_test(function test_Timeouts_toJSON() {
-  let ts = new session.Timeouts();
+  let ts = new Timeouts();
   deepEqual(ts.toJSON(), {"implicit": 0, "pageLoad": 300000, "script": 30000});
 
   run_next_test();
 });
 
@@ -36,11 +41,11 @@
   let json = {
     implicit: 10,
     pageLoad: 20,
     script: 30,
   };
-  let ts = session.Timeouts.fromJSON(json);
+  let ts = Timeouts.fromJSON(json);
   equal(ts.implicit, json.implicit);
   equal(ts.pageLoad, json.pageLoad);
   equal(ts.script, json.script);
 
   run_next_test();
@@ -50,51 +55,51 @@
   let json = {
     sessionId: "foobar",
     script: 42,
   };
   try {
-    session.Timeouts.fromJSON(json);
+    Timeouts.fromJSON(json);
   } catch (e) {
     equal(e.name, InvalidArgumentError.name);
     equal(e.message, "Unrecognised timeout: sessionId");
   }
 
   run_next_test();
 });
 
 add_test(function test_Timeouts_fromJSON_invalid_type() {
   try {
-    session.Timeouts.fromJSON({script: "foobar"});
+    Timeouts.fromJSON({script: "foobar"});
   } catch (e) {
     equal(e.name, InvalidArgumentError.name);
     equal(e.message, "Expected [object String] \"script\" to be a positive integer, got [object String] \"foobar\"");
   }
 
   run_next_test();
 });
 
 add_test(function test_Timeouts_fromJSON_bounds() {
   try {
-    session.Timeouts.fromJSON({script: -42});
+    Timeouts.fromJSON({script: -42});
   } catch (e) {
     equal(e.name, InvalidArgumentError.name);
     equal(e.message, "Expected [object String] \"script\" to be a positive integer, got [object Number] -42");
   }
 
   run_next_test();
 });
 
 add_test(function test_PageLoadStrategy() {
-  equal(session.PageLoadStrategy.None, "none");
-  equal(session.PageLoadStrategy.Eager, "eager");
-  equal(session.PageLoadStrategy.Normal, "normal");
+  equal(PageLoadStrategy.None, "none");
+  equal(PageLoadStrategy.Eager, "eager");
+  equal(PageLoadStrategy.Normal, "normal");
 
   run_next_test();
 });
 
 add_test(function test_Proxy_ctor() {
-  let p = new session.Proxy();
+  let p = new Proxy();
   let props = [
     "proxyType",
     "httpProxy",
     "sslProxy",
     "ftpProxy",
@@ -109,11 +114,11 @@
 
   run_next_test();
 });
 
 add_test(function test_Proxy_init() {
-  let p = new session.Proxy();
+  let p = new Proxy();
 
   // no changed made, and 5 (system) is default
   equal(p.init(), false);
   equal(Preferences.get("network.proxy.type"), 5);
 
@@ -125,30 +130,30 @@
   equal(Preferences.get("network.proxy.type"), 2);
   equal(Preferences.get("network.proxy.autoconfig_url"),
       "http://localhost:1234");
 
   // direct
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "direct";
   ok(p.init());
   equal(Preferences.get("network.proxy.type"), 0);
 
   // autodetect
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "autodetect";
   ok(p.init());
   equal(Preferences.get("network.proxy.type"), 4);
 
   // system
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "system";
   ok(p.init());
   equal(Preferences.get("network.proxy.type"), 5);
 
   // manual
   for (let proxy of ["ftp", "http", "ssl", "socks"]) {
-    p = new session.Proxy();
+    p = new Proxy();
     p.proxyType = "manual";
     p.noProxy = ["foo", "bar"];
     p[`${proxy}Proxy`] = "foo";
     p[`${proxy}ProxyPort`] = 42;
     if (proxy === "socks") {
@@ -164,44 +169,44 @@
       equal(Preferences.get(`network.proxy.${proxy}_version`), 4);
     }
   }
 
   // empty no proxy should reset default exclustions
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
   p.noProxy = [];
   ok(p.init());
   equal(Preferences.get("network.proxy.no_proxies_on"), "");
 
   run_next_test();
 });
 
 add_test(function test_Proxy_toString() {
-  equal(new session.Proxy().toString(), "[object session.Proxy]");
+  equal(new Proxy().toString(), "[object Proxy]");
 
   run_next_test();
 });
 
 add_test(function test_Proxy_toJSON() {
-  let p = new session.Proxy();
+  let p = new Proxy();
   deepEqual(p.toJSON(), {});
 
   // autoconfig url
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "pac";
   p.proxyAutoconfigUrl = "foo";
   deepEqual(p.toJSON(), {proxyType: "pac", proxyAutoconfigUrl: "foo"});
 
   // manual proxy
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
   deepEqual(p.toJSON(), {proxyType: "manual"});
 
   for (let proxy of ["ftpProxy", "httpProxy", "sslProxy", "socksProxy"]) {
     let expected = {proxyType: "manual"};
 
-    p = new session.Proxy();
+    p = new Proxy();
     p.proxyType = "manual";
 
     if (proxy == "socksProxy") {
       p.socksVersion = 5;
       expected.socksVersion = 5;
@@ -229,63 +234,63 @@
     expected[proxy] = "[2001:db8::1]:42";
     deepEqual(p.toJSON(), expected);
   }
 
   // noProxy: add brackets for IPv6 address
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
   p.noProxy = ["2001:db8::1"];
   let expected = {proxyType: "manual", noProxy: "[2001:db8::1]"};
   deepEqual(p.toJSON(), expected);
 
   run_next_test();
 });
 
 add_test(function test_Proxy_fromJSON() {
-  let p = new session.Proxy();
-  deepEqual(p, session.Proxy.fromJSON(undefined));
-  deepEqual(p, session.Proxy.fromJSON(null));
+  let p = new Proxy();
+  deepEqual(p, Proxy.fromJSON(undefined));
+  deepEqual(p, Proxy.fromJSON(null));
 
   for (let typ of [true, 42, "foo", []]) {
-    Assert.throws(() => session.Proxy.fromJSON(typ), /InvalidArgumentError/);
+    Assert.throws(() => Proxy.fromJSON(typ), /InvalidArgumentError/);
   }
 
   // must contain a valid proxyType
-  Assert.throws(() => session.Proxy.fromJSON({}), /InvalidArgumentError/);
-  Assert.throws(() => session.Proxy.fromJSON({proxyType: "foo"}),
+  Assert.throws(() => Proxy.fromJSON({}), /InvalidArgumentError/);
+  Assert.throws(() => Proxy.fromJSON({proxyType: "foo"}),
       /InvalidArgumentError/);
 
   // autoconfig url
   for (let url of [true, 42, [], {}]) {
-    Assert.throws(() => session.Proxy.fromJSON(
+    Assert.throws(() => Proxy.fromJSON(
         {proxyType: "pac", proxyAutoconfigUrl: url}), /InvalidArgumentError/);
   }
 
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "pac";
   p.proxyAutoconfigUrl = "foo";
   deepEqual(p,
-      session.Proxy.fromJSON({proxyType: "pac", proxyAutoconfigUrl: "foo"}));
+      Proxy.fromJSON({proxyType: "pac", proxyAutoconfigUrl: "foo"}));
 
   // manual proxy
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
-  deepEqual(p, session.Proxy.fromJSON({proxyType: "manual"}));
+  deepEqual(p, Proxy.fromJSON({proxyType: "manual"}));
 
   for (let proxy of ["httpProxy", "sslProxy", "ftpProxy", "socksProxy"]) {
     let manual = {proxyType: "manual"};
 
     // invalid hosts
     for (let host of [true, 42, [], {}, null, "http://foo",
       "foo:-1", "foo:65536", "foo/test", "foo#42", "foo?foo=bar",
       "2001:db8::1"]) {
       manual[proxy] = host;
-      Assert.throws(() => session.Proxy.fromJSON(manual),
+      Assert.throws(() => Proxy.fromJSON(manual),
           /InvalidArgumentError/);
     }
 
-    p = new session.Proxy();
+    p = new Proxy();
     p.proxyType = "manual";
     if (proxy == "socksProxy") {
       manual.socksVersion = 5;
       p.socksVersion = 5;
     }
@@ -305,11 +310,11 @@
       manual[proxy] = host;
 
       p[`${proxy}`] = host_map[host].hostname;
       p[`${proxy}Port`] = host_map[host].port;
 
-      deepEqual(p, session.Proxy.fromJSON(manual));
+      deepEqual(p, Proxy.fromJSON(manual));
     }
 
     // Without a port the default port of the scheme is used
     for (let host of ["foo", "foo:"]) {
       manual[proxy] = host;
@@ -323,56 +328,57 @@
           "sslProxy": 443};
 
         p[`${proxy}Port`] = default_ports[proxy];
       }
 
-      deepEqual(p, session.Proxy.fromJSON(manual));
+      deepEqual(p, Proxy.fromJSON(manual));
     }
   }
 
   // missing required socks version
-  Assert.throws(() => session.Proxy.fromJSON(
+  Assert.throws(() => Proxy.fromJSON(
       {proxyType: "manual", socksProxy: "foo:1234"}),
       /InvalidArgumentError/);
 
   // noProxy: invalid settings
   for (let noProxy of [true, 42, {}, null, "foo",
       [true], [42], [{}], [null]]) {
-    Assert.throws(() => session.Proxy.fromJSON(
+    Assert.throws(() => Proxy.fromJSON(
         {proxyType: "manual", noProxy}),
         /InvalidArgumentError/);
   }
 
   // noProxy: valid settings
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
   for (let noProxy of [[], ["foo"], ["foo", "bar"], ["127.0.0.1"]]) {
     let manual = {proxyType: "manual", "noProxy": noProxy};
     p.noProxy = noProxy;
-    deepEqual(p, session.Proxy.fromJSON(manual));
+    deepEqual(p, Proxy.fromJSON(manual));
   }
 
   // noProxy: IPv6 needs brackets removed
-  p = new session.Proxy();
+  p = new Proxy();
   p.proxyType = "manual";
   p.noProxy = ["2001:db8::1"];
   let manual = {proxyType: "manual", "noProxy": ["[2001:db8::1]"]};
-  deepEqual(p, session.Proxy.fromJSON(manual));
+  deepEqual(p, Proxy.fromJSON(manual));
 
   run_next_test();
 });
 
 add_test(function test_Capabilities_ctor() {
-  let caps = new session.Capabilities();
+  let caps = new Capabilities();
   ok(caps.has("browserName"));
   ok(caps.has("browserVersion"));
   ok(caps.has("platformName"));
+  ok(["linux", "mac", "windows", "android"].includes(caps.get("platformName")));
   ok(caps.has("platformVersion"));
-  equal(session.PageLoadStrategy.Normal, caps.get("pageLoadStrategy"));
+  equal(PageLoadStrategy.Normal, caps.get("pageLoadStrategy"));
   equal(false, caps.get("acceptInsecureCerts"));
-  ok(caps.get("timeouts") instanceof session.Timeouts);
-  ok(caps.get("proxy") instanceof session.Proxy);
+  ok(caps.get("timeouts") instanceof Timeouts);
+  ok(caps.get("proxy") instanceof Proxy);
 
   ok(caps.has("rotatable"));
 
   equal(false, caps.get("moz:accessibilityChecks"));
   ok(caps.has("moz:processID"));
@@ -382,17 +388,17 @@
 
   run_next_test();
 });
 
 add_test(function test_Capabilities_toString() {
-  equal("[object session.Capabilities]", new session.Capabilities().toString());
+  equal("[object Capabilities]", new Capabilities().toString());
 
   run_next_test();
 });
 
 add_test(function test_Capabilities_toJSON() {
-  let caps = new session.Capabilities();
+  let caps = new Capabilities();
   let json = caps.toJSON();
 
   equal(caps.get("browserName"), json.browserName);
   equal(caps.get("browserVersion"), json.browserVersion);
   equal(caps.get("platformName"), json.platformName);
@@ -413,30 +419,30 @@
 
   run_next_test();
 });
 
 add_test(function test_Capabilities_fromJSON() {
-  const {fromJSON} = session.Capabilities;
+  const {fromJSON} = Capabilities;
 
   // plain
   for (let typ of [{}, null, undefined]) {
     ok(fromJSON(typ).has("browserName"));
   }
   for (let typ of [true, 42, "foo", []]) {
     Assert.throws(() => fromJSON(typ), /InvalidArgumentError/);
   }
 
   // matching
-  let caps = new session.Capabilities();
+  let caps = new Capabilities();
 
   caps = fromJSON({acceptInsecureCerts: true});
   equal(true, caps.get("acceptInsecureCerts"));
   caps = fromJSON({acceptInsecureCerts: false});
   equal(false, caps.get("acceptInsecureCerts"));
   Assert.throws(() => fromJSON({acceptInsecureCerts: "foo"}), InvalidArgumentError);
 
-  for (let strategy of Object.values(session.PageLoadStrategy)) {
+  for (let strategy of Object.values(PageLoadStrategy)) {
     caps = fromJSON({pageLoadStrategy: strategy});
     equal(strategy, caps.get("pageLoadStrategy"));
   }
   Assert.throws(() => fromJSON({pageLoadStrategy: "foo"}), InvalidArgumentError);
 
@@ -472,13 +478,13 @@
   Assert.throws(() => fromJSON({"moz:webdriverClick": 1}), InvalidArgumentError);
 
   run_next_test();
 });
 
-// use session.Proxy.toJSON to test marshal
+// use Proxy.toJSON to test marshal
 add_test(function test_marshal() {
-  let proxy = new session.Proxy();
+  let proxy = new Proxy();
 
   // drop empty fields
   deepEqual({}, proxy.toJSON());
   proxy.proxyType = "manual";
   deepEqual({proxyType: "manual"}, proxy.toJSON());
@@ -490,18 +496,18 @@
   // iterate over object literals
   proxy.proxyType = {foo: "bar"};
   deepEqual({proxyType: {foo: "bar"}}, proxy.toJSON());
 
   // iterate over complex object that implement toJSON
-  proxy.proxyType = new session.Proxy();
+  proxy.proxyType = new Proxy();
   deepEqual({}, proxy.toJSON());
   proxy.proxyType.proxyType = "manual";
   deepEqual({proxyType: {proxyType: "manual"}}, proxy.toJSON());
 
   // drop objects with no entries
   proxy.proxyType = {foo: {}};
   deepEqual({}, proxy.toJSON());
-  proxy.proxyType = {foo: new session.Proxy()};
+  proxy.proxyType = {foo: new Proxy()};
   deepEqual({}, proxy.toJSON());
 
   run_next_test();
 });
diff --git a/testing/marionette/test/unit/xpcshell.ini b/testing/marionette/test/unit/xpcshell.ini
--- a/testing/marionette/test/unit/xpcshell.ini
+++ b/testing/marionette/test/unit/xpcshell.ini
@@ -6,16 +6,16 @@
 skip-if = appname == "thunderbird"
 
 [test_action.js]
 [test_assert.js]
 [test_browser.js]
+[test_capabilities.js]
 [test_cookie.js]
 [test_dom.js]
 [test_element.js]
 [test_error.js]
 [test_evaluate.js]
 [test_format.js]
 [test_message.js]
 [test_navigate.js]
 [test_prefs.js]
-[test_session.js]
 [test_sync.js]
diff --git a/testing/mochitest/runtests.py b/testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -865,10 +865,11 @@
         self.sslTunnel = None
         self.manifest = None
         self.tests_by_manifest = defaultdict(list)
         self.prefs_by_manifest = defaultdict(set)
         self._active_tests = None
+        self.currentTests = None
         self._locations = None
 
         self.marionette = None
         self.start_script = None
         self.mozLogs = None
@@ -2770,10 +2771,11 @@
                 # read the number of tests here, if we are not going to run any,
                 # terminate early
                 if not tests:
                     continue
 
+                self.currentTests = [t['path'] for t in tests]
                 testURL = self.buildTestURL(options, scheme=scheme)
 
                 self.buildURLOptions(options, self.browserEnv)
                 if self.urlOpts:
                     testURL += "?" + "&".join(self.urlOpts)
@@ -3028,10 +3030,15 @@
 
         def record_last_test(self, message):
             """record last test on harness"""
             if message['action'] == 'test_start':
                 self.harness.lastTestSeen = message['test']
+            elif message['action'] == 'test_end':
+                if self.harness.currentTests and message['test'] == self.harness.currentTests[-1]:
+                    self.harness.lastTestSeen = 'Last test finished'
+                else:
+                    self.harness.lastTestSeen = '{} (finished)'.format(message['test'])
             return message
 
         def dumpScreenOnTimeout(self, message):
             if (not self.dump_screen_on_fail
                     and self.dump_screen_on_timeout
diff --git a/testing/mozbase/mozfile/tests/manifest.ini b/testing/mozbase/mozfile/tests/manifest.ini
--- a/testing/mozbase/mozfile/tests/manifest.ini
+++ b/testing/mozbase/mozfile/tests/manifest.ini
@@ -1,13 +1,11 @@
 [DEFAULT]
 subsuite = mozbase, os == "linux"
 [test_extract.py]
-skip-if = python == 3
 [test_load.py]
 skip-if = python == 3
 [test_move_remove.py]
 skip-if = python == 3
 [test_tempdir.py]
 [test_tempfile.py]
-skip-if = python == 3
 [test_tree.py]
 [test_url.py]
diff --git a/testing/mozbase/mozfile/tests/test_extract.py b/testing/mozbase/mozfile/tests/test_extract.py
--- a/testing/mozbase/mozfile/tests/test_extract.py
+++ b/testing/mozbase/mozfile/tests/test_extract.py
@@ -110,18 +110,20 @@
         # test extracting some non-archive; this should fail
         fd, filename = tempfile.mkstemp()
         os.write(fd, b'This is not a zipfile or tarball')
         os.close(fd)
         exception = None
+
         try:
             dest = tempfile.mkdtemp()
             mozfile.extract(filename, dest)
-        except Exception as exception:
-            pass
+        except Exception as exc:
+            exception = exc
         finally:
             os.remove(filename)
             os.rmdir(dest)
+
         self.assertTrue(isinstance(exception, Exception))
 
     # utility functions
 
     def create_tarball(self):
diff --git a/testing/mozbase/mozfile/tests/test_tempfile.py b/testing/mozbase/mozfile/tests/test_tempfile.py
--- a/testing/mozbase/mozfile/tests/test_tempfile.py
+++ b/testing/mozbase/mozfile/tests/test_tempfile.py
@@ -33,25 +33,25 @@
             temp.write(test_string)
             # Forced flush, so that we can read later
             temp.flush()
 
             # Test we can open the file again on all platforms
-            self.assertEqual(open(temp.name).read(), test_string)
+            self.assertEqual(open(temp.name, 'rb').read(), test_string)
 
     def test_iteration(self):
         """ensure the line iterator works"""
 
         # make a file and write to it
         tf = mozfile.NamedTemporaryFile()
-        notes = ['doe', 'rae', 'mi']
+        notes = [b'doe', b'rae', b'mi']
         for note in notes:
             tf.write(b'%s\n' % note)
         tf.flush()
 
         # now read from it
         tf.seek(0)
-        lines = [line.rstrip('\n') for line in tf.readlines()]
+        lines = [line.rstrip(b'\n') for line in tf.readlines()]
         self.assertEqual(lines, notes)
 
         # now read from it iteratively
         lines = []
         for line in tf:
diff --git a/testing/mozharness/configs/android/android_common.py b/testing/mozharness/configs/android/android_common.py
--- a/testing/mozharness/configs/android/android_common.py
+++ b/testing/mozharness/configs/android/android_common.py
@@ -13,17 +13,22 @@
         "options": [
             "--app=%(app)s",
             "--remote-webserver=%(remote_webserver)s",
             "--xre-path=%(xre_path)s",
             "--utility-path=%(utility_path)s",
+            "--http-port=%(http_port)s",
+            "--ssl-port=%(ssl_port)s",
             "--certificate-path=%(certs_path)s",
             "--symbols-path=%(symbols_path)s",
             "--quiet",
             "--log-raw=%(raw_log_file)s",
+            "--log-raw-level=%(log_raw_level)s",
             "--log-errorsummary=%(error_summary_file)s",
+            "--log-tbpl-level=%(log_tbpl_level)s",
             "--screenshot-on-fail",
             "--subsuite=" + name,
+            "--deviceSerial=%(device_serial)s",
         ],
     }
 
 
 config = {
@@ -40,10 +45,12 @@
     "tooltool_cache": "/builds/worker/tooltool_cache",
     "tooltool_servers": ['http://relengapi/tooltool/'],
     "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
     "avds_dir": "/builds/worker/workspace/build/.android",
     "log_format": "%(levelname)8s - %(message)s",
+    "log_tbpl_level": "info",
+    "log_raw_level": "info",
     "minidump_stackwalk_path": "/usr/local/bin/linux64-minidump_stackwalk",
     "marionette_address": "localhost:2828",
     "marionette_test_manifest": "unit-tests.ini",
 
     "suite_definitions": {
@@ -53,18 +60,23 @@
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--extra-profile-file=fonts",
                 "--extra-profile-file=hyphenation",
                 "--screenshot-on-fail",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "mochitest-webgl1-core": WebglSuite("webgl1-core"),
         "mochitest-webgl2-core": WebglSuite("webgl2-core"),
         "mochitest-webgl1-ext": WebglSuite("webgl1-ext"),
@@ -76,71 +88,91 @@
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--extra-profile-file=fonts",
                 "--extra-profile-file=hyphenation",
                 "--screenshot-on-fail",
                 "--flavor=chrome",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "mochitest-plain-gpu": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--screenshot-on-fail",
                 "--subsuite=gpu",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "mochitest-plain-clipboard": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--screenshot-on-fail",
                 "--subsuite=clipboard",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "mochitest-media": {
             "run_filename": "runtestsremote.py",
             "testsdir": "mochitest",
             "options": [
                 "--app=%(app)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--screenshot-on-fail",
                 "--chunk-by-runtime",
                 "--subsuite=media",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "robocop": {
             "run_filename": "runrobocop.py",
             "testsdir": "mochitest",
@@ -151,12 +183,15 @@
                 "--utility-path=%(utility_path)s",
                 "--certificate-path=%(certs_path)s",
                 "--symbols-path=%(symbols_path)s",
                 "--quiet",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--robocop-apk=../../robocop.apk",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "reftest": {
             "run_filename": "remotereftest.py",
             "testsdir": "reftest",
@@ -164,17 +199,22 @@
                 "--app=%(app)s",
                 "--ignore-window-size",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--extra-profile-file=fonts",
                 "--extra-profile-file=hyphenation",
                 "--suite=reftest",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
+                "--deviceSerial=%(device_serial)s",
             ],
             "tests": ["tests/layout/reftests/reftest.list",],
         },
         "crashtest": {
             "run_filename": "remotereftest.py",
@@ -183,14 +223,18 @@
                 "--app=%(app)s",
                 "--ignore-window-size",
                 "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s",
                 "--utility-path=%(utility_path)s",
+                "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s",
                 "--httpd-path",
                 "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--suite=crashtest",
+                "--log-tbpl-level=%(log_tbpl_level)s",
+                "--deviceSerial=%(device_serial)s",
             ],
             "tests": ["tests/testing/crashtest/crashtests.list",],
         },
         "jittest": {
             "run_filename": "jit_test.py",
@@ -203,24 +247,27 @@
                 "--localLib=../../bin",
                 "--no-slow",
                 "--no-progress",
                 "--format=automation",
                 "--jitflags=all",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "jsreftest": {
             "run_filename": "remotereftest.py",
             "testsdir": "reftest",
             "options": [
                 "--app=%(app)s",
                 "--ignore-window-size",
                 "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--httpd-path", "%(modules_dir)s",
+                "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
+                "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
                 "--symbols-path=%(symbols_path)s",
                 "--extra-profile-file=jsreftest/tests/user.js",
                 "--suite=jstestbrowser",
+                "--log-tbpl-level=%(log_tbpl_level)s",
+                "--deviceSerial=%(device_serial)s",
             ],
             "tests": ["../jsreftest/tests/jstests.list",],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
@@ -232,12 +279,16 @@
                 "--apk=%(installer_path)s",
                 "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
                 "--manifest=tests/xpcshell.ini",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--test-plugin-path=none",
+                "--deviceSerial=%(device_serial)s",
+                "%(xpcshell_extra)s",
             ],
         },
         "cppunittest": {
             "run_filename": "remotecppunittests.py",
             "testsdir": "cppunittest",
@@ -246,46 +297,52 @@
                 "--symbols-path=%(symbols_path)s",
                 "--xre-path=%(xre_path)s",
                 "--localBinDir=../bin",
                 "--apk=%(installer_path)s",
                 ".",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "marionette": {
             "run_filename": os.path.join("harness", "marionette_harness", "runtests.py"),
             "testsdir": "marionette",
             "options": [
-                "--emulator",
                 "--app=fennec",
                 "--package=%(app)s",
                 "--address=%(address)s",
                 "%(test_manifest)s",
                 "--disable-e10s",
-                "--gecko-log=-",
+                "--gecko-log=%(gecko_log)s",
                 "-vv",
                 "--log-raw=%(raw_log_file)s",
+                "--log-raw-level=%(log_raw_level)s",
                 "--log-errorsummary=%(error_summary_file)s",
+                "--log-tbpl-level=%(log_tbpl_level)s",
                 "--symbols-path=%(symbols_path)s",
                 "--startup-timeout=300",
+                "--device=%(device_serial)s",
+                "%(marionette_extra)s",
             ],
         },
         "geckoview": {
             "run_filename": "rungeckoview.py",
             "testsdir": "mochitest",
             "options": [
                 "--utility-path=%(utility_path)s",
                 "--symbols-path=%(symbols_path)s",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
         "geckoview-junit": {
             "run_filename": "runjunit.py",
             "testsdir": "mochitest",
             "options": [
                 "--certificate-path=%(certs_path)s",
                 "--remote-webserver=%(remote_webserver)s",
                 "--symbols-path=%(symbols_path)s",
                 "--utility-path=%(utility_path)s",
+                "--deviceSerial=%(device_serial)s",
             ],
         },
 
     },  # end suite_definitions
 }
diff --git a/testing/mozharness/configs/android/android_hw.py b/testing/mozharness/configs/android/android_hw.py
--- a/testing/mozharness/configs/android/android_hw.py
+++ b/testing/mozharness/configs/android/android_hw.py
@@ -1,40 +1,14 @@
-import os
-
-
-def WebglSuite(name):
-    return {
-        "run_filename": "runtestsremote.py",
-        "testsdir": "mochitest",
-        "options": [
-            "--app=%(app)s",
-            "--remote-webserver=%(remote_webserver)s",
-            "--xre-path=%(xre_path)s",
-            "--utility-path=%(utility_path)s",
-            "--http-port=%(http_port)s",
-            "--ssl-port=%(ssl_port)s",
-            "--certificate-path=%(certs_path)s",
-            "--symbols-path=%(symbols_path)s",
-            "--quiet",
-            "--log-raw=%(raw_log_file)s",
-            "--log-raw-level=%(log_raw_level)s",
-            "--log-errorsummary=%(error_summary_file)s",
-            "--log-tbpl-level=%(log_tbpl_level)s",
-            "--screenshot-on-fail",
-            "--subsuite=" + name,
-            "--deviceSerial=%(device_serial)s",
-        ]
-    }
-
+# mozharness configuration for Android hardware unit tests
+#
+# This configuration should be combined with suite definitions and other
+# mozharness configuration from android_common.py, or similar.
 
 config = {
     "robocop_package_name": "org.mozilla.roboexample.test",
     "marionette_address": "%(device_ip)s:2828",
-    "marionette_test_manifest": "unit-tests.ini",
     "exes": {},
-    "log_tbpl_level": "info",
-    "log_raw_level": "info",
     "env": {
         "DISPLAY": ":0.0",
         "PATH": "%(PATH)s",
         "MINIDUMP_SAVEPATH": "%(abs_work_dir)s/../minidumps"
     },
@@ -47,306 +21,10 @@
         'run-tests',
     ],
     # from android_common.py
     "download_tooltool": True,
     "download_minidump_stackwalk": True,
-    # hostutils_manifest_path is relative to branch's root in hg.mozilla.org.
-    "hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
-    "tooltool_cache": "/builds/worker/tooltool_cache",
-    "tooltool_servers": ['https://api.pub.build.mozilla.org/tooltool/'],
+    "tooltool_servers": ['https://tooltool.mozilla-releng.net/'],
     # minidump_tooltool_manifest_path is relative to workspace/build/tests/
     "minidump_tooltool_manifest_path": "config/tooltool-manifests/linux64/releng.manifest",
-    "find_links": [
-        "https://pypi.pub.build.mozilla.org/pub",
-    ],
-    "pip_index": False,
-    "suite_definitions": {
-        "mochitest": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--extra-profile-file=fonts",
-                "--extra-profile-file=hyphenation",
-                "--screenshot-on-fail",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "mochitest-webgl1-core": WebglSuite("webgl1-core"),
-        "mochitest-webgl2-core": WebglSuite("webgl2-core"),
-        "mochitest-webgl1-ext": WebglSuite("webgl1-ext"),
-        "mochitest-webgl2-ext": WebglSuite("webgl2-ext"),
-        "mochitest-webgl2-deqp": WebglSuite("webgl2-deqp"),
-        "mochitest-chrome": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--extra-profile-file=fonts",
-                "--extra-profile-file=hyphenation",
-                "--screenshot-on-fail",
-                "--flavor=chrome",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "mochitest-plain-gpu": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--screenshot-on-fail",
-                "--subsuite=gpu",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "mochitest-plain-clipboard": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--screenshot-on-fail",
-                "--subsuite=clipboard",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "mochitest-media": {
-            "run_filename": "runtestsremote.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--screenshot-on-fail",
-                "--chunk-by-runtime",
-                "--subsuite=media",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "robocop": {
-            "run_filename": "runrobocop.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--app=%(app)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--certificate-path=%(certs_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--quiet",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--robocop-apk=../../robocop.apk",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "reftest": {
-            "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
-            "options": [
-                "--app=%(app)s",
-                "--ignore-window-size",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--httpd-path", "%(modules_dir)s",
-                "--symbols-path=%(symbols_path)s",
-                "--extra-profile-file=fonts",
-                "--extra-profile-file=hyphenation",
-                "--suite=reftest",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--deviceSerial=%(device_serial)s",
-            ],
-            "tests": ["tests/layout/reftests/reftest.list",],
-        },
-        "crashtest": {
-            "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
-            "options": [
-                "--app=%(app)s",
-                "--ignore-window-size",
-                "--remote-webserver=%(remote_webserver)s",
-                "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s",
-                "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s",
-                "--httpd-path",
-                "%(modules_dir)s",
-                "--symbols-path=%(symbols_path)s",
-                "--suite=crashtest",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--deviceSerial=%(device_serial)s",
-            ],
-            "tests": ["tests/testing/crashtest/crashtests.list",],
-        },
-        "jittest": {
-            "run_filename": "jit_test.py",
-            "testsdir": "jit-test/jit-test",
-            "options": [
-                "../../bin/js",
-                "--remote",
-                "-j",
-                "1",
-                "--localLib=../../bin",
-                "--no-slow",
-                "--no-progress",
-                "--format=automation",
-                "--jitflags=all",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "jsreftest": {
-            "run_filename": "remotereftest.py",
-            "testsdir": "reftest",
-            "options": [
-                "--app=%(app)s",
-                "--ignore-window-size",
-                "--remote-webserver=%(remote_webserver)s", "--xre-path=%(xre_path)s",
-                "--utility-path=%(utility_path)s", "--http-port=%(http_port)s",
-                "--ssl-port=%(ssl_port)s", "--httpd-path", "%(modules_dir)s",
-                "--symbols-path=%(symbols_path)s",
-                "--extra-profile-file=jsreftest/tests/user.js",
-                "--suite=jstestbrowser",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--deviceSerial=%(device_serial)s",
-            ],
-            "tests": ["../jsreftest/tests/jstests.list",],
-        },
-        "xpcshell": {
-            "run_filename": "remotexpcshelltests.py",
-            "testsdir": "xpcshell",
-            "install": False,
-            "options": [
-                "--xre-path=%(xre_path)s",
-                "--testing-modules-dir=%(modules_dir)s",
-                "--apk=%(installer_path)s",
-                "--no-logfiles",
-                "--symbols-path=%(symbols_path)s",
-                "--manifest=tests/xpcshell.ini",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--test-plugin-path=none",
-                "--deviceSerial=%(device_serial)s",
-                "--remoteTestRoot=/data/local/tests",
-            ],
-        },
-        "cppunittest": {
-            "run_filename": "remotecppunittests.py",
-            "testsdir": "cppunittest",
-            "install": False,
-            "options": [
-                "--symbols-path=%(symbols_path)s",
-                "--xre-path=%(xre_path)s",
-                "--localBinDir=../bin",
-                "--apk=%(installer_path)s",
-                ".",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "marionette": {
-            "run_filename": os.path.join("harness", "marionette_harness", "runtests.py"),
-            "testsdir": "marionette",
-            "options": [
-                "--app=fennec",
-                "--package=%(app)s",
-                "--address=%(address)s",
-                "%(test_manifest)s",
-                "--disable-e10s",
-                "--gecko-log=%(gecko_log)s",
-                "--log-raw=%(raw_log_file)s",
-                "--log-raw-level=%(log_raw_level)s",
-                "--log-errorsummary=%(error_summary_file)s",
-                "--log-tbpl-level=%(log_tbpl_level)s",
-                "--symbols-path=%(symbols_path)s",
-                "--startup-timeout=300",
-                "--device=%(device_serial)s",
-            ],
-        },
-        "geckoview": {
-            "run_filename": "rungeckoview.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--utility-path=%(utility_path)s",
-                "--symbols-path=%(symbols_path)s",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-        "geckoview-junit": {
-            "run_filename": "runjunit.py",
-            "testsdir": "mochitest",
-            "options": [
-                "--certificate-path=%(certs_path)s",
-                "--remote-webserver=%(remote_webserver)s",
-                "--symbols-path=%(symbols_path)s",
-                "--utility-path=%(utility_path)s",
-                "--deviceSerial=%(device_serial)s",
-            ],
-        },
-
-    },  # end suite_definitions
+    "xpcshell_extra": "--remoteTestRoot=/data/local/tests",
 }
diff --git a/testing/mozharness/configs/android/androidarm_4_3.py b/testing/mozharness/configs/android/androidarm_4_3.py
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -29,6 +29,7 @@
     },
     "emulator": {
         "name": "test-1",
         "device_id": "emulator-5554",
     },
+    "marionette_extra": "--emulator",
 }
diff --git a/testing/mozharness/configs/android/androidx86_7_0.py b/testing/mozharness/configs/android/androidx86_7_0.py
--- a/testing/mozharness/configs/android/androidx86_7_0.py
+++ b/testing/mozharness/configs/android/androidx86_7_0.py
@@ -29,6 +29,7 @@
     },
     "emulator": {
         "name": "test-1",
         "device_id": "emulator-5554",
     },
+    "marionette_extra": "--emulator",
 }
diff --git a/testing/mozharness/configs/repackage/win32_partner.py b/testing/mozharness/configs/repackage/win32_partner.py
--- a/testing/mozharness/configs/repackage/win32_partner.py
+++ b/testing/mozharness/configs/repackage/win32_partner.py
@@ -27,10 +27,10 @@
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
diff --git a/testing/mozharness/configs/repackage/win64_partner.py b/testing/mozharness/configs/repackage/win64_partner.py
--- a/testing/mozharness/configs/repackage/win64_partner.py
+++ b/testing/mozharness/configs/repackage/win64_partner.py
@@ -27,10 +27,10 @@
 
     "repackage_config": repackage_config,
 
     # ToolTool
     "tooltool_manifest_src": 'browser\\config\\tooltool-manifests\\{}\\releng.manifest'.format(platform),
-    'tooltool_url': 'https://api.pub.build.mozilla.org/tooltool/',
+    'tooltool_url': 'https://tooltool.mozilla-releng.net/',
     'tooltool_cache': os.environ.get('TOOLTOOL_CACHE'),
 
     'run_configure': False,
 }
diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -54,10 +54,24 @@
         {"action": "store",
          "dest": "this_chunk",
          "default": None,
          "help": "Number of this chunk",
          }
+    ], [
+        ["--log-raw-level"],
+        {"action": "store",
+         "dest": "log_raw_level",
+         "default": "info",
+         "help": "Set log level (debug|info|warning|error|critical|fatal)",
+         }
+    ], [
+        ["--log-tbpl-level"],
+        {"action": "store",
+         "dest": "log_tbpl_level",
+         "default": "info",
+         "help": "Set log level (debug|info|warning|error|critical|fatal)",
+         }
     ]] + copy.deepcopy(testing_config_options)
 
     app_name = None
 
     def __init__(self, require_config_file=False):
@@ -101,10 +115,13 @@
                 self.test_suite = m.group(1)
                 if self.this_chunk is None:
                     self.this_chunk = m.group(2)
         self.sdk_level = None
         self.xre_path = None
+        self.device_serial = 'emulator-5554'
+        self.log_raw_level = c.get('log_raw_level')
+        self.log_tbpl_level = c.get('log_tbpl_level')
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
         abs_dirs = super(AndroidEmulatorTest, self).query_abs_dirs()
@@ -400,24 +417,32 @@
                                     '%s_raw.log' % self.test_suite)
 
         error_summary_file = os.path.join(dirs['abs_blob_upload_dir'],
                                           '%s_errorsummary.log' % self.test_suite)
         str_format_values = {
+            'device_serial': self.device_serial,
             # IP address of the host as seen from the emulator
             'remote_webserver': '10.0.2.2',
             'xre_path': self.xre_path,
             'utility_path': self.xre_path,
+            'http_port': '8854',  # starting http port  to use for the mochitest server
+            'ssl_port': '4454',  # starting ssl port to use for the server
             'certs_path': os.path.join(dirs['abs_work_dir'], 'tests/certs'),
             # TestingMixin._download_and_extract_symbols() will set
             # self.symbols_path when downloading/extracting.
             'symbols_path': self.symbols_path,
             'modules_dir': dirs['abs_modules_dir'],
             'installer_path': self.installer_path,
             'raw_log_file': raw_log_file,
+            'log_tbpl_level': self.log_tbpl_level,
+            'log_raw_level': self.log_raw_level,
             'error_summary_file': error_summary_file,
+            'gecko_log': '-',
             # marionette options
             'address': c.get('marionette_address'),
+            'marionette_extra': c.get('marionette_extra', ''),
+            'xpcshell_extra': c.get('xpcshell_extra', ''),
             'test_manifest': os.path.join(
                 dirs['abs_marionette_tests_dir'],
                 self.config.get('marionette_test_manifest', '')
             ),
         }
@@ -432,11 +457,13 @@
 
             if '%(app)' in option:
                 # only query package name if requested
                 cmd.extend([option % {'app': self._query_package_name()}])
             else:
-                cmd.extend([option % str_format_values])
+                option = option % str_format_values
+                if option:
+                    cmd.extend([option])
 
         if not (self.verify_enabled or self.per_test_coverage):
             if user_paths:
                 cmd.extend(user_paths.split(':'))
             elif not (self.verify_enabled or self.per_test_coverage):
diff --git a/testing/mozharness/scripts/android_hardware_unittest.py b/testing/mozharness/scripts/android_hardware_unittest.py
--- a/testing/mozharness/scripts/android_hardware_unittest.py
+++ b/testing/mozharness/scripts/android_hardware_unittest.py
@@ -397,10 +397,12 @@
             'log_raw_level': self.log_raw_level,
             'error_summary_file': error_summary_file,
             # marionette options
             'address': c.get('marionette_address') % {'device_ip': self.device_ip},
             'gecko_log': os.path.join(dirs["abs_blob_upload_dir"], 'gecko.log'),
+            'marionette_extra': c.get('marionette_extra', ''),
+            'xpcshell_extra': c.get('xpcshell_extra', ''),
             'test_manifest': os.path.join(
                 dirs['abs_marionette_tests_dir'],
                 self.config.get('marionette_test_manifest', '')
             ),
         }
@@ -415,11 +417,13 @@
 
             if '%(app)' in option:
                 # only query package name if requested
                 cmd.extend([option % {'app': self._query_package_name()}])
             else:
-                cmd.extend([option % str_format_values])
+                option = option % str_format_values
+                if option:
+                    cmd.extend([option])
 
         if user_paths:
             cmd.extend(user_paths.split(':'))
         elif not self.verify_enabled:
             if self.this_chunk is not None:
diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js
--- a/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js
+++ b/testing/talos/talos/tests/devtools/addon/content/tests/webconsole/objectexpand.js
@@ -13,18 +13,18 @@
   let messageManager = tab.linkedBrowser.messageManager;
   let toolbox = await openToolbox("webconsole");
   let webconsole = toolbox.getPanel("webconsole");
 
   // Resolve once the first message is received.
-  let onMessageReceived = new Promise(resolve => {
-    function receiveMessages(messages) {
-      for (let m of messages) {
-        resolve(m);
-      }
+  const waitForDirMessage = async () => {
+    let message = webconsole.hud.ui.outputNode.querySelector(".dir.message");
+    if (message) {
+      return message;
     }
-    webconsole.hud.ui.once("new-messages", receiveMessages);
-  });
+    await new Promise(res => setTimeout(res, 50));
+    return waitForDirMessage();
+  };
 
   // Load a frame script using a data URI so we can do logs
   // from the page.
   messageManager.loadFrameScript("data:,(" + encodeURIComponent(
     `function () {
@@ -41,12 +41,12 @@
 
   let test = runTest("console.objectexpand");
   // Kick off the logging
   messageManager.sendAsyncMessage("do-dir");
 
-  await onMessageReceived;
-  const tree = webconsole.hud.ui.outputNode.querySelector(".dir.message .tree");
+  const message = await waitForDirMessage();
+  const tree = message.querySelector(".tree");
 
   // The tree can be collapsed since the properties are fetched asynchronously.
   if (tree.querySelectorAll(".node").length === 1) {
     // If this is the case, we wait for the properties to be fetched and displayed.
     await new Promise(resolve => {
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -619886,11 +619886,11 @@
   "webdriver/tests/actions/conftest.py": [
    "f366a25d9d5e35a2897413a265398bc7a54f7c44",
    "support"
   ],
   "webdriver/tests/actions/control_click.py": [
-   "341a8fbfe64f5231a91999768de0b44bba121122",
+   "cbe7cc08b4a991da0cce1dfefd96b25be3b50138",
    "wdspec"
   ],
   "webdriver/tests/actions/key.py": [
    "0b70d98a4558427666abbe9629a6cf42d69e2597",
    "wdspec"
@@ -619930,11 +619930,11 @@
   "webdriver/tests/actions/support/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/actions/support/keys.py": [
-   "528ab8473914c14f9671d89b8a888d30162714ec",
+   "b06f684335c4ebb18ee8d0dd9e9b757f4cdcd52a",
    "support"
   ],
   "webdriver/tests/actions/support/mouse.py": [
    "bc7da107e5b897105dfa7405aa57cba7355854dc",
    "support"
@@ -620326,11 +620326,11 @@
   "webdriver/tests/new_session/conftest.py": [
    "72798e95422e70158c26b60aabc27a480bac8758",
    "support"
   ],
   "webdriver/tests/new_session/create_alwaysMatch.py": [
-   "b2783003e5e1a7d762a4340b33f65d6afd9b0e62",
+   "d0100b96ccdcc99bccd7bd611bd9df2f51c4a728",
    "wdspec"
   ],
   "webdriver/tests/new_session/create_firstMatch.py": [
    "a3f2156bea16ae9eb270794a2b5a0c1a39c3e631",
    "wdspec"
@@ -620394,11 +620394,11 @@
   "webdriver/tests/set_window_rect/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
   "webdriver/tests/set_window_rect/set.py": [
-   "79de443bc251f7effaa7c2ef3b95695f22db01c6",
+   "04161b59c5b144dd571dca3ef224595f9d4612f2",
    "wdspec"
   ],
   "webdriver/tests/set_window_rect/user_prompts.py": [
    "4ed66d05835d3ab229cb90928e0ca2a15ba08c8a",
    "wdspec"
diff --git a/testing/web-platform/meta/css/css-backgrounds/css3-background-origin-padding-box.html.ini b/testing/web-platform/meta/css/css-backgrounds/css3-background-origin-padding-box.html.ini
--- a/testing/web-platform/meta/css/css-backgrounds/css3-background-origin-padding-box.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/css3-background-origin-padding-box.html.ini
@@ -1,3 +1,4 @@
 [css3-background-origin-padding-box.html]
   disabled:
     if debug and (os == "linux"): wpt-sync Bug 1451693
+    if (os == "linux") and not debug: https://bugzilla.mozilla.org/show_bug.cgi?id=1455033
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-001e.html.ini
@@ -1,4 +1,3 @@
 [object-position-svg-001e.html]
   expected:
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     FAIL
diff --git a/testing/web-platform/meta/media-capabilities/decodingInfo.html.ini b/testing/web-platform/meta/media-capabilities/decodingInfo.html.ini
--- a/testing/web-platform/meta/media-capabilities/decodingInfo.html.ini
+++ b/testing/web-platform/meta/media-capabilities/decodingInfo.html.ini
@@ -1,79 +1,8 @@
 [decodingInfo.html]
-  [Test that decodingInfo rejects if it doesn't get a configuration]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the MediaConfiguration isn't valid]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the MediaConfiguration does not have a type]
-    expected: FAIL
-
-  [Test that decodingInfo returns a valid MediaCapabilitiesInfo objects]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the MediaConfiguration does not have a valid type]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the configuration doesn't have an audio or video field]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the video configuration has a negative framerate]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the video configuration has a framerate set to 0]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the video configuration has a framerate set to Infinity]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the video configuration contentType doesn't parse]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the video configuration contentType isn't of type video]
-    expected: FAIL
-
+  prefs: [media.media-capabilities.enabled:true]
   [Test that decodingInfo rejects if the video configuration contentType has more than one parameter]
     expected: FAIL
 
-  [Test that decodingInfo rejects if the video configuration contentType has one parameter that isn't codecs]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the audio configuration contenType doesn't parse]
-    expected: FAIL
-
-  [Test that decodingInfo rejects if the audio configuration contentType isn't of type audio]
-    expected: FAIL
-
   [Test that decodingInfo rejects if the audio configuration contentType has more than one parameters]
     expected: FAIL
 
-  [Test that decodingInfo rejects if the audio configuration contentType has one parameter that isn't codecs]
-    expected: FAIL
-
-  [Test that decodingInfo() accepts framerate in the form of x/y]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate in the form of x/0]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate in the form of 0/y]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate in the form of -x/y]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate in the form of x/-y]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate in the form of x/]
-    expected: FAIL
-
-  [Test that decodingInfo() accepts framerate with 'e']
-    expected: FAIL
-
-  [Test that decodingInfo() accepts framerate as fraction with decimals]
-    expected: FAIL
-
-  [Test that decodingInfo() rejects framerate with trailing unallowed characters]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/media-capabilities/idlharness.html.ini b/testing/web-platform/meta/media-capabilities/idlharness.html.ini
--- a/testing/web-platform/meta/media-capabilities/idlharness.html.ini
+++ b/testing/web-platform/meta/media-capabilities/idlharness.html.ini
@@ -1,127 +1,3 @@
 [idlharness.html]
-  [Navigator interface: attribute mediaCapabilities]
-    expected: FAIL
-
-  [Navigator interface: navigator must inherit property "mediaCapabilities" with the proper type (0)]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: existence and properties of interface object]
-    expected: FAIL
-
-  [MediaDecodingAbility interface object length]
-    expected: FAIL
-
-  [MediaDecodingAbility interface object name]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: attribute supported]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: attribute smooth]
-    expected: FAIL
-
-  [MediaDecodingAbility interface: attribute powerEfficient]
-    expected: FAIL
-
-  [MediaCapabilities interface: existence and properties of interface object]
-    expected: FAIL
-
-  [MediaCapabilities interface object length]
-    expected: FAIL
-
-  [MediaCapabilities interface object name]
-    expected: FAIL
-
-  [MediaCapabilities interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [MediaCapabilities interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [MediaCapabilities interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [MediaCapabilities interface: operation query(MediaConfiguration)]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: existence and properties of interface object]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface object length]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface object name]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: attribute supported]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: attribute smooth]
-    expected: FAIL
-
-  [MediaCapabilitiesInfo interface: attribute powerEfficient]
-    expected: FAIL
-
-  [MediaCapabilities interface: operation decodingInfo(MediaDecodingConfiguration)]
-    expected: FAIL
-
-  [MediaCapabilities interface: operation encodingInfo(MediaEncodingConfiguration)]
-    expected: FAIL
-
-  [Navigator interface: navigator must inherit property "mediaCapabilities" with the proper type]
-    expected: FAIL
-
-  [Screen interface: attribute colorGamut]
-    expected: FAIL
-
-  [Screen interface: attribute luminance]
-    expected: FAIL
-
-  [Screen interface: attribute onchange]
-    expected: FAIL
-
-  [ScreenLuminance interface: existence and properties of interface object]
-    expected: FAIL
-
-  [ScreenLuminance interface object length]
-    expected: FAIL
-
-  [ScreenLuminance interface object name]
-    expected: FAIL
-
-  [ScreenLuminance interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [ScreenLuminance interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [ScreenLuminance interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [ScreenLuminance interface: attribute min]
-    expected: FAIL
-
-  [ScreenLuminance interface: attribute max]
-    expected: FAIL
-
-  [ScreenLuminance interface: attribute maxAverage]
-    expected: FAIL
+  prefs: [media.media-capabilities.enabled:true]
 
diff --git a/testing/web-platform/tests/interfaces/dom.idl b/testing/web-platform/tests/interfaces/dom.idl
--- a/testing/web-platform/tests/interfaces/dom.idl
+++ b/testing/web-platform/tests/interfaces/dom.idl
@@ -358,10 +358,11 @@
   DOMString? getAttributeNS(DOMString? namespace, DOMString localName);
   void setAttribute(DOMString qualifiedName, DOMString value);
   void setAttributeNS(DOMString? namespace, DOMString qualifiedName, DOMString value);
   void removeAttribute(DOMString qualifiedName);
   void removeAttributeNS(DOMString? namespace, DOMString localName);
+  boolean toggleAttribute(DOMString qualifiedName, optional boolean force);
   boolean hasAttribute(DOMString qualifiedName);
   boolean hasAttributeNS(DOMString? namespace, DOMString localName);
 
   Attr? getAttributeNode(DOMString qualifiedName);
   Attr? getAttributeNodeNS(DOMString? namespace, DOMString localName);
diff --git a/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py b/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/wpttest.py
@@ -405,11 +405,11 @@
     result_cls = WdspecResult
     subtest_result_cls = WdspecSubtestResult
     test_type = "wdspec"
 
     default_timeout = 25
-    long_timeout = 120
+    long_timeout = 180  # 3 minutes
 
 
 manifest_test_cls = {"reftest": ReftestTest,
                      "testharness": TestharnessTest,
                      "manual": ManualTest,
diff --git a/testing/web-platform/tests/webdriver/tests/actions/control_click.py b/testing/web-platform/tests/webdriver/tests/actions/control_click.py
--- a/testing/web-platform/tests/webdriver/tests/actions/control_click.py
+++ b/testing/web-platform/tests/webdriver/tests/actions/control_click.py
@@ -16,11 +16,11 @@
         .pause(200) \
         .key_up(modifier)
     outer = session.find.css("#outer", all=False)
     mouse_chain.click(element=outer)
     session.actions.perform([key_chain.dict, mouse_chain.dict])
-    if os == "windows_nt":
+    if os == "windows":
         expected = [
             {"type": "mousemove"},
             {"type": "mousedown"},
             {"type": "mouseup"},
             {"type": "click"},
diff --git a/testing/web-platform/tests/webdriver/tests/actions/support/keys.py b/testing/web-platform/tests/webdriver/tests/actions/support/keys.py
--- a/testing/web-platform/tests/webdriver/tests/actions/support/keys.py
+++ b/testing/web-platform/tests/webdriver/tests/actions/support/keys.py
@@ -13,23 +13,21 @@
 # "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.
 
-"""
-The Keys implementation.
-"""
+"""The Keys implementation."""
 
 from inspect import getmembers
 import sys
 
 
 class Keys(object):
     """
     Set of special keys codes.
 
-    See also https://w3c.github.io/webdriver/webdriver-spec.html#h-keyboard-actions
+    See also https://w3c.github.io/webdriver/#h-keyboard-actions
     """
 
     NULL = u"\ue000"
     CANCEL = u"\ue001"  # ^break
     HELP = u"\ue002"
@@ -740,9 +738,9 @@
         "shift": False,
         "value": u"\ue040",
     }
 }
 
-if sys.platform == 'darwin':
+if sys.platform == "mac":
     MODIFIER_KEY = Keys.META
 else:
     MODIFIER_KEY = Keys.CONTROL
diff --git a/testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py b/testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py
--- a/testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py
+++ b/testing/web-platform/tests/webdriver/tests/new_session/create_alwaysMatch.py
@@ -11,5 +11,6 @@
 @pytest.mark.parametrize("key,value", flatten(product(*item) for item in valid_data))
 def test_valid(new_session, add_browser_capabilites, key, value):
     response, _ = new_session({"capabilities": {
         "alwaysMatch": add_browser_capabilites({key: value})}})
     assert_success(response)
+
diff --git a/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py b/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
--- a/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
+++ b/testing/web-platform/tests/webdriver/tests/set_window_rect/set.py
@@ -332,19 +332,19 @@
         assert rect["height"] == original["height"]
 
     # On macOS, windows can only be moved off the screen on the
     # horizontal axis.  The system menu bar also blocks windows from
     # being moved to (0,0).
-    elif os == "darwin":
+    elif os == "mac":
         assert_success(response, {"x": -8,
                                   "y": 23,
                                   "width": original["width"],
                                   "height": original["height"]})
 
     # It turns out that Windows is the only platform on which the
     # window can be reliably positioned off-screen.
-    elif os == "windows_nt":
+    elif os == "windows":
         assert_success(response, {"x": -8,
                                   "y": -8,
                                   "width": original["width"],
                                   "height": original["height"]})
 
diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp
--- a/toolkit/components/browser/nsWebBrowser.cpp
+++ b/toolkit/components/browser/nsWebBrowser.cpp
@@ -984,25 +984,28 @@
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsWebBrowser::SaveURI(nsIURI* aURI,
+                      nsIPrincipal* aPrincipal,
                       uint32_t aCacheKey,
                       nsIURI* aReferrer,
                       uint32_t aReferrerPolicy,
                       nsIInputStream* aPostData,
                       const char* aExtraHeaders,
                       nsISupports* aFile,
                       nsILoadContext* aPrivacyContext)
 {
   return SavePrivacyAwareURI(
-    aURI, aCacheKey, aReferrer, aReferrerPolicy, aPostData, aExtraHeaders,
-    aFile, aPrivacyContext && aPrivacyContext->UsePrivateBrowsing());
+    aURI, aPrincipal, aCacheKey, aReferrer, aReferrerPolicy, aPostData,
+    aExtraHeaders, aFile,
+    aPrivacyContext && aPrivacyContext->UsePrivateBrowsing());
 }
 
 NS_IMETHODIMP
 nsWebBrowser::SavePrivacyAwareURI(nsIURI* aURI,
+                                  nsIPrincipal* aPrincipal,
                                   uint32_t aCacheKey,
                                   nsIURI* aReferrer,
                                   uint32_t aReferrerPolicy,
                                   nsIInputStream* aPostData,
                                   const char* aExtraHeaders,
@@ -1036,12 +1039,13 @@
   NS_ENSURE_SUCCESS(rv, rv);
   mPersist->SetProgressListener(this);
   mPersist->SetPersistFlags(mPersistFlags);
   mPersist->GetCurrentState(&mPersistCurrentState);
 
-  rv = mPersist->SavePrivacyAwareURI(uri, aCacheKey, aReferrer, aReferrerPolicy,
-                                     aPostData, aExtraHeaders, aFile, aIsPrivate);
+  rv = mPersist->SavePrivacyAwareURI(uri, aPrincipal, aCacheKey,
+                                     aReferrer, aReferrerPolicy, aPostData,
+                                     aExtraHeaders, aFile, aIsPrivate);
   if (NS_FAILED(rv)) {
     mPersist = nullptr;
   }
   return rv;
 }
diff --git a/toolkit/components/downloads/DownloadUIHelper.jsm b/toolkit/components/downloads/DownloadUIHelper.jsm
--- a/toolkit/components/downloads/DownloadUIHelper.jsm
+++ b/toolkit/components/downloads/DownloadUIHelper.jsm
@@ -105,55 +105,39 @@
    */
   _prompter: null,
 
   /**
    * Displays a warning message box that informs that the specified file is
-   * executable, and asks whether the user wants to launch it.  The user is
-   * given the option of disabling future instances of this warning.
+   * executable, and asks whether the user wants to launch it.
    *
-   * @param aPath
+   * @param path
    *        String containing the full path to the file to be opened.
    *
-   * @return {Promise}
    * @resolves Boolean indicating whether the launch operation can continue.
-   * @rejects JavaScript exception.
    */
-  confirmLaunchExecutable(aPath) {
-    const kPrefAlertOnEXEOpen = "browser.download.manager.alertOnEXEOpen";
+  async confirmLaunchExecutable(path) {
+    const kPrefSkipConfirm = "browser.download.skipConfirmLaunchExecutable";
 
-    try {
-      // Always launch in case we have no prompter implementation.
-      if (!this._prompter) {
-        return Promise.resolve(true);
-      }
-
-      try {
-        if (!Services.prefs.getBoolPref(kPrefAlertOnEXEOpen)) {
-          return Promise.resolve(true);
-        }
-      } catch (ex) {
-        // If the preference does not exist, continue with the prompt.
-      }
-
-      let leafName = OS.Path.basename(aPath);
-
-      let s = DownloadUIHelper.strings;
-      let checkState = { value: false };
-      let shouldLaunch = this._prompter.confirmCheck(
-                           s.fileExecutableSecurityWarningTitle,
-                           s.fileExecutableSecurityWarning(leafName, leafName),
-                           s.fileExecutableSecurityWarningDontAsk,
-                           checkState);
+    // Always launch in case we have no prompter implementation.
+    if (!this._prompter) {
+      return true;
+    }
 
-      if (shouldLaunch) {
-        Services.prefs.setBoolPref(kPrefAlertOnEXEOpen, !checkState.value);
+    try {
+      if (Services.prefs.getBoolPref(kPrefSkipConfirm)) {
+        return true;
       }
-
-      return Promise.resolve(shouldLaunch);
     } catch (ex) {
-      return Promise.reject(ex);
+      // If the preference does not exist, continue with the prompt.
     }
+
+    let leafName = OS.Path.basename(path);
+
+    let s = DownloadUIHelper.strings;
+    return this._prompter.confirm(s.fileExecutableSecurityWarningTitle,
+                                  s.fileExecutableSecurityWarning(leafName,
+                                                                  leafName));
   },
 
   /**
    * Displays a warning message box that informs that there are active
    * downloads, and asks whether the user wants to cancel them or not.
diff --git a/toolkit/components/downloads/test/unit/head.js b/toolkit/components/downloads/test/unit/head.js
--- a/toolkit/components/downloads/test/unit/head.js
+++ b/toolkit/components/downloads/test/unit/head.js
@@ -281,11 +281,12 @@
                     null, persist, isPrivate);
       persist.progressListener = transfer;
 
       // Start the actual download process.
       persist.savePrivacyAwareURI(
-        sourceURI, 0, referrer, Ci.nsIHttpChannel.REFERRER_POLICY_UNSAFE_URL,
+        sourceURI, Services.scriptSecurityManager.getSystemPrincipal(),
+        0, referrer, Ci.nsIHttpChannel.REFERRER_POLICY_UNSAFE_URL,
         null, null, targetFile, isPrivate);
     }).catch(do_report_unexpected_exception);
 
   });
 }
diff --git a/toolkit/components/extensions/schemas/web_request.json b/toolkit/components/extensions/schemas/web_request.json
--- a/toolkit/components/extensions/schemas/web_request.json
+++ b/toolkit/components/extensions/schemas/web_request.json
@@ -187,14 +187,14 @@
           "issuer": {
             "type": "string"
           },
           "validity": {
             "type": "object",
-            "description": "Contains start and end dates in GMT.",
+            "description": "Contains start and end timestamps.",
             "properties": {
-              "startGMT": { "type": "string" },
-              "endGMT": { "type": "string" }
+              "start": { "type": "integer" },
+              "end": { "type": "integer" }
             }
           },
           "fingerprint": {
             "type": "object",
             "properties": {
@@ -212,13 +212,10 @@
             "type": "object",
             "properties": {
               "sha256": { "type": "string" }
             }
           },
-          "keyUsages": {
-            "type": "string"
-          },
           "rawDER": {
             "optional": true,
             "type": "array",
             "items": {
               "type": "integer"
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html b/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html
--- a/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_cookies_first_party.html
@@ -8,10 +8,12 @@
 "use strict";
 
 async function background() {
   const url = "http://ext-cookie-first-party.mochi.test/";
   const firstPartyDomain = "ext-cookie-first-party.mochi.test";
+  // A first party domain with invalid characters for the file system, which just happens to be a IPv6 address.
+  const firstPartyDomainInvalidChars = "[2606:4700:4700::1111]";
   const expectedError = "First-Party Isolation is enabled, but the required 'firstPartyDomain' attribute was not set.";
 
   const assertExpectedCookies = (expected, cookies, message) => {
     let matches = (cookie, expected) => {
       if (!cookie || !expected) {
@@ -214,10 +216,42 @@
     await browser.cookies.set({url, name: "foo4", value: "bar4", firstPartyDomain});
 
     browser.test.sendMessage("test_fpi_enabled");
   };
 
+  // Test FPI with a first party domain with invalid characters for
+  // the file system.
+  const test_fpi_with_invalid_characters = async () => {
+    let cookie;
+
+    // Test setting a cookie with a first party domain with invalid characters
+    // for the file system.
+    cookie = await browser.cookies.set({url, name: "foo5", value: "bar5",
+                                        firstPartyDomain: firstPartyDomainInvalidChars});
+    assertExpectedCookies([
+      {name: "foo5", value: "bar5", firstPartyDomain: firstPartyDomainInvalidChars},
+    ], [cookie], "set: FPI on, w/ firstPartyDomain with invalid characters, FP cookie");
+
+    // Test getting a cookie with a first party domain with invalid characters
+    // for the file system.
+    cookie = await browser.cookies.get({url, name: "foo5",
+                                        firstPartyDomain: firstPartyDomainInvalidChars});
+    assertExpectedCookies([
+      {name: "foo5", value: "bar5", firstPartyDomain: firstPartyDomainInvalidChars},
+    ], [cookie], "get: FPI on, w/ firstPartyDomain with invalid characters, FP cookie");
+
+    // Test removing a cookie with a first party domain with invalid characters
+    // for the file system.
+    cookie = await browser.cookies.remove({url, name: "foo5",
+                                           firstPartyDomain: firstPartyDomainInvalidChars});
+    assertExpectedCookies([
+      {url, name: "foo5", firstPartyDomain: firstPartyDomainInvalidChars},
+    ], [cookie], "remove: FPI on, w/ firstPartyDomain with invalid characters, FP cookie");
+
+    browser.test.sendMessage("test_fpi_with_invalid_characters");
+  };
+
   // Test when FPI is disabled again, accessing FP cookies set when FPI is enabled.
   const test_fpd_cookies_on_fpi_disabled = async () => {
     let cookie, cookies;
     cookie = await browser.cookies.get({url, name: "foo4", firstPartyDomain});
     assertExpectedCookies([
@@ -239,10 +273,11 @@
 
   browser.test.onMessage.addListener((message) => {
     switch (message) {
       case "test_fpi_disabled": return test_fpi_disabled();
       case "test_fpi_enabled": return test_fpi_enabled();
+      case "test_fpi_with_invalid_characters": return test_fpi_with_invalid_characters();
       case "test_fpd_cookies_on_fpi_disabled": return test_fpd_cookies_on_fpi_disabled();
       default: return browser.test.notifyFail("unknown-message");
     }
   });
 }
@@ -270,10 +305,12 @@
   extension.sendMessage("test_fpi_disabled");
   await extension.awaitMessage("test_fpi_disabled");
   await enableFirstPartyIsolation();
   extension.sendMessage("test_fpi_enabled");
   await extension.awaitMessage("test_fpi_enabled");
+  extension.sendMessage("test_fpi_with_invalid_characters");
+  await extension.awaitMessage("test_fpi_with_invalid_characters");
   await disableFirstPartyIsolation();
   extension.sendMessage("test_fpd_cookies_on_fpi_disabled");
   await extension.awaitMessage("test_fpd_cookies_on_fpi_disabled");
   await extension.unload();
 });
diff --git a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
--- a/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
+++ b/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
@@ -35,10 +35,12 @@
         // Some of the tests here only produce a single cert in the chain.
         browser.test.assertTrue(securityInfo.certificates.length >= 1, "have certificate chain");
       } else {
         browser.test.assertTrue(securityInfo.certificates.length == 1, "no certificate chain");
       }
+      let cert = securityInfo.certificates[0];
+      browser.test.assertTrue(cert.validity.start < Date.now() < cert.validity.end, "cert validity is correct");
       if (options.rawDER) {
         for (let cert of securityInfo.certificates) {
           browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER");
         }
       }
diff --git a/toolkit/components/telemetry/gen_event_data.py b/toolkit/components/telemetry/gen_event_data.py
--- a/toolkit/components/telemetry/gen_event_data.py
+++ b/toolkit/components/telemetry/gen_event_data.py
@@ -32,11 +32,11 @@
 """
 
 
 def write_extra_table(events, output, string_table):
     table_name = "gExtraKeysTable"
-    extra_table = []
+    extra_table=[] # missing whitespace around operator E225 (flake8); at least two spaces before inline comment E261 (flake8); line too long (126 > 99 characters) E501 (flake8)
     extra_count = 0
 
     print("const uint32_t %s[] = {" % table_name, file=output)
 
     for e in events:
@@ -52,11 +52,11 @@
                   ", ".join(e.methods),
                   ", ".join(e.objects)),
                   file=output)
             print("  // extra_keys: %s" % ", ".join(extra_keys), file=output)
             print("  %s," % ", ".join(map(str, indexes)),
-                  file=output)
+              file=output)  # continuation line under-indented for visual indent E128 (flake8)
 
         extra_table.append((extra_index, len(extra_keys)))
 
     print("};", file=output)
     static_assert(output, "sizeof(%s) <= UINT32_MAX" % table_name,
diff --git a/toolkit/components/telemetry/parse_events.py b/toolkit/components/telemetry/parse_events.py
--- a/toolkit/components/telemetry/parse_events.py
+++ b/toolkit/components/telemetry/parse_events.py
@@ -1,16 +1,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/.
 
+import atexit
 import re
 import yaml
 import itertools
 import string
 import shared_telemetry_utils as utils
 
 from shared_telemetry_utils import ParserError
+atexit.register(ParserError.exit_func)
 
 MAX_CATEGORY_NAME_LENGTH = 30
 MAX_METHOD_NAME_LENGTH = 20
 MAX_OBJECT_NAME_LENGTH = 20
 MAX_EXTRA_KEYS_COUNT = 10
@@ -166,18 +168,19 @@
         self._strict_type_checks = strict_type_checks
 
         type_check_event_fields(self.identifier, name, definition)
 
         # Check method & object string patterns.
-        for method in self.methods:
-            string_check(self.identifier, field='methods', value=method,
-                         min_length=1, max_length=MAX_METHOD_NAME_LENGTH,
-                         regex=IDENTIFIER_PATTERN)
-        for obj in self.objects:
-            string_check(self.identifier, field='objects', value=obj,
-                         min_length=1, max_length=MAX_OBJECT_NAME_LENGTH,
-                         regex=IDENTIFIER_PATTERN)
+        if strict_type_checks:
+            for method in self.methods:
+                string_check(self.identifier, field='methods', value=method,
+                             min_length=1, max_length=MAX_METHOD_NAME_LENGTH,
+                             regex=IDENTIFIER_PATTERN)
+            for obj in self.objects:
+                string_check(self.identifier, field='objects', value=obj,
+                             min_length=1, max_length=MAX_OBJECT_NAME_LENGTH,
+                             regex=IDENTIFIER_PATTERN)
 
         # Check release_channel_collection
         rcc_key = 'release_channel_collection'
         rcc = definition.get(rcc_key, 'opt-in')
         allowed_rcc = ["opt-in", "opt-out"]
diff --git a/toolkit/components/viewsource/content/viewSourceUtils.js b/toolkit/components/viewsource/content/viewSourceUtils.js
--- a/toolkit/components/viewsource/content/viewSourceUtils.js
+++ b/toolkit/components/viewsource/content/viewSourceUtils.js
@@ -224,11 +224,15 @@
             .createInstance(this.mnsIWebBrowserPersist);
           // the default setting is to not decode. we need to decode.
           webBrowserPersist.persistFlags = this.mnsIWebBrowserPersist.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
           webBrowserPersist.progressListener = this.viewSourceProgressListener;
           let referrerPolicy = Ci.nsIHttpChannel.REFERRER_POLICY_NO_REFERRER;
-          webBrowserPersist.savePrivacyAwareURI(uri, null, null, referrerPolicy, null, null, file, data.isPrivate);
+          let ssm = Services.scriptSecurityManager;
+          let principal = ssm.createCodebasePrincipal(data.uri,
+            browser.contentPrincipal.originAttributes);
+          webBrowserPersist.savePrivacyAwareURI(uri, principal, null, null,
+            referrerPolicy, null, null, file, data.isPrivate);
 
           let helperService = Cc["@mozilla.org/uriloader/external-helper-app-service;1"]
             .getService(Ci.nsPIExternalAppLauncher);
           if (data.isPrivate) {
             // register the file to be deleted when possible
diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -377,14 +377,23 @@
     }
   },
 
   _updateCurrentPingData() {
     const subsession = document.getElementById("show-subsession-data").checked;
-    const ping = TelemetryController.getCurrentPingData(subsession);
+    let ping = TelemetryController.getCurrentPingData(subsession);
     if (!ping) {
       return;
     }
+
+    // augment ping payload with event telemetry
+    let eventSnapshot = Telemetry.snapshotEvents(Telemetry.DATASET_RELEASE_CHANNEL_OPTIN, false);
+    for (let process of Object.keys(eventSnapshot)) {
+      if (process in ping.payload.processes) {
+        ping.payload.processes[process].events = eventSnapshot[process].filter(e => !e[1].startsWith("telemetry.test"));
+      }
+    }
+
     displayPingData(ping, true);
   },
 
   _updateArchivedPingData() {
     let id = this._getSelectedPingId();
@@ -1706,10 +1715,51 @@
       scalarsSection.appendChild(container);
     }
   },
 };
 
+var Events = {
+  /**
+   * Render the event data - if present - from the payload in a simple table.
+   * @param aPayload A payload object to render the data from.
+   */
+  render(aPayload) {
+    let eventsSection = document.getElementById("events");
+    removeAllChildNodes(eventsSection);
+
+    let processesSelect = document.getElementById("processes");
+    let selectedProcess = processesSelect.selectedOptions.item(0).getAttribute("value");
+
+    if (!aPayload.processes ||
+        !selectedProcess ||
+        !(selectedProcess in aPayload.processes)) {
+      return;
+    }
+
+    let events = aPayload.processes[selectedProcess].events || {};
+    let hasData = Array.from(processesSelect.options).some((option) => {
+      let value = option.getAttribute("value");
+      let evts = aPayload.processes[value].events;
+      return evts && Object.keys(evts).length > 0;
+    });
+    setHasData("events-section", hasData);
+    if (Object.keys(events).length > 0) {
+      const headings = [
+        "timestampHeader",
+        "categoryHeader",
+        "methodHeader",
+        "objectHeader",
+        "valuesHeader",
+        "extraHeader",
+      ].map(h => bundle.GetStringFromName(h));
+
+      const table = GenericTable.render(events, headings);
+      eventsSection.appendChild(table);
+    }
+  },
+};
+
 /**
  * Helper function for showing either the toggle element or "No data collected" message for a section
  *
  * @param aSectionID ID of the section element that needs to be changed
  * @param aHasData true (default) indicates that toggle should be displayed
@@ -2304,10 +2354,13 @@
   HistogramSection.render(payload);
 
   // Show keyed histogram data
   KeyedHistogramSection.render(payload);
 
+  // Show event data.
+  Events.render(payload);
+
   // Show captured stacks.
   CapturedStacks.render(payload);
 
   LateWritesSingleton.renderLateWrites(payload.lateWrites);
 
diff --git a/toolkit/content/aboutTelemetry.xhtml b/toolkit/content/aboutTelemetry.xhtml
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -55,10 +55,13 @@
         <span class="category-name">&aboutTelemetry.histogramsSection;</span>
       </div>
       <div class="category" value="keyed-histograms-section">
         <span class="category-name">&aboutTelemetry.keyedHistogramsSection;</span>
       </div>
+      <div class="category" value="events-section">
+        <span class="category-name">&aboutTelemetry.eventsSection;</span>
+      </div>
       <div class="category" value="simple-measurements-section">
         <span class="category-name">&aboutTelemetry.simpleMeasurementsSection;</span>
       </div>
       <div class="category" value="slow-sql-section">
         <span class="category-name">&aboutTelemetry.slowSqlSection;</span>
diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js
--- a/toolkit/content/contentAreaUtils.js
+++ b/toolkit/content/contentAreaUtils.js
@@ -60,18 +60,19 @@
 //   the above method.
 // - A linked document using Save Link As...
 // - A linked document using Alt-click Save Link As...
 //
 function saveURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache,
-                 aSkipPrompt, aReferrer, aSourceDocument, aIsContentWindowPrivate) {
+                 aSkipPrompt, aReferrer, aSourceDocument,
+                 aIsContentWindowPrivate, aPrincipal) {
   forbidCPOW(aURL, "saveURL", "aURL");
   forbidCPOW(aReferrer, "saveURL", "aReferrer");
   // Allow aSourceDocument to be a CPOW.
 
   internalSave(aURL, null, aFileName, null, null, aShouldBypassCache,
                aFilePickerTitleKey, null, aReferrer, aSourceDocument,
-               aSkipPrompt, null, aIsContentWindowPrivate);
+               aSkipPrompt, null, aIsContentWindowPrivate, aPrincipal);
 }
 
 // Just like saveURL, but will get some info off the image before
 // calling internalSave
 // Clientele: (Make sure you don't break any of these)
@@ -110,11 +111,11 @@
  *        Whether or not the containing window is in private browsing mode.
  *        Does not need to be provided is aDoc is passed.
  */
 function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache,
                       aSkipPrompt, aReferrer, aDoc, aContentType, aContentDisp,
-                      aIsContentWindowPrivate) {
+                      aIsContentWindowPrivate, aPrincipal) {
   forbidCPOW(aURL, "saveImageURL", "aURL");
   forbidCPOW(aReferrer, "saveImageURL", "aReferrer");
 
   if (aDoc && aIsContentWindowPrivate == undefined) {
     if (Cu.isCrossProcessWrapper(aDoc)) {
@@ -154,11 +155,11 @@
     }
   }
 
   internalSave(aURL, null, aFileName, aContentDisp, aContentType,
                aShouldBypassCache, aFilePickerTitleKey, null, aReferrer,
-               null, aSkipPrompt, null, aIsContentWindowPrivate);
+               aDoc, aSkipPrompt, null, aIsContentWindowPrivate, aPrincipal);
 }
 
 // This is like saveDocument, but takes any browser/frame-like element
 // and saves the current document inside it,
 // whether in-process or out-of-process.
@@ -329,15 +330,19 @@
  *        allowed values.
  * @param aIsContentWindowPrivate [optional]
  *        This parameter is provided when the aInitiatingDocument is not a
  *        real document object. Stores whether aInitiatingDocument.defaultView
  *        was private or not.
+ * @param aPrincipal [optional]
+ *        This parameter is provided when neither aDocument nor
+ *        aInitiatingDocument is provided. Used to determine what level of
+ *        privilege to load the URI with.
  */
 function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition,
                       aContentType, aShouldBypassCache, aFilePickerTitleKey,
                       aChosenData, aReferrer, aInitiatingDocument, aSkipPrompt,
-                      aCacheKey, aIsContentWindowPrivate) {
+                      aCacheKey, aIsContentWindowPrivate, aPrincipal) {
   forbidCPOW(aURL, "internalSave", "aURL");
   forbidCPOW(aReferrer, "internalSave", "aReferrer");
   forbidCPOW(aCacheKey, "internalSave", "aCacheKey");
   // Allow aInitiatingDocument to be a CPOW.
 
@@ -409,12 +414,21 @@
       isPrivate = aInitiatingDocument.nodeType == 9 /* DOCUMENT_NODE */
         ? PrivateBrowsingUtils.isContentWindowPrivate(aInitiatingDocument.defaultView)
         : aInitiatingDocument.isPrivate;
     }
 
+    // We have to cover the cases here where we were either passed an explicit
+    // principal, or a 'real' document (with a nodePrincipal property), or an
+    // nsIWebBrowserPersistDocument which has a principal property.
+    let sourcePrincipal =
+      aPrincipal ||
+      (aDocument && (aDocument.nodePrincipal || aDocument.principal)) ||
+      (aInitiatingDocument && aInitiatingDocument.nodePrincipal);
+
     var persistArgs = {
       sourceURI,
+      sourcePrincipal,
       sourceReferrer: aReferrer,
       sourceDocument: useSaveDocument ? aDocument : null,
       targetContentType: (saveAsType == kSaveAsType_Text) ? "text/plain" : null,
       targetFile: file,
       sourceCacheKey: aCacheKey,
@@ -461,12 +475,11 @@
 function internalPersist(persistArgs) {
   var persist = makeWebBrowserPersist();
 
   // Calculate persist flags.
   const nsIWBP = Ci.nsIWebBrowserPersist;
-  const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |
-                nsIWBP.PERSIST_FLAGS_FORCE_ALLOW_COOKIES;
+  const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES;
   if (persistArgs.bypassCache)
     persist.persistFlags = flags | nsIWBP.PERSIST_FLAGS_BYPASS_CACHE;
   else
     persist.persistFlags = flags | nsIWBP.PERSIST_FLAGS_FROM_CACHE;
 
@@ -509,10 +522,11 @@
     const kWrapColumn = 80;
     persist.saveDocument(persistArgs.sourceDocument, targetFileURL, filesFolder,
                          persistArgs.targetContentType, encodingFlags, kWrapColumn);
   } else {
     persist.savePrivacyAwareURI(persistArgs.sourceURI,
+                                persistArgs.sourcePrincipal,
                                 persistArgs.sourceCacheKey,
                                 persistArgs.sourceReferrer,
                                 Ci.nsIHttpChannel.REFERRER_POLICY_UNSET,
                                 persistArgs.sourcePostData,
                                 null,
diff --git a/toolkit/content/tests/browser/browser_saveImageURL.js b/toolkit/content/tests/browser/browser_saveImageURL.js
--- a/toolkit/content/tests/browser/browser_saveImageURL.js
+++ b/toolkit/content/tests/browser/browser_saveImageURL.js
@@ -34,11 +34,12 @@
     let url = await ContentTask.spawn(browser, null, async function() {
       let image = content.document.getElementById("image");
       return image.href;
     });
 
-    saveImageURL(url, "image.jpg", null, true, false, null, null, null, null, false);
+    saveImageURL(url, "image.jpg", null, true, false, null, null, null, null,
+      false, gBrowser.contentPrincipal);
     let channel = gBrowser.contentDocumentAsCPOW.docShell.currentDocumentChannel;
     if (channel) {
       ok(true, channel.QueryInterface(Ci.nsIHttpChannelInternal)
                       .channelIsForDownload);
 
diff --git a/toolkit/crashreporter/breakpad-windows-libxul/moz.build b/toolkit/crashreporter/breakpad-windows-libxul/moz.build
--- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build
@@ -2,14 +2,10 @@
 # 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 += [
-    '../google-breakpad/src/common/windows/http_upload.cc',
-]
-
 Library('google_breakpad_libxul_s')
 
 FINAL_LIBRARY = 'xul'
 
 for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD'):
@@ -20,16 +16,14 @@
     '/toolkit/crashreporter/google-breakpad/src',
 ]
 
 include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
 include('/toolkit/crashreporter/breakpad-client/windows/handler/objs.mozbuild')
-include('/toolkit/crashreporter/breakpad-client/windows/sender/objs.mozbuild')
 include('/toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild')
 include('/toolkit/crashreporter/breakpad-client/windows/common/objs.mozbuild')
 
 SOURCES += objs_common
 SOURCES += objs_crash_generation
 SOURCES += objs_handler
-SOURCES += objs_sender
 SOURCES += objs_client_common
 
 DisableStlWrapping()
diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -22,14 +22,24 @@
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     UNIFIED_SOURCES += [
         'crashreporter_win.cpp',
     ]
+    include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
+    include('/toolkit/crashreporter/breakpad-client/windows/sender/objs.mozbuild')
+    include('/toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild')
+    include('/toolkit/crashreporter/breakpad-client/windows/common/objs.mozbuild')
+    SOURCES += objs_common
+    SOURCES += objs_sender
+    SOURCES += objs_crash_generation
+    SOURCES += objs_client_common
+    SOURCES += [
+        '../google-breakpad/src/common/windows/http_upload.cc',
+    ]
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     USE_LIBS += [
-        'google_breakpad_libxul_s',
         'nss',
     ]
     OS_LIBS += [
         'comctl32',
         'ole32',
diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp
--- a/toolkit/crashreporter/nsExceptionHandler.cpp
+++ b/toolkit/crashreporter/nsExceptionHandler.cpp
@@ -336,11 +336,12 @@
 // exception handler to the windows default. Any attempt to change the
 // unhandled exception filter or to reset it is ignored and our crash
 // reporter is loaded instead (in case it became unloaded somehow)
 typedef LPTOP_LEVEL_EXCEPTION_FILTER (WINAPI *SetUnhandledExceptionFilter_func)
   (LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter);
-static SetUnhandledExceptionFilter_func stub_SetUnhandledExceptionFilter = 0;
+static WindowsDllInterceptor::FuncHookType<SetUnhandledExceptionFilter_func>
+  stub_SetUnhandledExceptionFilter;
 static LPTOP_LEVEL_EXCEPTION_FILTER previousUnhandledExceptionFilter = nullptr;
 static WindowsDllInterceptor gKernel32Intercept;
 static bool gBlockUnhandledExceptionFilter = true;
 
 static LPTOP_LEVEL_EXCEPTION_FILTER GetUnhandledExceptionFilter()
@@ -1637,13 +1638,13 @@
 #endif
 
   // protect the crash reporter from being unloaded
   gBlockUnhandledExceptionFilter = true;
   gKernel32Intercept.Init("kernel32.dll");
-  bool ok = gKernel32Intercept.AddHook("SetUnhandledExceptionFilter",
-          reinterpret_cast<intptr_t>(patched_SetUnhandledExceptionFilter),
-          (void**) &stub_SetUnhandledExceptionFilter);
+  bool ok = stub_SetUnhandledExceptionFilter.Set(gKernel32Intercept,
+                                                 "SetUnhandledExceptionFilter",
+                                                 &patched_SetUnhandledExceptionFilter);
 
 #ifdef DEBUG
   if (!ok)
     printf_stderr ("SetUnhandledExceptionFilter hook failed; crash reporter is vulnerable.\n");
 #endif
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.dtd
@@ -32,10 +32,11 @@
 <!ENTITY aboutTelemetry.sessionInfoSection "Session Information">
 <!ENTITY aboutTelemetry.scalarsSection "Scalars">
 <!ENTITY aboutTelemetry.keyedScalarsSection "Keyed Scalars">
 <!ENTITY aboutTelemetry.histogramsSection "Histograms">
 <!ENTITY aboutTelemetry.keyedHistogramsSection "Keyed Histograms">
+<!ENTITY aboutTelemetry.eventsSection "Events">
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "Simple Measurements">
 <!ENTITY aboutTelemetry.slowSqlSection "Slow SQL Statements">
 <!ENTITY aboutTelemetry.addonDetailsSection "Add-on Details">
 <!ENTITY aboutTelemetry.capturedStacksSection "Captured Stacks">
 <!ENTITY aboutTelemetry.lateWritesSection "Late Writes">
diff --git a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
--- a/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
+++ b/toolkit/locales/en-US/chrome/global/aboutTelemetry.properties
@@ -92,5 +92,10 @@
 stackTitle = Stack:
 memoryMapTitle = Memory map:
 
 errorFetchingSymbols = An error occurred while fetching symbols. Check that you are connected to the Internet and try again.
 
+timestampHeader = timestamp
+categoryHeader = category
+methodHeader = method
+objectHeader = object
+extraHeader = extra
diff --git a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
--- a/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/downloads/downloads.properties
@@ -104,9 +104,8 @@
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Yesterday
 
 fileExecutableSecurityWarning=“%S” is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch “%S”?
 fileExecutableSecurityWarningTitle=Open Executable File?
-fileExecutableSecurityWarningDontAsk=Don’t ask me this again
 
 # Desktop folder name for downloaded files
 downloadsFolder=Downloads
diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
--- a/toolkit/modules/Troubleshoot.jsm
+++ b/toolkit/modules/Troubleshoot.jsm
@@ -23,13 +23,13 @@
   "browser.display.",
   "browser.download.folderList",
   "browser.download.hide_plugins_without_extensions",
   "browser.download.lastDir.savePerSite",
   "browser.download.manager.addToRecentDocs",
-  "browser.download.manager.alertOnEXEOpen",
   "browser.download.manager.resumeOnWakeDelay",
   "browser.download.preferred.",
+  "browser.download.skipConfirmLaunchExecutable",
   "browser.download.useDownloadDir",
   "browser.fixup.",
   "browser.history_expire_",
   "browser.link.open_newwindow",
   "browser.places.",
diff --git a/toolkit/modules/addons/SecurityInfo.jsm b/toolkit/modules/addons/SecurityInfo.jsm
--- a/toolkit/modules/addons/SecurityInfo.jsm
+++ b/toolkit/modules/addons/SecurityInfo.jsm
@@ -208,23 +208,22 @@
 
     let certData = {
       subject: cert.subjectName,
       issuer: cert.issuerName,
       validity: {
-        startGMT: cert.validity.notBeforeGMT,
-        endGMT: cert.validity.notAfterGMT,
+        start: cert.validity.notBefore,
+        end: cert.validity.notAfter,
       },
       fingerprint: {
         sha1: cert.sha1Fingerprint,
         sha256: cert.sha256Fingerprint,
       },
       serialNumber: cert.serialNumber,
       isBuiltInRoot: cert.isBuiltInRoot,
       subjectPublicKeyInfoDigest: {
         sha256: cert.sha256SubjectPublicKeyInfoDigest,
       },
-      keyUsages: cert.keyUsages,
     };
     if (options.rawDER) {
       certData.rawDER = cert.getRawDER({});
     }
     return certData;
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -97,10 +97,13 @@
 # Rust
 # ==============================================================
 include('../build/moz.configure/rust.configure',
         when='--enable-compile-environment')
 
+# NodeJS
+# ==============================================================
+include('../build/moz.configure/node.configure')
 
 # L10N
 # ==============================================================
 option('--with-l10n-base', nargs=1, env='L10NBASEDIR',
        help='Path to l10n repositories')
diff --git a/toolkit/mozapps/extensions/LightweightThemeManager.jsm b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
--- a/toolkit/mozapps/extensions/LightweightThemeManager.jsm
+++ b/toolkit/mozapps/extensions/LightweightThemeManager.jsm
@@ -969,11 +969,12 @@
        Ci.nsIWebBrowserPersist.PERSIST_FLAGS_BYPASS_CACHE :
        Ci.nsIWebBrowserPersist.PERSIST_FLAGS_FROM_CACHE);
 
   persist.progressListener = new _persistProgressListener(successCallback);
 
-  persist.saveURI(sourceURI, 0,
+  let sourcePrincipal = Services.scriptSecurityManager.createCodebasePrincipal(sourceURI, {});
+  persist.saveURI(sourceURI, sourcePrincipal, 0,
                   null, Ci.nsIHttpChannel.REFERRER_POLICY_UNSET,
                   null, null, targetURI, null);
 }
 
 function _persistProgressListener(successCallback) {
diff --git a/toolkit/themes/shared/in-content/info-pages.inc.css b/toolkit/themes/shared/in-content/info-pages.inc.css
--- a/toolkit/themes/shared/in-content/info-pages.inc.css
+++ b/toolkit/themes/shared/in-content/info-pages.inc.css
@@ -15,11 +15,10 @@
   flex-direction: column;
   box-sizing: border-box;
   min-height: 100vh;
   padding: 40px 48px;
   align-items: center;
-  justify-content: center;
 }
 
 body.wide-container {
   display: block;
 }
diff --git a/tools/lint/eslint/eslint-plugin-mozilla/update.sh b/tools/lint/eslint/eslint-plugin-mozilla/update.sh
--- a/tools/lint/eslint/eslint-plugin-mozilla/update.sh
+++ b/tools/lint/eslint/eslint-plugin-mozilla/update.sh
@@ -4,19 +4,19 @@
 
 # Force the scripts working directory to be projdir/tools/lint/eslint/eslint-plugin-mozilla.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-echo "To complete this script you will need the following tokens from https://api.pub.build.mozilla.org/tokenauth/"
+echo "To complete this script you will need the following tokens from https://mozilla-releng.net/tokens"
 echo " - tooltool.upload.public"
 echo " - tooltool.download.public"
 echo ""
 read -p "Are these tokens visible at the above URL (y/n)?" choice
 case "$choice" in
   y|Y )
     echo ""
-    echo "1. Go to https://api.pub.build.mozilla.org/"
+    echo "1. Go to https://mozilla-releng.net"
     echo "2. Log in using your Mozilla LDAP account."
     echo "3. Click on \"Tokens.\""
     echo "4. Issue a user token with the permissions tooltool.upload.public and tooltool.download.public."
     echo ""
     echo "When you click issue you will be presented with a long string. Paste the string into a temporary file called ~/.tooltool-token."
@@ -47,14 +47,14 @@
 echo "Creating eslint-plugin-mozilla.tar.gz..."
 tar cvz -f eslint-plugin-mozilla.tar.gz node_modules
 
 echo "Adding eslint-plugin-mozilla.tar.gz to tooltool..."
 rm -f manifest.tt
-../../../../python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
+../../../../python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz --url="https://tooltool.mozilla-releng.net/"
 
 echo "Uploading eslint-plugin-mozilla.tar.gz to tooltool..."
-../../../../python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla" --url="https://api.pub.build.mozilla.org/tooltool/"
+../../../../python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla" --url="https://tooltool.mozilla-releng.net/"
 
 echo "Cleaning up..."
 rm eslint-plugin-mozilla.tar.gz
 
 echo ""
diff --git a/tools/lint/eslint/modules.json b/tools/lint/eslint/modules.json
--- a/tools/lint/eslint/modules.json
+++ b/tools/lint/eslint/modules.json
@@ -73,12 +73,12 @@
   "FormAutofillUtils.jsm": ["FormAutofillUtils", "AddressDataLoader"],
   "FrameScriptManager.jsm": ["getNewLoaderID"],
   "fxa_utils.js": ["initializeIdentityWithTokenServerResponse"],
   "fxaccounts.jsm": ["Authentication"],
   "FxAccounts.jsm": ["fxAccounts", "FxAccounts"],
-  "FxAccountsCommon.js": ["log", "logPII", "FXACCOUNTS_PERMISSION", "DATA_FORMAT_VERSION", "DEFAULT_STORAGE_FILENAME", "ASSERTION_LIFETIME", "ASSERTION_USE_PERIOD", "CERT_LIFETIME", "KEY_LIFETIME", "POLL_SESSION", "ONLOGIN_NOTIFICATION", "ONVERIFIED_NOTIFICATION", "ONLOGOUT_NOTIFICATION", "ON_DEVICE_CONNECTED_NOTIFICATION", "ON_DEVICE_DISCONNECTED_NOTIFICATION", "ON_PROFILE_UPDATED_NOTIFICATION", "ON_PASSWORD_CHANGED_NOTIFICATION", "ON_PASSWORD_RESET_NOTIFICATION", "ON_VERIFY_LOGIN_NOTIFICATION", "ON_ACCOUNT_DESTROYED_NOTIFICATION", "ON_COLLECTION_CHANGED_NOTIFICATION", "FXA_PUSH_SCOPE_ACCOUNT_UPDATE", "ON_PROFILE_CHANGE_NOTIFICATION", "ON_ACCOUNT_STATE_CHANGE_NOTIFICATION", "CAPABILITY_MESSAGES", "CAPABILITY_MESSAGES_SENDTAB", "UI_REQUEST_SIGN_IN_FLOW", "UI_REQUEST_REFRESH_AUTH", "FX_OAUTH_CLIENT_ID", "WEBCHANNEL_ID", "PREF_LAST_FXA_USER", "ERRNO_ACCOUNT_ALREADY_EXISTS", "ERRNO_ACCOUNT_DOES_NOT_EXIST", "ERRNO_INCORRECT_PASSWORD", "ERRNO_UNVERIFIED_ACCOUNT", "ERRNO_INVALID_VERIFICATION_CODE", "ERRNO_NOT_VALID_JSON_BODY", "ERRNO_INVALID_BODY_PARAMETERS", "ERRNO_MISSING_BODY_PARAMETERS", "ERRNO_INVALID_REQUEST_SIGNATURE", "ERRNO_INVALID_AUTH_TOKEN", "ERRNO_INVALID_AUTH_TIMESTAMP", "ERRNO_MISSING_CONTENT_LENGTH", "ERRNO_REQUEST_BODY_TOO_LARGE", "ERRNO_TOO_MANY_CLIENT_REQUESTS", "ERRNO_INVALID_AUTH_NONCE", "ERRNO_ENDPOINT_NO_LONGER_SUPPORTED", "ERRNO_INCORRECT_LOGIN_METHOD", "ERRNO_INCORRECT_KEY_RETRIEVAL_METHOD", "ERRNO_INCORRECT_API_VERSION", "ERRNO_INCORRECT_EMAIL_CASE", "ERRNO_ACCOUNT_LOCKED", "ERRNO_ACCOUNT_UNLOCKED", "ERRNO_UNKNOWN_DEVICE", "ERRNO_DEVICE_SESSION_CONFLICT", "ERRNO_SERVICE_TEMP_UNAVAILABLE", "ERRNO_PARSE", "ERRNO_NETWORK", "ERRNO_UNKNOWN_ERROR", "OAUTH_SERVER_ERRNO_OFFSET", "ERRNO_UNKNOWN_CLIENT_ID", "ERRNO_INCORRECT_CLIENT_SECRET", "ERRNO_INCORRECT_REDIRECT_URI", "ERRNO_INVALID_FXA_ASSERTION", "ERRNO_UNKNOWN_CODE", "ERRNO_INCORRECT_CODE", "ERRNO_EXPIRED_CODE", "ERRNO_OAUTH_INVALID_TOKEN", "ERRNO_INVALID_REQUEST_PARAM", "ERRNO_INVALID_RESPONSE_TYPE", "ERRNO_UNAUTHORIZED", "ERRNO_FORBIDDEN", "ERRNO_INVALID_CONTENT_TYPE", "ERROR_ACCOUNT_ALREADY_EXISTS", "ERROR_ACCOUNT_DOES_NOT_EXIST", "ERROR_ACCOUNT_LOCKED", "ERROR_ACCOUNT_UNLOCKED", "ERROR_ALREADY_SIGNED_IN_USER", "ERROR_DEVICE_SESSION_CONFLICT", "ERROR_ENDPOINT_NO_LONGER_SUPPORTED", "ERROR_INCORRECT_API_VERSION", "ERROR_INCORRECT_EMAIL_CASE", "ERROR_INCORRECT_KEY_RETRIEVAL_METHOD", "ERROR_INCORRECT_LOGIN_METHOD", "ERROR_INVALID_EMAIL", "ERROR_INVALID_AUDIENCE", "ERROR_INVALID_AUTH_TOKEN", "ERROR_INVALID_AUTH_TIMESTAMP", "ERROR_INVALID_AUTH_NONCE", "ERROR_INVALID_BODY_PARAMETERS", "ERROR_INVALID_PASSWORD", "ERROR_INVALID_VERIFICATION_CODE", "ERROR_INVALID_REFRESH_AUTH_VALUE", "ERROR_INVALID_REQUEST_SIGNATURE", "ERROR_INTERNAL_INVALID_USER", "ERROR_MISSING_BODY_PARAMETERS", "ERROR_MISSING_CONTENT_LENGTH", "ERROR_NO_TOKEN_SESSION", "ERROR_NO_SILENT_REFRESH_AUTH", "ERROR_NOT_VALID_JSON_BODY", "ERROR_OFFLINE", "ERROR_PERMISSION_DENIED", "ERROR_REQUEST_BODY_TOO_LARGE", "ERROR_SERVER_ERROR", "ERROR_SYNC_DISABLED", "ERROR_TOO_MANY_CLIENT_REQUESTS", "ERROR_SERVICE_TEMP_UNAVAILABLE", "ERROR_UI_ERROR", "ERROR_UI_REQUEST", "ERROR_PARSE", "ERROR_NETWORK", "ERROR_UNKNOWN", "ERROR_UNKNOWN_DEVICE", "ERROR_UNVERIFIED_ACCOUNT", "ERROR_UNKNOWN_CLIENT_ID", "ERROR_INCORRECT_CLIENT_SECRET", "ERROR_INCORRECT_REDIRECT_URI", "ERROR_INVALID_FXA_ASSERTION", "ERROR_UNKNOWN_CODE", "ERROR_INCORRECT_CODE", "ERROR_EXPIRED_CODE", "ERROR_OAUTH_INVALID_TOKEN", "ERROR_INVALID_REQUEST_PARAM", "ERROR_INVALID_RESPONSE_TYPE", "ERROR_UNAUTHORIZED", "ERROR_FORBIDDEN", "ERROR_INVALID_CONTENT_TYPE", "ERROR_NO_ACCOUNT", "ERROR_AUTH_ERROR", "ERROR_INVALID_PARAMETER", "ERROR_CODE_METHOD_NOT_ALLOWED", "ERROR_MSG_METHOD_NOT_ALLOWED", "DERIVED_KEYS_NAMES", "FXA_PWDMGR_PLAINTEXT_FIELDS", "FXA_PWDMGR_SECURE_FIELDS", "FXA_PWDMGR_MEMORY_FIELDS", "FXA_PWDMGR_REAUTH_WHITELIST", "FXA_PWDMGR_HOST", "FXA_PWDMGR_REALM", "SERVER_ERRNO_TO_ERROR", "ERROR_TO_GENERAL_ERROR_CLASS"],
-  "FxAccountsMessages.js": ["FxAccountsMessages", "FxAccountsMessagesSender", "FxAccountsMessagesReceiver", "FxAccountsMessagesHandler"],
+  "FxAccountsCommands.js": ["SendTab", "FxAccountsCommands"],
+  "FxAccountsCommon.js": ["log", "logPII", "FXACCOUNTS_PERMISSION", "DATA_FORMAT_VERSION", "DEFAULT_STORAGE_FILENAME", "ASSERTION_LIFETIME", "ASSERTION_USE_PERIOD", "CERT_LIFETIME", "KEY_LIFETIME", "POLL_SESSION", "ONLOGIN_NOTIFICATION", "ONVERIFIED_NOTIFICATION", "ONLOGOUT_NOTIFICATION", "ON_COMMAND_RECEIVED_NOTIFICATION", "ON_DEVICE_CONNECTED_NOTIFICATION", "ON_DEVICE_DISCONNECTED_NOTIFICATION", "ON_PROFILE_UPDATED_NOTIFICATION", "ON_PASSWORD_CHANGED_NOTIFICATION", "ON_PASSWORD_RESET_NOTIFICATION", "ON_VERIFY_LOGIN_NOTIFICATION", "ON_ACCOUNT_DESTROYED_NOTIFICATION", "ON_COLLECTION_CHANGED_NOTIFICATION", "FXA_PUSH_SCOPE_ACCOUNT_UPDATE", "ON_PROFILE_CHANGE_NOTIFICATION", "ON_ACCOUNT_STATE_CHANGE_NOTIFICATION", "COMMAND_SENDTAB", "UI_REQUEST_SIGN_IN_FLOW", "UI_REQUEST_REFRESH_AUTH", "FX_OAUTH_CLIENT_ID", "WEBCHANNEL_ID", "PREF_LAST_FXA_USER", "ERRNO_ACCOUNT_ALREADY_EXISTS", "ERRNO_ACCOUNT_DOES_NOT_EXIST", "ERRNO_INCORRECT_PASSWORD", "ERRNO_UNVERIFIED_ACCOUNT", "ERRNO_INVALID_VERIFICATION_CODE", "ERRNO_NOT_VALID_JSON_BODY", "ERRNO_INVALID_BODY_PARAMETERS", "ERRNO_MISSING_BODY_PARAMETERS", "ERRNO_INVALID_REQUEST_SIGNATURE", "ERRNO_INVALID_AUTH_TOKEN", "ERRNO_INVALID_AUTH_TIMESTAMP", "ERRNO_MISSING_CONTENT_LENGTH", "ERRNO_REQUEST_BODY_TOO_LARGE", "ERRNO_TOO_MANY_CLIENT_REQUESTS", "ERRNO_INVALID_AUTH_NONCE", "ERRNO_ENDPOINT_NO_LONGER_SUPPORTED", "ERRNO_INCORRECT_LOGIN_METHOD", "ERRNO_INCORRECT_KEY_RETRIEVAL_METHOD", "ERRNO_INCORRECT_API_VERSION", "ERRNO_INCORRECT_EMAIL_CASE", "ERRNO_ACCOUNT_LOCKED", "ERRNO_ACCOUNT_UNLOCKED", "ERRNO_UNKNOWN_DEVICE", "ERRNO_DEVICE_SESSION_CONFLICT", "ERRNO_SERVICE_TEMP_UNAVAILABLE", "ERRNO_PARSE", "ERRNO_NETWORK", "ERRNO_UNKNOWN_ERROR", "OAUTH_SERVER_ERRNO_OFFSET", "ERRNO_UNKNOWN_CLIENT_ID", "ERRNO_INCORRECT_CLIENT_SECRET", "ERRNO_INCORRECT_REDIRECT_URI", "ERRNO_INVALID_FXA_ASSERTION", "ERRNO_UNKNOWN_CODE", "ERRNO_INCORRECT_CODE", "ERRNO_EXPIRED_CODE", "ERRNO_OAUTH_INVALID_TOKEN", "ERRNO_INVALID_REQUEST_PARAM", "ERRNO_INVALID_RESPONSE_TYPE", "ERRNO_UNAUTHORIZED", "ERRNO_FORBIDDEN", "ERRNO_INVALID_CONTENT_TYPE", "ERROR_ACCOUNT_ALREADY_EXISTS", "ERROR_ACCOUNT_DOES_NOT_EXIST", "ERROR_ACCOUNT_LOCKED", "ERROR_ACCOUNT_UNLOCKED", "ERROR_ALREADY_SIGNED_IN_USER", "ERROR_DEVICE_SESSION_CONFLICT", "ERROR_ENDPOINT_NO_LONGER_SUPPORTED", "ERROR_INCORRECT_API_VERSION", "ERROR_INCORRECT_EMAIL_CASE", "ERROR_INCORRECT_KEY_RETRIEVAL_METHOD", "ERROR_INCORRECT_LOGIN_METHOD", "ERROR_INVALID_EMAIL", "ERROR_INVALID_AUDIENCE", "ERROR_INVALID_AUTH_TOKEN", "ERROR_INVALID_AUTH_TIMESTAMP", "ERROR_INVALID_AUTH_NONCE", "ERROR_INVALID_BODY_PARAMETERS", "ERROR_INVALID_PASSWORD", "ERROR_INVALID_VERIFICATION_CODE", "ERROR_INVALID_REFRESH_AUTH_VALUE", "ERROR_INVALID_REQUEST_SIGNATURE", "ERROR_INTERNAL_INVALID_USER", "ERROR_MISSING_BODY_PARAMETERS", "ERROR_MISSING_CONTENT_LENGTH", "ERROR_NO_TOKEN_SESSION", "ERROR_NO_SILENT_REFRESH_AUTH", "ERROR_NOT_VALID_JSON_BODY", "ERROR_OFFLINE", "ERROR_PERMISSION_DENIED", "ERROR_REQUEST_BODY_TOO_LARGE", "ERROR_SERVER_ERROR", "ERROR_SYNC_DISABLED", "ERROR_TOO_MANY_CLIENT_REQUESTS", "ERROR_SERVICE_TEMP_UNAVAILABLE", "ERROR_UI_ERROR", "ERROR_UI_REQUEST", "ERROR_PARSE", "ERROR_NETWORK", "ERROR_UNKNOWN", "ERROR_UNKNOWN_DEVICE", "ERROR_UNVERIFIED_ACCOUNT", "ERROR_UNKNOWN_CLIENT_ID", "ERROR_INCORRECT_CLIENT_SECRET", "ERROR_INCORRECT_REDIRECT_URI", "ERROR_INVALID_FXA_ASSERTION", "ERROR_UNKNOWN_CODE", "ERROR_INCORRECT_CODE", "ERROR_EXPIRED_CODE", "ERROR_OAUTH_INVALID_TOKEN", "ERROR_INVALID_REQUEST_PARAM", "ERROR_INVALID_RESPONSE_TYPE", "ERROR_UNAUTHORIZED", "ERROR_FORBIDDEN", "ERROR_INVALID_CONTENT_TYPE", "ERROR_NO_ACCOUNT", "ERROR_AUTH_ERROR", "ERROR_INVALID_PARAMETER", "ERROR_CODE_METHOD_NOT_ALLOWED", "ERROR_MSG_METHOD_NOT_ALLOWED", "DERIVED_KEYS_NAMES", "FXA_PWDMGR_PLAINTEXT_FIELDS", "FXA_PWDMGR_SECURE_FIELDS", "FXA_PWDMGR_MEMORY_FIELDS", "FXA_PWDMGR_REAUTH_WHITELIST", "FXA_PWDMGR_HOST", "FXA_PWDMGR_REALM", "SERVER_ERRNO_TO_ERROR", "ERROR_TO_GENERAL_ERROR_CLASS"],
   "FxAccountsOAuthGrantClient.jsm": ["FxAccountsOAuthGrantClient", "FxAccountsOAuthGrantClientError"],
   "FxAccountsProfileClient.jsm": ["FxAccountsProfileClient", "FxAccountsProfileClientError"],
   "FxAccountsPush.js": ["FxAccountsPushService"],
   "FxAccountsStorage.jsm": ["FxAccountsStorageManagerCanStoreField", "FxAccountsStorageManager"],
   "FxAccountsWebChannel.jsm": ["EnsureFxAccountsWebChannel"],
diff --git a/tools/lint/eslint/update.sh b/tools/lint/eslint/update.sh
--- a/tools/lint/eslint/update.sh
+++ b/tools/lint/eslint/update.sh
@@ -4,19 +4,19 @@
 
 # Force the scripts working directory to be projdir/tools/lint/eslint.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
-echo "To complete this script you will need the following tokens from https://api.pub.build.mozilla.org/tokenauth/"
+echo "To complete this script you will need the following tokens from https://mozilla-releng.net/tokens"
 echo " - tooltool.upload.public"
 echo " - tooltool.download.public"
 echo ""
 read -p "Are these tokens visible at the above URL (y/n)?" choice
 case "$choice" in
   y|Y )
     echo ""
-    echo "1. Go to https://api.pub.build.mozilla.org/"
+    echo "1. Go to https://mozilla-releng.net"
     echo "2. Log in using your Mozilla LDAP account."
     echo "3. Click on \"Tokens.\""
     echo "4. Issue a user token with the permissions tooltool.upload.public and tooltool.download.public."
     echo ""
     echo "When you click issue you will be presented with a long string. Paste the string into a temporary file called ~/.tooltool-token."
@@ -54,14 +54,14 @@
 echo "Creating eslint.tar.gz..."
 tar cvz --exclude=eslint-plugin-mozilla --exclude=eslint-plugin-spidermonkey-js -f eslint.tar.gz node_modules
 
 echo "Adding eslint.tar.gz to tooltool..."
 rm tools/lint/eslint/manifest.tt
-./python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
+./python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint.tar.gz --url="https://tooltool.mozilla-releng.net/"
 
 echo "Uploading eslint.tar.gz to tooltool..."
-./python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint" --url="https://api.pub.build.mozilla.org/tooltool/"
+./python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint" --url="https://tooltool.mozilla-releng.net/"
 
 echo "Cleaning up..."
 mv manifest.tt tools/lint/eslint/manifest.tt
 rm eslint.tar.gz
 
diff --git a/tools/profiler/core/platform-win32.cpp b/tools/profiler/core/platform-win32.cpp
--- a/tools/profiler/core/platform-win32.cpp
+++ b/tools/profiler/core/platform-win32.cpp
@@ -301,11 +301,12 @@
 
 #if defined(GP_PLAT_amd64_windows)
 static WindowsDllInterceptor NtDllIntercept;
 
 typedef NTSTATUS (NTAPI *LdrUnloadDll_func)(HMODULE module);
-static LdrUnloadDll_func stub_LdrUnloadDll;
+static WindowsDllInterceptor::FuncHookType<LdrUnloadDll_func>
+  stub_LdrUnloadDll;
 
 static NTSTATUS NTAPI
 patched_LdrUnloadDll(HMODULE module)
 {
   // Prevent the stack walker from suspending this thread when LdrUnloadDll
@@ -316,11 +317,12 @@
 
 // These pointers are disguised as PVOID to avoid pulling in obscure headers
 typedef PVOID (WINAPI *LdrResolveDelayLoadedAPI_func)(PVOID ParentModuleBase,
   PVOID DelayloadDescriptor, PVOID FailureDllHook, PVOID FailureSystemHook,
   PVOID ThunkAddress, ULONG Flags);
-static LdrResolveDelayLoadedAPI_func stub_LdrResolveDelayLoadedAPI;
+static WindowsDllInterceptor::FuncHookType<LdrResolveDelayLoadedAPI_func>
+  stub_LdrResolveDelayLoadedAPI;
 
 static PVOID WINAPI
 patched_LdrResolveDelayLoadedAPI(PVOID ParentModuleBase,
   PVOID DelayloadDescriptor, PVOID FailureDllHook, PVOID FailureSystemHook,
   PVOID ThunkAddress, ULONG Flags)
@@ -334,23 +336,15 @@
 }
 
 void
 InitializeWin64ProfilerHooks()
 {
-  static bool initialized = false;
-  if (initialized) {
-    return;
-  }
-  initialized = true;
-
   NtDllIntercept.Init("ntdll.dll");
-  NtDllIntercept.AddHook("LdrUnloadDll",
-                         reinterpret_cast<intptr_t>(patched_LdrUnloadDll),
-                         (void**)&stub_LdrUnloadDll);
+  stub_LdrUnloadDll.Set(NtDllIntercept, "LdrUnloadDll", &patched_LdrUnloadDll);
   if (IsWin8OrLater()) { // LdrResolveDelayLoadedAPI was introduced in Win8
-    NtDllIntercept.AddHook("LdrResolveDelayLoadedAPI",
-                           reinterpret_cast<intptr_t>(patched_LdrResolveDelayLoadedAPI),
-                           (void**)&stub_LdrResolveDelayLoadedAPI);
+    stub_LdrResolveDelayLoadedAPI.Set(NtDllIntercept,
+                                      "LdrResolveDelayLoadedAPI",
+                                      &patched_LdrResolveDelayLoadedAPI);
   }
 }
 #endif // defined(GP_PLAT_amd64_windows)
 
diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
--- a/widget/nsBaseDragService.cpp
+++ b/widget/nsBaseDragService.cpp
@@ -549,11 +549,11 @@
 {
   nsCOMPtr<nsIContent> content = do_QueryInterface(aDOMNode);
   if (!content)
     return nullptr;
 
-  nsCOMPtr<nsIDocument> document = content->GetUncomposedDoc();
+  nsCOMPtr<nsIDocument> document = content->GetComposedDoc();
   if (document) {
     document->FlushPendingNotifications(FlushType::Display);
 
     return document->GetShell();
   }
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -350,13 +350,10 @@
 static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
 
 // General purpose user32.dll hook object
 static WindowsDllInterceptor sUser32Intercept;
 
-// AddHook success checks
-static mozilla::Maybe<bool> sHookedGetWindowInfo;
-
 // 2 pixel offset for eTransparencyBorderlessGlass which equals the size of
 // the default window border Windows paints. Glass will be extended inward
 // this distance to remove the border.
 static const int32_t kGlassMarginAdjustment = 2;
 
@@ -459,21 +456,21 @@
     // On touchscreen devices, tiptsf.dll will have been loaded when STA COM was
     // first initialized.
     if (!IsWin10OrLater() && GetModuleHandle(L"tiptsf.dll") &&
         !sProcessCaretEventsStub) {
       sTipTsfInterceptor.Init("tiptsf.dll");
-      DebugOnly<bool> ok = sTipTsfInterceptor.AddHook("ProcessCaretEvents",
-          reinterpret_cast<intptr_t>(&ProcessCaretEventsHook),
-          (void**) &sProcessCaretEventsStub);
+      DebugOnly<bool> ok = sProcessCaretEventsStub.Set(sTipTsfInterceptor,
+                                                       "ProcessCaretEvents",
+                                                       &ProcessCaretEventsHook);
       MOZ_ASSERT(ok);
     }
 
     if (!sSendMessageTimeoutWStub) {
       sUser32Intercept.Init("user32.dll");
-      DebugOnly<bool> hooked = sUser32Intercept.AddHook("SendMessageTimeoutW",
-          reinterpret_cast<intptr_t>(&SendMessageTimeoutWHook),
-          (void**) &sSendMessageTimeoutWStub);
+      DebugOnly<bool> hooked = sSendMessageTimeoutWStub.Set(sUser32Intercept,
+                                                            "SendMessageTimeoutW",
+                                                            &SendMessageTimeoutWHook);
       MOZ_ASSERT(hooked);
     }
   }
 
   class MOZ_RAII A11yInstantiationBlocker
@@ -554,22 +551,26 @@
 
     return static_cast<LRESULT>(TRUE);
   }
 
   static WindowsDllInterceptor sTipTsfInterceptor;
-  static WINEVENTPROC sProcessCaretEventsStub;
-  static decltype(&SendMessageTimeoutW) sSendMessageTimeoutWStub;
+  static WindowsDllInterceptor::FuncHookType<WINEVENTPROC>
+    sProcessCaretEventsStub;
+  static WindowsDllInterceptor::FuncHookType<decltype(&SendMessageTimeoutW)>
+    sSendMessageTimeoutWStub;
   static StaticAutoPtr<TIPMessageHandler> sInstance;
 
   HHOOK                 mHook;
   UINT                  mMessages[7];
   uint32_t              mA11yBlockCount;
 };
 
 WindowsDllInterceptor TIPMessageHandler::sTipTsfInterceptor;
-WINEVENTPROC TIPMessageHandler::sProcessCaretEventsStub;
-decltype(&SendMessageTimeoutW) TIPMessageHandler::sSendMessageTimeoutWStub;
+WindowsDllInterceptor::FuncHookType<WINEVENTPROC>
+  TIPMessageHandler::sProcessCaretEventsStub;
+WindowsDllInterceptor::FuncHookType<decltype(&SendMessageTimeoutW)>
+  TIPMessageHandler::sSendMessageTimeoutWStub;
 StaticAutoPtr<TIPMessageHandler> TIPMessageHandler::sInstance;
 
 } // namespace mozilla
 
 #endif // defined(ACCESSIBILITY)
@@ -2470,11 +2471,11 @@
 // Internally track the caption status via a window property. Required
 // due to our internal handling of WM_NCACTIVATE when custom client
 // margins are set.
 static const wchar_t kManageWindowInfoProperty[] = L"ManageWindowInfoProperty";
 typedef BOOL (WINAPI *GetWindowInfoPtr)(HWND hwnd, PWINDOWINFO pwi);
-static GetWindowInfoPtr sGetWindowInfoPtrStub = nullptr;
+static WindowsDllInterceptor::FuncHookType<GetWindowInfoPtr> sGetWindowInfoPtrStub;
 
 BOOL WINAPI
 GetWindowInfoHook(HWND hWnd, PWINDOWINFO pwi)
 {
   if (!sGetWindowInfoPtrStub) {
@@ -2498,22 +2499,19 @@
 nsWindow::UpdateGetWindowInfoCaptionStatus(bool aActiveCaption)
 {
   if (!mWnd)
     return;
 
-  if (sHookedGetWindowInfo.isNothing()) {
-    sUser32Intercept.Init("user32.dll");
-    sHookedGetWindowInfo =
-      Some(sUser32Intercept.AddHook("GetWindowInfo",
-                                    reinterpret_cast<intptr_t>(GetWindowInfoHook),
-                                    (void**) &sGetWindowInfoPtrStub));
-    if (!sHookedGetWindowInfo.value()) {
-      return;
-    }
+  sUser32Intercept.Init("user32.dll");
+  sGetWindowInfoPtrStub.Set(sUser32Intercept, "GetWindowInfo",
+                            &GetWindowInfoHook);
+  if (!sGetWindowInfoPtrStub) {
+    return;
   }
+
   // Update our internally tracked caption status
-  SetPropW(mWnd, kManageWindowInfoProperty, 
+  SetPropW(mWnd, kManageWindowInfoProperty,
     reinterpret_cast<HANDLE>(static_cast<INT_PTR>(aActiveCaption) + 1));
 }
 
 /**
  * Called when the window layout changes: full screen mode transitions,
diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
--- a/xpcom/base/AvailableMemoryTracker.cpp
+++ b/xpcom/base/AvailableMemoryTracker.cpp
@@ -82,20 +82,18 @@
 volatile bool sUnderMemoryPressure = false;
 volatile PRIntervalTime sLastLowMemoryNotificationTime;
 
 // These are function pointers to the functions we wrap in Init().
 
-void* (WINAPI* sVirtualAllocOrig)(LPVOID aAddress, SIZE_T aSize,
-                                  DWORD aAllocationType, DWORD aProtect);
+static WindowsDllInterceptor::FuncHookType<decltype(&VirtualAlloc)>
+  sVirtualAllocOrig;
 
-void* (WINAPI* sMapViewOfFileOrig)(HANDLE aFileMappingObject,
-                                   DWORD aDesiredAccess, DWORD aFileOffsetHigh,
-                                   DWORD aFileOffsetLow, SIZE_T aNumBytesToMap);
+static WindowsDllInterceptor::FuncHookType<decltype(&MapViewOfFile)>
+  sMapViewOfFileOrig;
 
-HBITMAP(WINAPI* sCreateDIBSectionOrig)(HDC aDC, const BITMAPINFO* aBitmapInfo,
-                                       UINT aUsage, VOID** aBits,
-                                       HANDLE aSection, DWORD aOffset);
+static WindowsDllInterceptor::FuncHookType<decltype(&CreateDIBSection)>
+  sCreateDIBSectionOrig;
 
 /**
  * Fire a memory pressure event if we were not under memory pressure yet, or
  * fire an ongoing one if it's been long enough since the last one we
  * fired.
@@ -643,21 +641,16 @@
   // an instrumented build, the compiler adds function calls all over the place
   // which may call VirtualAlloc; this makes it hard to prevent
   // VirtualAllocHook from reentering itself.
   if (!PR_GetEnv("MOZ_PGO_INSTRUMENTED")) {
     sKernel32Intercept.Init("Kernel32.dll");
-    sKernel32Intercept.AddHook("VirtualAlloc",
-                               reinterpret_cast<intptr_t>(VirtualAllocHook),
-                               reinterpret_cast<void**>(&sVirtualAllocOrig));
-    sKernel32Intercept.AddHook("MapViewOfFile",
-                               reinterpret_cast<intptr_t>(MapViewOfFileHook),
-                               reinterpret_cast<void**>(&sMapViewOfFileOrig));
+    sVirtualAllocOrig.Set(sKernel32Intercept, "VirtualAlloc", &VirtualAllocHook);
+    sMapViewOfFileOrig.Set(sKernel32Intercept, "MapViewOfFile", &MapViewOfFileHook);
 
     sGdi32Intercept.Init("Gdi32.dll");
-    sGdi32Intercept.AddHook("CreateDIBSection",
-                            reinterpret_cast<intptr_t>(CreateDIBSectionHook),
-                            reinterpret_cast<void**>(&sCreateDIBSectionOrig));
+    sCreateDIBSectionOrig.Set(sGdi32Intercept, "CreateDIBSection",
+                              &CreateDIBSectionHook);
   }
 
   sInitialized = true;
 #endif // defined(XP_WIN) && !defined(HAVE_64BIT_BUILD)
 }
diff --git a/xpcom/build/PoisonIOInterposerWin.cpp b/xpcom/build/PoisonIOInterposerWin.cpp
--- a/xpcom/build/PoisonIOInterposerWin.cpp
+++ b/xpcom/build/PoisonIOInterposerWin.cpp
@@ -207,17 +207,24 @@
 }
 
 /*************************** IO Interposing Methods ***************************/
 
 // Function pointers to original functions
-static NtCreateFileFn         gOriginalNtCreateFile;
-static NtReadFileFn           gOriginalNtReadFile;
-static NtReadFileScatterFn    gOriginalNtReadFileScatter;
-static NtWriteFileFn          gOriginalNtWriteFile;
-static NtWriteFileGatherFn    gOriginalNtWriteFileGather;
-static NtFlushBuffersFileFn   gOriginalNtFlushBuffersFile;
-static NtQueryFullAttributesFileFn gOriginalNtQueryFullAttributesFile;
+static WindowsDllInterceptor::FuncHookType<NtCreateFileFn>
+  gOriginalNtCreateFile;
+static WindowsDllInterceptor::FuncHookType<NtReadFileFn>
+  gOriginalNtReadFile;
+static WindowsDllInterceptor::FuncHookType<NtReadFileScatterFn>
+  gOriginalNtReadFileScatter;
+static WindowsDllInterceptor::FuncHookType<NtWriteFileFn>
+  gOriginalNtWriteFile;
+static WindowsDllInterceptor::FuncHookType<NtWriteFileGatherFn>
+  gOriginalNtWriteFileGather;
+static WindowsDllInterceptor::FuncHookType<NtFlushBuffersFileFn>
+  gOriginalNtFlushBuffersFile;
+static WindowsDllInterceptor::FuncHookType<NtQueryFullAttributesFileFn>
+  gOriginalNtQueryFullAttributesFile;
 
 static NTSTATUS NTAPI
 InterposedNtCreateFile(PHANDLE aFileHandle,
                        ACCESS_MASK aDesiredAccess,
                        POBJECT_ATTRIBUTES aObjectAttributes,
@@ -446,38 +453,25 @@
   ReplaceMalloc::InitDebugFd(registry);
 #endif
 
   // Initialize dll interceptor and add hooks
   sNtDllInterceptor.Init("ntdll.dll");
-  sNtDllInterceptor.AddHook(
-    "NtCreateFile",
-    reinterpret_cast<intptr_t>(InterposedNtCreateFile),
-    reinterpret_cast<void**>(&gOriginalNtCreateFile));
-  sNtDllInterceptor.AddHook(
-    "NtReadFile",
-    reinterpret_cast<intptr_t>(InterposedNtReadFile),
-    reinterpret_cast<void**>(&gOriginalNtReadFile));
-  sNtDllInterceptor.AddHook(
-    "NtReadFileScatter",
-    reinterpret_cast<intptr_t>(InterposedNtReadFileScatter),
-    reinterpret_cast<void**>(&gOriginalNtReadFileScatter));
-  sNtDllInterceptor.AddHook(
-    "NtWriteFile",
-    reinterpret_cast<intptr_t>(InterposedNtWriteFile),
-    reinterpret_cast<void**>(&gOriginalNtWriteFile));
-  sNtDllInterceptor.AddHook(
-    "NtWriteFileGather",
-    reinterpret_cast<intptr_t>(InterposedNtWriteFileGather),
-    reinterpret_cast<void**>(&gOriginalNtWriteFileGather));
-  sNtDllInterceptor.AddHook(
-    "NtFlushBuffersFile",
-    reinterpret_cast<intptr_t>(InterposedNtFlushBuffersFile),
-    reinterpret_cast<void**>(&gOriginalNtFlushBuffersFile));
-  sNtDllInterceptor.AddHook(
-    "NtQueryFullAttributesFile",
-    reinterpret_cast<intptr_t>(InterposedNtQueryFullAttributesFile),
-    reinterpret_cast<void**>(&gOriginalNtQueryFullAttributesFile));
+  gOriginalNtCreateFile.Set(sNtDllInterceptor, "NtCreateFile",
+                            &InterposedNtCreateFile);
+  gOriginalNtReadFile.Set(sNtDllInterceptor, "NtReadFile",
+                          &InterposedNtReadFile);
+  gOriginalNtReadFileScatter.Set(sNtDllInterceptor, "NtReadFileScatter",
+                                 &InterposedNtReadFileScatter);
+  gOriginalNtWriteFile.Set(sNtDllInterceptor, "NtWriteFile",
+                           &InterposedNtWriteFile);
+  gOriginalNtWriteFileGather.Set(sNtDllInterceptor, "NtWriteFileGather",
+                                 &InterposedNtWriteFileGather);
+  gOriginalNtFlushBuffersFile.Set(sNtDllInterceptor, "NtFlushBuffersFile",
+                                  &InterposedNtFlushBuffersFile);
+  gOriginalNtQueryFullAttributesFile.Set(sNtDllInterceptor,
+                                         "NtQueryFullAttributesFile",
+                                         &InterposedNtQueryFullAttributesFile);
 }
 
 void
 ClearPoisonIOInterposer()
 {
diff --git a/xpcom/threads/TaskQueue.h b/xpcom/threads/TaskQueue.h
--- a/xpcom/threads/TaskQueue.h
+++ b/xpcom/threads/TaskQueue.h
@@ -43,10 +43,14 @@
 // in TQ1 at any time.
 //
 // This arrangement lets you prioritize work by dispatching runnables directly
 // to TQ1.  You can issue many runnables for important work.  Meanwhile the TQ2
 // and TQ3 work will always execute at most one runnable and then yield.
+//
+// A TaskQueue does not require explicit shutdown, however it provides a
+// BeginShutdown() method that places TaskQueue in a shut down state and returns
+// a promise that gets resolved once all pending tasks have completed
 class TaskQueue : public AbstractThread
 {
   class EventTargetWrapper;
 
 public:
@@ -93,11 +97,10 @@
   // Blocks until the queue is flagged for shutdown and all tasks have finished
   // executing.
   void AwaitShutdownAndIdle();
 
   bool IsEmpty();
-  uint32_t ImpreciseLengthForHeuristics();
 
   // Returns true if the current thread is currently running a Runnable in
   // the task queue.
   bool IsCurrentThreadIn() override;
 
diff --git a/xpcom/threads/TaskQueue.cpp b/xpcom/threads/TaskQueue.cpp
--- a/xpcom/threads/TaskQueue.cpp
+++ b/xpcom/threads/TaskQueue.cpp
@@ -87,12 +87,12 @@
 {
 }
 
 TaskQueue::~TaskQueue()
 {
-  MonitorAutoLock mon(mQueueMonitor);
-  MOZ_ASSERT(mIsShutdown);
+  // No one is referencing this TaskQueue anymore, meaning no tasks can be
+  // pending as all Runner hold a reference to this TaskQueue.
 }
 
 TaskDispatcher&
 TaskQueue::TailDispatcher()
 {
@@ -176,11 +176,10 @@
   // Dispatch any tasks for this queue waiting in the caller's tail dispatcher,
   // since this is the last opportunity to do so.
   if (AbstractThread* currentThread = AbstractThread::GetCurrent()) {
     currentThread->TailDispatchTasksFor(this);
   }
-
   MonitorAutoLock mon(mQueueMonitor);
   mIsShutdown = true;
   RefPtr<ShutdownPromise> p = mShutdownPromise.Ensure(__func__);
   MaybeResolveShutdown();
   mon.NotifyAll();
@@ -192,17 +191,10 @@
 {
   MonitorAutoLock mon(mQueueMonitor);
   return mTasks.empty();
 }
 
-uint32_t
-TaskQueue::ImpreciseLengthForHeuristics()
-{
-  MonitorAutoLock mon(mQueueMonitor);
-  return mTasks.size();
-}
-
 bool
 TaskQueue::IsCurrentThreadIn()
 {
   bool in = mRunningThread == GetCurrentPhysicalThread();
   return in;