diff --git a/.inferconfig b/.inferconfig
deleted file mode 100644
index 7141b07a2302..000000000000
--- a/.inferconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "infer-blacklist-path-regex": [
-        // This is full of issues, and is a dependency we need to discard
-        // sooner rather than later anyway:
-        "mobile/android/thirdparty/ch/boye/httpclientandroidlib"
-    ]
-}
\ No newline at end of file
diff --git a/accessible/interfaces/ia2/moz.build b/accessible/interfaces/ia2/moz.build
index 5ba924822d5e..da3d1d39b058 100644
--- a/accessible/interfaces/ia2/moz.build
+++ b/accessible/interfaces/ia2/moz.build
@@ -98,6 +98,3 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
         '-Wno-missing-braces',
         '-Wno-unused-const-variable',
     ]
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/accessible/interfaces/msaa/moz.build b/accessible/interfaces/msaa/moz.build
index 2eb59bff56ce..14aabb852e2f 100644
--- a/accessible/interfaces/msaa/moz.build
+++ b/accessible/interfaces/msaa/moz.build
@@ -44,6 +44,3 @@ if CONFIG['CC_TYPE'] == 'clang-cl':
         '-Wno-missing-braces',
         '-Wno-unused-const-variable',
     ]
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/browser/app/winlauncher/DllBlocklistWin.cpp b/browser/app/winlauncher/DllBlocklistWin.cpp
index 2ed8bc4dd75e..83fde38e737e 100644
--- a/browser/app/winlauncher/DllBlocklistWin.cpp
+++ b/browser/app/winlauncher/DllBlocklistWin.cpp
@@ -25,8 +25,7 @@
   { MOZ_LITERAL_UNICODE_STRING(L##name), __VA_ARGS__ },
 #define DLL_BLOCKLIST_STRING_TYPE UNICODE_STRING
 
-// Restrict the blocklist definitions to Nightly-only for now
-#if defined(NIGHTLY_BUILD)
+#if defined(MOZ_LAUNCHER_PROCESS) || defined(NIGHTLY_BUILD)
 #include "mozilla/WindowsDllBlocklistDefs.h"
 #else
 #include "mozilla/WindowsDllBlocklistCommon.h"
diff --git a/browser/app/winlauncher/LaunchUnelevated.cpp b/browser/app/winlauncher/LaunchUnelevated.cpp
index 829984ebf4ef..ff0960eaf63e 100644
--- a/browser/app/winlauncher/LaunchUnelevated.cpp
+++ b/browser/app/winlauncher/LaunchUnelevated.cpp
@@ -6,6 +6,7 @@
 
 #include "LaunchUnelevated.h"
 
+#include "mozilla/Assertions.h"
 #include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/mscom/COMApartmentRegion.h"
 #include "mozilla/RefPtr.h"
@@ -22,6 +23,76 @@
 #include <shlobj.h>
 #include <shobjidl.h>
 
+static mozilla::Maybe<TOKEN_ELEVATION_TYPE>
+GetElevationType(const nsAutoHandle& aToken)
+{
+  DWORD retLen;
+  TOKEN_ELEVATION_TYPE elevationType;
+  if (!::GetTokenInformation(aToken.get(), TokenElevationType, &elevationType,
+                             sizeof(elevationType), &retLen)) {
+    return mozilla::Nothing();
+  }
+
+  return mozilla::Some(elevationType);
+}
+
+static mozilla::Maybe<bool>
+IsHighIntegrity(const nsAutoHandle& aToken)
+{
+  DWORD reqdLen;
+  if (!::GetTokenInformation(aToken.get(), TokenIntegrityLevel, nullptr, 0,
+                             &reqdLen) &&
+      ::GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+    return mozilla::Nothing();
+  }
+
+  auto buf = mozilla::MakeUnique<char[]>(reqdLen);
+
+  if (!::GetTokenInformation(aToken.get(), TokenIntegrityLevel, buf.get(),
+                             reqdLen, &reqdLen)) {
+    return mozilla::Nothing();
+  }
+
+  auto tokenLabel = reinterpret_cast<PTOKEN_MANDATORY_LABEL>(buf.get());
+
+  DWORD subAuthCount = *::GetSidSubAuthorityCount(tokenLabel->Label.Sid);
+  DWORD integrityLevel = *::GetSidSubAuthority(tokenLabel->Label.Sid,
+                                               subAuthCount - 1);
+  return mozilla::Some(integrityLevel > SECURITY_MANDATORY_MEDIUM_RID);
+}
+
+static nsReturnRef<HANDLE>
+GetMediumIntegrityToken(const nsAutoHandle& aProcessToken)
+{
+  nsAutoHandle empty;
+
+  HANDLE rawResult;
+  if (!::DuplicateTokenEx(aProcessToken.get(), 0, nullptr,
+                          SecurityImpersonation, TokenPrimary, &rawResult)) {
+    return empty.out();
+  }
+
+  nsAutoHandle result(rawResult);
+
+  BYTE mediumIlSid[SECURITY_MAX_SID_SIZE];
+  DWORD mediumIlSidSize = sizeof(mediumIlSid);
+  if (!::CreateWellKnownSid(WinMediumLabelSid, nullptr, mediumIlSid,
+                            &mediumIlSidSize)) {
+    return empty.out();
+  }
+
+  TOKEN_MANDATORY_LABEL integrityLevel = {};
+  integrityLevel.Label.Attributes = SE_GROUP_INTEGRITY;
+  integrityLevel.Label.Sid = reinterpret_cast<PSID>(mediumIlSid);
+
+  if (!::SetTokenInformation(rawResult, TokenIntegrityLevel, &integrityLevel,
+                             sizeof(integrityLevel))) {
+    return empty.out();
+  }
+
+  return result.out();
+}
+
 namespace mozilla {
 
 // If we're running at an elevated integrity level, re-run ourselves at the
@@ -125,36 +196,62 @@ LaunchUnelevated(int aArgc, wchar_t* aArgv[])
   return SUCCEEDED(hr);
 }
 
-mozilla::Maybe<bool>
-IsElevated()
+Maybe<ElevationState>
+GetElevationState(mozilla::LauncherFlags aFlags, nsAutoHandle& aOutMediumIlToken)
 {
+  aOutMediumIlToken.reset();
+
+  const DWORD tokenFlags = TOKEN_QUERY | TOKEN_DUPLICATE |
+                           TOKEN_ADJUST_DEFAULT | TOKEN_ASSIGN_PRIMARY;
   HANDLE rawToken;
-  if (!::OpenProcessToken(::GetCurrentProcess(), TOKEN_QUERY, &rawToken)) {
-    return mozilla::Nothing();
+  if (!::OpenProcessToken(::GetCurrentProcess(), tokenFlags, &rawToken)) {
+    return Nothing();
   }
 
   nsAutoHandle token(rawToken);
 
-  DWORD reqdLen;
-  if (!::GetTokenInformation(token.get(), TokenIntegrityLevel, nullptr, 0,
-                             &reqdLen) &&
-      ::GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-    return mozilla::Nothing();
+  Maybe<TOKEN_ELEVATION_TYPE> elevationType = GetElevationType(token);
+  if (!elevationType) {
+    return Nothing();
   }
 
-  auto buf = mozilla::MakeUnique<char[]>(reqdLen);
+  switch (elevationType.value()) {
+    case TokenElevationTypeLimited:
+      return Some(ElevationState::eNormalUser);
+    case TokenElevationTypeFull:
+      // If we want to start a non-elevated browser process and wait on it,
+      // we're going to need a medium IL token.
+      if ((aFlags & (mozilla::LauncherFlags::eWaitForBrowser |
+                     mozilla::LauncherFlags::eNoDeelevate)) ==
+          mozilla::LauncherFlags::eWaitForBrowser) {
+        aOutMediumIlToken = GetMediumIntegrityToken(token);
+      }
 
-  if (!::GetTokenInformation(token.get(), TokenIntegrityLevel, buf.get(),
-                             reqdLen, &reqdLen)) {
-    return mozilla::Nothing();
+      return Some(ElevationState::eElevated);
+    case TokenElevationTypeDefault:
+      break;
+    default:
+      MOZ_ASSERT_UNREACHABLE("Was a new value added to the enumeration?");
+      return Nothing();
   }
 
-  auto tokenLabel = reinterpret_cast<PTOKEN_MANDATORY_LABEL>(buf.get());
+  // In this case, UAC is disabled. We do not yet know whether or not we are
+  // running at high integrity. If we are at high integrity, we can't relaunch
+  // ourselves in a non-elevated state via Explorer, as we would just end up in
+  // an infinite loop of launcher processes re-launching themselves.
 
-  DWORD subAuthCount = *::GetSidSubAuthorityCount(tokenLabel->Label.Sid);
-  DWORD integrityLevel = *::GetSidSubAuthority(tokenLabel->Label.Sid,
-                                               subAuthCount - 1);
-  return mozilla::Some(integrityLevel > SECURITY_MANDATORY_MEDIUM_RID);
+  Maybe<bool> isHighIntegrity = IsHighIntegrity(token);
+  if (!isHighIntegrity) {
+    return Nothing();
+  }
+
+  if (!isHighIntegrity.value()) {
+    return Some(ElevationState::eNormalUser);
+  }
+
+  aOutMediumIlToken = GetMediumIntegrityToken(token);
+
+  return Some(ElevationState::eHighIntegrityNoUAC);
 }
 
 } // namespace mozilla
diff --git a/browser/app/winlauncher/LaunchUnelevated.h b/browser/app/winlauncher/LaunchUnelevated.h
index 01aa4351317e..27c7e4ffc2bd 100644
--- a/browser/app/winlauncher/LaunchUnelevated.h
+++ b/browser/app/winlauncher/LaunchUnelevated.h
@@ -7,11 +7,22 @@
 #ifndef mozilla_LaunchUnelevated_h
 #define mozilla_LaunchUnelevated_h
 
+#include "LauncherProcessWin.h"
 #include "mozilla/Maybe.h"
+#include "nsWindowsHelpers.h"
 
 namespace mozilla {
 
-mozilla::Maybe<bool> IsElevated();
+enum class ElevationState
+{
+  eNormalUser = 0,
+  eElevated = (1 << 0),
+  eHighIntegrityNoUAC = (1 << 1),
+};
+
+mozilla::Maybe<ElevationState>
+GetElevationState(LauncherFlags aFlags, nsAutoHandle& aOutMediumIlToken);
+
 bool LaunchUnelevated(int aArgc, wchar_t* aArgv[]);
 
 } // namespace mozilla
diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
index bf31b59faf92..78227ccb04bd 100644
--- a/browser/app/winlauncher/LauncherProcessWin.cpp
+++ b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -82,16 +82,82 @@ ShowError(DWORD aError = ::GetLastError())
   ::LocalFree(rawMsgBuf);
 }
 
+static mozilla::LauncherFlags
+ProcessCmdLine(int& aArgc, wchar_t* aArgv[])
+{
+  mozilla::LauncherFlags result = mozilla::LauncherFlags::eNone;
+
+  if (mozilla::CheckArg(aArgc, aArgv, L"wait-for-browser",
+                        static_cast<const wchar_t**>(nullptr),
+                        mozilla::CheckArgFlag::RemoveArg) == mozilla::ARG_FOUND ||
+      mozilla::EnvHasValue("MOZ_AUTOMATION")) {
+    result |= mozilla::LauncherFlags::eWaitForBrowser;
+  }
+
+  if (mozilla::CheckArg(aArgc, aArgv, L"no-deelevate",
+                        static_cast<const wchar_t**>(nullptr),
+                        mozilla::CheckArgFlag::CheckOSInt |
+                        mozilla::CheckArgFlag::RemoveArg) == mozilla::ARG_FOUND) {
+    result |= mozilla::LauncherFlags::eNoDeelevate;
+  }
+
+  return result;
+}
+
+#if defined(MOZ_LAUNCHER_PROCESS)
+
+static mozilla::Maybe<bool>
+IsSameBinaryAsParentProcess()
+{
+  mozilla::Maybe<DWORD> parentPid = mozilla::nt::GetParentProcessId();
+  if (!parentPid) {
+    return mozilla::Nothing();
+  }
+
+  nsAutoHandle parentProcess(::OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION,
+                                           FALSE, parentPid.value()));
+  if (!parentProcess.get()) {
+    return mozilla::Nothing();
+  }
+
+  WCHAR parentExe[MAX_PATH + 1] = {};
+  DWORD parentExeLen = mozilla::ArrayLength(parentExe);
+  if (!::QueryFullProcessImageNameW(parentProcess.get(), 0, parentExe,
+                                    &parentExeLen)) {
+    return mozilla::Nothing();
+  }
+
+  WCHAR ourExe[MAX_PATH + 1] = {};
+  DWORD ourExeOk = ::GetModuleFileNameW(nullptr, ourExe,
+                                        mozilla::ArrayLength(ourExe));
+  if (!ourExeOk || ourExeOk == mozilla::ArrayLength(ourExe)) {
+    return mozilla::Nothing();
+  }
+
+  bool isSame = parentExeLen == ourExeOk &&
+                !_wcsnicmp(ourExe, parentExe, ourExeOk);
+  return mozilla::Some(isSame);
+}
+
+#endif // defined(MOZ_LAUNCHER_PROCESS)
+
 namespace mozilla {
 
-// Eventually we want to be able to set a build config flag such that, when set,
-// this function will always return true.
 bool
 RunAsLauncherProcess(int& argc, wchar_t** argv)
 {
+#if defined(MOZ_LAUNCHER_PROCESS)
+  Maybe<bool> isChildOfFirefox = IsSameBinaryAsParentProcess();
+  if (!isChildOfFirefox) {
+    return true;
+  }
+
+  return !isChildOfFirefox.value();
+#else
   return CheckArg(argc, argv, L"launcher",
                   static_cast<const wchar_t**>(nullptr),
-                  CheckArgFlag::CheckOSInt | CheckArgFlag::RemoveArg);
+                  CheckArgFlag::CheckOSInt | CheckArgFlag::RemoveArg) == ARG_FOUND;
+#endif // defined(MOZ_LAUNCHER_PROCESS)
 }
 
 int
@@ -117,13 +183,20 @@ LauncherMain(int argc, wchar_t* argv[])
     return 1;
   }
 
-  // If we're elevated, we should relaunch ourselves as a normal user
-  Maybe<bool> isElevated = IsElevated();
-  if (!isElevated) {
+  LauncherFlags flags = ProcessCmdLine(argc, argv);
+
+  nsAutoHandle mediumIlToken;
+  Maybe<ElevationState> elevationState = GetElevationState(flags, mediumIlToken);
+  if (!elevationState) {
     return 1;
   }
 
-  if (isElevated.value()) {
+  // If we're elevated, we should relaunch ourselves as a normal user.
+  // Note that we only call LaunchUnelevated when we don't need to wait for the
+  // browser process.
+  if (elevationState.value() == ElevationState::eElevated &&
+      !(flags & (LauncherFlags::eWaitForBrowser | LauncherFlags::eNoDeelevate)) &&
+      !mediumIlToken.get()) {
     return !LaunchUnelevated(argc, argv);
   }
 
@@ -178,8 +251,20 @@ LauncherMain(int argc, wchar_t* argv[])
   }
 
   PROCESS_INFORMATION pi = {};
-  if (!::CreateProcessW(argv[0], cmdLine.get(), nullptr, nullptr, inheritHandles,
-                        creationFlags, nullptr, nullptr, &siex.StartupInfo, &pi)) {
+  BOOL createOk;
+
+  if (mediumIlToken.get()) {
+    createOk = ::CreateProcessAsUserW(mediumIlToken.get(), argv[0], cmdLine.get(),
+                                      nullptr, nullptr, inheritHandles,
+                                      creationFlags, nullptr, nullptr,
+                                      &siex.StartupInfo, &pi);
+  } else {
+    createOk = ::CreateProcessW(argv[0], cmdLine.get(), nullptr, nullptr,
+                                inheritHandles, creationFlags, nullptr, nullptr,
+                                &siex.StartupInfo, &pi);
+  }
+
+  if (!createOk) {
     ShowError();
     return 1;
   }
@@ -194,13 +279,22 @@ LauncherMain(int argc, wchar_t* argv[])
     return 1;
   }
 
-  const DWORD timeout = ::IsDebuggerPresent() ? INFINITE :
-                        kWaitForInputIdleTimeoutMS;
+  if (flags & LauncherFlags::eWaitForBrowser) {
+    DWORD exitCode;
+    if (::WaitForSingleObject(process.get(), INFINITE) == WAIT_OBJECT_0 &&
+        ::GetExitCodeProcess(process.get(), &exitCode)) {
+      // Propagate the browser process's exit code as our exit code.
+      return static_cast<int>(exitCode);
+    }
+  } else {
+    const DWORD timeout = ::IsDebuggerPresent() ? INFINITE :
+                          kWaitForInputIdleTimeoutMS;
 
-  // Keep the current process around until the callback process has created
-  // its message queue, to avoid the launched process's windows being forced
-  // into the background.
-  mozilla::WaitForInputIdle(process.get(), timeout);
+    // Keep the current process around until the callback process has created
+    // its message queue, to avoid the launched process's windows being forced
+    // into the background.
+    mozilla::WaitForInputIdle(process.get(), timeout);
+  }
 
   return 0;
 }
diff --git a/browser/app/winlauncher/LauncherProcessWin.h b/browser/app/winlauncher/LauncherProcessWin.h
index b198d30724f6..e904aa8b8a3b 100644
--- a/browser/app/winlauncher/LauncherProcessWin.h
+++ b/browser/app/winlauncher/LauncherProcessWin.h
@@ -7,11 +7,24 @@
 #ifndef mozilla_LauncherProcessWin_h
 #define mozilla_LauncherProcessWin_h
 
+#include "mozilla/TypedEnumBits.h"
+
+#include <stdint.h>
+
 namespace mozilla {
 
 bool RunAsLauncherProcess(int& argc, wchar_t* argv[]);
 int LauncherMain(int argc, wchar_t* argv[]);
 
+enum class LauncherFlags : uint32_t
+{
+  eNone = 0,
+  eWaitForBrowser = (1 << 0), // Launcher should block until browser finishes
+  eNoDeelevate = (1 << 1),    // If elevated, do not attempt to de-elevate
+};
+
+MOZ_MAKE_ENUM_CLASS_BITWISE_OPERATORS(LauncherFlags)
+
 } // namespace mozilla
 
 #endif // mozilla_LauncherProcessWin_h
diff --git a/browser/app/winlauncher/NativeNt.h b/browser/app/winlauncher/NativeNt.h
index 40c087110b96..4c56a90090e9 100644
--- a/browser/app/winlauncher/NativeNt.h
+++ b/browser/app/winlauncher/NativeNt.h
@@ -18,6 +18,7 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/Maybe.h"
 
 extern "C" {
 
@@ -449,8 +450,15 @@ private:
       return;
     }
 
+    DWORD imageSize = mPeHeader->OptionalHeader.SizeOfImage;
+    // This is a coarse-grained check to ensure that the image size is
+    // reasonable. It we aren't big enough to contain headers, we have a problem!
+    if (imageSize < sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS)) {
+      return;
+    }
+
     mImageLimit =
-      RVAToPtrUnchecked<void*>(mPeHeader->OptionalHeader.SizeOfImage - 1UL);
+      RVAToPtrUnchecked<void*>(imageSize - 1UL);
   }
 
   template <typename T>
@@ -511,8 +519,7 @@ private:
   GetFixedFileInfo(VS_VERSIONINFO_HEADER* aVerInfo)
   {
     WORD length = aVerInfo->wLength;
-    WORD offset = sizeof(VS_VERSIONINFO_HEADER);
-    if (!offset) {
+    if (length < sizeof(VS_VERSIONINFO_HEADER)) {
       return nullptr;
     }
 
@@ -523,12 +530,19 @@ private:
       return nullptr;
     }
 
+    if (aVerInfo->wValueLength != sizeof(VS_FIXEDFILEINFO)) {
+      // Fixed file info does not exist
+      return nullptr;
+    }
+
+    WORD offset = sizeof(VS_VERSIONINFO_HEADER);
+
     uintptr_t base = reinterpret_cast<uintptr_t>(aVerInfo);
     // Align up to 4-byte boundary
 #pragma warning(suppress: 4146)
     offset += (-(base + offset) & 3);
 
-    if (offset > length) {
+    if (offset >= length) {
       return nullptr;
     }
 
@@ -554,6 +568,32 @@ RtlGetProcessHeap()
   return peb->Reserved4[1];
 }
 
+inline Maybe<DWORD>
+GetParentProcessId()
+{
+  struct PROCESS_BASIC_INFORMATION
+  {
+    NTSTATUS ExitStatus;
+    PPEB PebBaseAddress;
+    ULONG_PTR AffinityMask;
+    LONG BasePriority;
+    ULONG_PTR UniqueProcessId;
+    ULONG_PTR InheritedFromUniqueProcessId;
+  };
+
+  ULONG returnLength;
+  PROCESS_BASIC_INFORMATION pbi = {};
+  NTSTATUS status = ::NtQueryInformationProcess(::GetCurrentProcess(),
+                                                ProcessBasicInformation,
+                                                &pbi, sizeof(pbi),
+                                                &returnLength);
+  if (!NT_SUCCESS(status)) {
+    return Nothing();
+  }
+
+  return Some(static_cast<DWORD>(pbi.InheritedFromUniqueProcessId & 0xFFFFFFFF));
+}
+
 } // namespace nt
 } // namespace mozilla
 
diff --git a/browser/components/places/tests/browser/browser_views_iconsupdate.js b/browser/components/places/tests/browser/browser_views_iconsupdate.js
index fb88dc02f892..57937773904b 100644
--- a/browser/components/places/tests/browser/browser_views_iconsupdate.js
+++ b/browser/components/places/tests/browser/browser_views_iconsupdate.js
@@ -108,12 +108,15 @@ async function getRectForSidebarItem(guid) {
   let sidebar = document.getElementById("sidebar");
   let tree = sidebar.contentDocument.getElementById("bookmarks-view");
   tree.selectItems([guid]);
-  let rect = {};
-  [rect.left, rect.top, rect.width, rect.height] = tree.treeBoxObject
-                                                       .selectionRegion
-                                                       .getRects();
-  // Adjust the position for the sidebar.
-  rect.left += sidebar.getBoundingClientRect().left;
-  rect.top += sidebar.getBoundingClientRect().top;
-  return rect;
+  let treerect = tree.getBoundingClientRect();
+  let cellrect = tree.treeBoxObject.
+                      getCoordsForCellItem(tree.currentIndex, tree.columns[0], "cell");
+
+  // Adjust the position for the tree and sidebar.
+  return {
+    left: treerect.left + cellrect.left + sidebar.getBoundingClientRect().left,
+    top: treerect.top + cellrect.top + sidebar.getBoundingClientRect().top,
+    width: cellrect.width,
+    height: cellrect.height
+  };
 }
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 3b564eb2043b..9cdbf7c859ed 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1267,6 +1267,7 @@ def pgo_flags(compiler, build_env, target):
               gen_cflags=['-fprofile-instr-generate'],
               gen_ldflags=['clang_rt.profile-x86_64.lib'],
               use_cflags=['-fprofile-instr-use=%s' % profdata,
+                          '-Wno-error=profile-instr-out-of-date',
                           '-Wno-error=profile-instr-unprofiled'],
               use_ldflags=[],
           )
diff --git a/build/unix/elfhack/elfhack.cpp b/build/unix/elfhack/elfhack.cpp
index 0eb660b70ad9..1d1177ee1633 100644
--- a/build/unix/elfhack/elfhack.cpp
+++ b/build/unix/elfhack/elfhack.cpp
@@ -1079,8 +1079,11 @@ int do_relocation_section(Elf *elf, unsigned int rel_type, unsigned int rel_type
     relhackcode->insertBefore(first_executable);
 
     // Don't try further if we can't gain from the relocation section size change.
+    // We account for the fact we're going to split the PT_LOAD before the injected
+    // code section, so the overhead of the page alignment for section needs to be
+    // accounted for.
     size_t align = first_executable->getSegmentByType(PT_LOAD)->getAlign();
-    size_t new_size = relhack->getSize() + relhackcode->getSize();
+    size_t new_size = relhack->getSize() + relhackcode->getSize() + (relhackcode->getAddr() & (align - 1));
     if (!force && (new_size >= old_size || old_size - new_size < align)) {
         fprintf(stderr, "No gain. Skipping\n");
         return -1;
diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index 16a43c1a7e20..f78068f02399 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -1632,6 +1632,146 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "-webkit-appearance": {
+    "isInherited": false,
+    "subproperties": [
+      "-moz-appearance"
+    ],
+    "supports": [],
+    "values": [
+      "-moz-gtk-info-bar",
+      "-moz-mac-active-source-list-selection",
+      "-moz-mac-disclosure-button-closed",
+      "-moz-mac-disclosure-button-open",
+      "-moz-mac-fullscreen-button",
+      "-moz-mac-help-button",
+      "-moz-mac-source-list",
+      "-moz-mac-source-list-selection",
+      "-moz-mac-vibrancy-dark",
+      "-moz-mac-vibrancy-light",
+      "-moz-mac-vibrant-titlebar-dark",
+      "-moz-mac-vibrant-titlebar-light",
+      "-moz-menulist-button",
+      "-moz-win-borderless-glass",
+      "-moz-win-browsertabbar-toolbox",
+      "-moz-win-communications-toolbox",
+      "-moz-win-exclude-glass",
+      "-moz-win-glass",
+      "-moz-win-media-toolbox",
+      "-moz-window-button-box",
+      "-moz-window-button-box-maximized",
+      "-moz-window-button-close",
+      "-moz-window-button-maximize",
+      "-moz-window-button-minimize",
+      "-moz-window-button-restore",
+      "-moz-window-frame-bottom",
+      "-moz-window-frame-left",
+      "-moz-window-frame-right",
+      "-moz-window-titlebar",
+      "-moz-window-titlebar-maximized",
+      "button",
+      "button-arrow-down",
+      "button-arrow-next",
+      "button-arrow-previous",
+      "button-arrow-up",
+      "button-bevel",
+      "button-focus",
+      "caret",
+      "checkbox",
+      "checkbox-container",
+      "checkbox-label",
+      "checkmenuitem",
+      "dialog",
+      "dualbutton",
+      "groupbox",
+      "inherit",
+      "initial",
+      "inner-spin-button",
+      "listbox",
+      "listitem",
+      "menuarrow",
+      "menubar",
+      "menucheckbox",
+      "menuimage",
+      "menuitem",
+      "menuitemtext",
+      "menulist",
+      "menulist-button",
+      "menulist-text",
+      "menulist-textfield",
+      "menupopup",
+      "menuradio",
+      "menuseparator",
+      "meterbar",
+      "meterchunk",
+      "none",
+      "number-input",
+      "progressbar",
+      "progressbar-vertical",
+      "progresschunk",
+      "progresschunk-vertical",
+      "radio",
+      "radio-container",
+      "radio-label",
+      "radiomenuitem",
+      "range",
+      "range-thumb",
+      "resizer",
+      "resizerpanel",
+      "scale-horizontal",
+      "scale-vertical",
+      "scalethumb-horizontal",
+      "scalethumb-vertical",
+      "scalethumbend",
+      "scalethumbstart",
+      "scalethumbtick",
+      "scrollbar",
+      "scrollbar-horizontal",
+      "scrollbar-small",
+      "scrollbar-vertical",
+      "scrollbarbutton-down",
+      "scrollbarbutton-left",
+      "scrollbarbutton-right",
+      "scrollbarbutton-up",
+      "scrollbarthumb-horizontal",
+      "scrollbarthumb-vertical",
+      "scrollbartrack-horizontal",
+      "scrollbartrack-vertical",
+      "scrollcorner",
+      "searchfield",
+      "separator",
+      "spinner",
+      "spinner-downbutton",
+      "spinner-textfield",
+      "spinner-upbutton",
+      "splitter",
+      "statusbar",
+      "statusbarpanel",
+      "tab",
+      "tab-scroll-arrow-back",
+      "tab-scroll-arrow-forward",
+      "tabpanel",
+      "tabpanels",
+      "textfield",
+      "textfield-multiline",
+      "toolbar",
+      "toolbarbutton",
+      "toolbarbutton-dropdown",
+      "toolbargripper",
+      "toolbox",
+      "tooltip",
+      "treeheader",
+      "treeheadercell",
+      "treeheadersortarrow",
+      "treeitem",
+      "treeline",
+      "treetwisty",
+      "treetwistyopen",
+      "treeview",
+      "unset",
+      "window"
+    ]
+  },
   "-webkit-backface-visibility": {
     "isInherited": false,
     "subproperties": [
diff --git a/devtools/shared/webconsole/test/test_bug819670_getter_throws.html b/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
index bbd1f76b3a13..ab1e3691be25 100644
--- a/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
+++ b/devtools/shared/webconsole/test/test_bug819670_getter_throws.html
@@ -51,7 +51,6 @@ function onInspect(aState, aResponse)
 
   let expectedProps = {
     "addBroadcastListenerFor": { value: { type: "object" } },
-    "commandDispatcher": { get: { type: "object" } },
   };
 
   let props = aResponse.ownProperties;
diff --git a/dom/base/UseCounters.conf b/dom/base/UseCounters.conf
index 8d495b39a69d..0ea2b9277c10 100644
--- a/dom/base/UseCounters.conf
+++ b/dom/base/UseCounters.conf
@@ -124,3 +124,5 @@ 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.
+
+custom FilteredCrossOriginIFrame cross-origin <iframe> within a CSS/SVG filter
diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
index 870c5f642ec5..3bd0206688e9 100644
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -259,6 +259,7 @@
 #include "mozilla/dom/MenuBoxObject.h"
 #include "mozilla/dom/TreeBoxObject.h"
 #include "nsIXULWindow.h"
+#include "nsXULCommandDispatcher.h"
 #include "nsXULPopupManager.h"
 #include "nsIDocShellTreeOwner.h"
 #endif
@@ -1924,6 +1925,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mApplets);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAnchors);
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAnonymousContents)
+  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCommandDispatcher)
 
   // Traverse all our nsCOMArrays.
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStyleSheets)
@@ -2014,6 +2016,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mOrientationPendingPromise)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mFontFaceSet)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mReadyForIdle);
+  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCommandDispatcher)
 
   tmp->mParentDocument = nullptr;
 
@@ -10149,6 +10152,20 @@ nsIDocument::MaybeResolveReadyForIdle()
   }
 }
 
+nsIDOMXULCommandDispatcher*
+nsIDocument::GetCommandDispatcher()
+{
+  // Only chrome documents are allowed to use command dispatcher.
+  if (!nsContentUtils::IsChromeDoc(this)) {
+    return nullptr;
+  }
+  if (!mCommandDispatcher) {
+    // Create our command dispatcher and hook it up.
+    mCommandDispatcher = new nsXULCommandDispatcher(this);
+  }
+  return mCommandDispatcher;
+}
+
 static JSObject*
 GetScopeObjectOfNode(nsINode* node)
 {
diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp
index 7bc1d6a02657..f30353d5b506 100644
--- a/dom/base/nsGlobalWindowOuter.cpp
+++ b/dom/base/nsGlobalWindowOuter.cpp
@@ -6267,8 +6267,8 @@ nsGlobalWindowOuter::UpdateCommands(const nsAString& anAction,
   }
 
   nsIDocument* doc = rootWindow->GetExtantDoc();
-  // See if we contain a XUL document.
-  if (!doc || !doc->IsXULDocument()) {
+
+  if (!doc) {
     return;
   }
   // selectionchange action is only used for mozbrowser, not for XUL. So we bypass
@@ -6276,7 +6276,7 @@ nsGlobalWindowOuter::UpdateCommands(const nsAString& anAction,
   if (!anAction.EqualsLiteral("selectionchange")) {
     // Retrieve the command dispatcher and call updateCommands on it.
     nsIDOMXULCommandDispatcher* xulCommandDispatcher =
-      doc->AsXULDocument()->GetCommandDispatcher();
+      doc->GetCommandDispatcher();
     if (xulCommandDispatcher) {
       nsContentUtils::AddScriptRunner(new CommandDispatcher(xulCommandDispatcher,
                                                             anAction));
diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h
index fe3b78c94fb6..a8167479f625 100644
--- a/dom/base/nsIDocument.h
+++ b/dom/base/nsIDocument.h
@@ -15,6 +15,7 @@
 #include "nsIApplicationCache.h"
 #include "nsIApplicationCacheContainer.h"
 #include "nsIContentViewer.h"
+#include "nsIDOMXULCommandDispatcher.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"                // for member (in nsCOMPtr)
@@ -3324,6 +3325,7 @@ public:
 
   mozilla::dom::Promise* GetDocumentReadyForIdle(mozilla::ErrorResult& aRv);
 
+  nsIDOMXULCommandDispatcher* GetCommandDispatcher();
   already_AddRefed<nsINode> GetPopupNode();
   void SetPopupNode(nsINode* aNode);
   nsINode* GetPopupRangeParent(ErrorResult& aRv);
@@ -4497,6 +4499,8 @@ protected:
 
   // Count of unload/beforeunload/pagehide operations in progress.
   uint32_t mIgnoreOpensDuringUnloadCounter;
+
+  nsCOMPtr<nsIDOMXULCommandDispatcher> mCommandDispatcher; // [OWNER] of the focus tracker
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIDocument, NS_IDOCUMENT_IID)
diff --git a/dom/base/nsImageLoadingContent.cpp b/dom/base/nsImageLoadingContent.cpp
index e7d43f8d59de..5ba7b0240f58 100644
--- a/dom/base/nsImageLoadingContent.cpp
+++ b/dom/base/nsImageLoadingContent.cpp
@@ -81,6 +81,15 @@ static void PrintReqURL(imgIRequest* req) {
 }
 #endif /* DEBUG_chb */
 
+const nsAttrValue::EnumTable nsImageLoadingContent::kDecodingTable[] = {
+  { "auto",   nsImageLoadingContent::ImageDecodingType::Auto },
+  { "async",  nsImageLoadingContent::ImageDecodingType::Async },
+  { "sync",   nsImageLoadingContent::ImageDecodingType::Sync },
+  { nullptr,  0 }
+};
+
+const nsAttrValue::EnumTable* nsImageLoadingContent::kDecodingTableDefault =
+  &nsImageLoadingContent::kDecodingTable[0];
 
 nsImageLoadingContent::nsImageLoadingContent()
   : mCurrentRequestFlags(0),
@@ -99,7 +108,8 @@ nsImageLoadingContent::nsImageLoadingContent()
     mStateChangerDepth(0),
     mCurrentRequestRegistered(false),
     mPendingRequestRegistered(false),
-    mIsStartingImageLoad(false)
+    mIsStartingImageLoad(false),
+    mSyncDecodingHint(false)
 {
   if (!nsContentUtils::GetImgLoaderForChannel(nullptr, nullptr)) {
     mLoadingEnabled = false;
@@ -335,6 +345,50 @@ nsImageLoadingContent::SetLoadingEnabled(bool aLoadingEnabled)
   }
 }
 
+void
+nsImageLoadingContent::SetSyncDecodingHint(bool aHint)
+{
+  if (mSyncDecodingHint == aHint) {
+    return;
+  }
+
+  mSyncDecodingHint = aHint;
+  MaybeForceSyncDecoding(/* aPrepareNextRequest */ false);
+}
+
+void
+nsImageLoadingContent::MaybeForceSyncDecoding(bool aPrepareNextRequest,
+                                              nsIFrame* aFrame /* = nullptr */)
+{
+  nsIFrame* frame = aFrame ? aFrame : GetOurPrimaryFrame();
+  nsImageFrame* imageFrame = do_QueryFrame(frame);
+  nsSVGImageFrame* svgImageFrame = do_QueryFrame(frame);
+  if (!imageFrame && !svgImageFrame) {
+    return;
+  }
+
+  bool forceSync = mSyncDecodingHint;
+  if (!forceSync && aPrepareNextRequest) {
+    // Detect JavaScript-based animations created by changing the |src|
+    // attribute on a timer.
+    TimeStamp now = TimeStamp::Now();
+    TimeDuration threshold =
+      TimeDuration::FromMilliseconds(
+        gfxPrefs::ImageInferSrcAnimationThresholdMS());
+
+    // If the length of time between request changes is less than the threshold,
+    // then force sync decoding to eliminate flicker from the animation.
+    forceSync = (now - mMostRecentRequestChange < threshold);
+    mMostRecentRequestChange = now;
+  }
+
+  if (imageFrame) {
+    imageFrame->SetForceSyncDecoding(forceSync);
+  } else {
+    svgImageFrame->SetForceSyncDecoding(forceSync);
+  }
+}
+
 NS_IMETHODIMP
 nsImageLoadingContent::GetImageBlockingStatus(int16_t* aStatus)
 {
@@ -629,6 +683,7 @@ nsImageLoadingContent::FrameCreated(nsIFrame* aFrame)
 {
   NS_ASSERTION(aFrame, "aFrame is null");
 
+  MaybeForceSyncDecoding(/* aPrepareNextRequest */ false, aFrame);
   TrackImage(mCurrentRequest, aFrame);
   TrackImage(mPendingRequest, aFrame);
 
@@ -1263,27 +1318,7 @@ nsImageLoadingContent::CancelPendingEvent()
 RefPtr<imgRequestProxy>&
 nsImageLoadingContent::PrepareNextRequest(ImageLoadType aImageLoadType)
 {
-  nsImageFrame* imageFrame = do_QueryFrame(GetOurPrimaryFrame());
-  nsSVGImageFrame* svgImageFrame = do_QueryFrame(GetOurPrimaryFrame());
-  if (imageFrame || svgImageFrame) {
-    // Detect JavaScript-based animations created by changing the |src|
-    // attribute on a timer.
-    TimeStamp now = TimeStamp::Now();
-    TimeDuration threshold =
-      TimeDuration::FromMilliseconds(
-        gfxPrefs::ImageInferSrcAnimationThresholdMS());
-
-    // If the length of time between request changes is less than the threshold,
-    // then force sync decoding to eliminate flicker from the animation.
-    bool forceSync = (now - mMostRecentRequestChange < threshold);
-    if (imageFrame) {
-      imageFrame->SetForceSyncDecoding(forceSync);
-    } else {
-      svgImageFrame->SetForceSyncDecoding(forceSync);
-    }
-
-    mMostRecentRequestChange = now;
-  }
+  MaybeForceSyncDecoding(/* aPrepareNextRequest */ true);
 
   // We only want to cancel the existing current request if size is not
   // available. bz says the web depends on this behavior.
diff --git a/dom/base/nsImageLoadingContent.h b/dom/base/nsImageLoadingContent.h
index 42b0002ba93a..44ce26de2630 100644
--- a/dom/base/nsImageLoadingContent.h
+++ b/dom/base/nsImageLoadingContent.h
@@ -24,6 +24,7 @@
 #include "nsIContentPolicy.h"
 #include "mozilla/dom/BindingDeclarations.h"
 #include "mozilla/net/ReferrerPolicy.h"
+#include "nsAttrValue.h"
 
 class nsIURI;
 class nsIDocument;
@@ -80,6 +81,11 @@ public:
 
   mozilla::dom::Element* FindImageMap();
 
+  /**
+   * Toggle whether or not to synchronously decode an image on draw.
+   */
+  void SetSyncDecodingHint(bool aHint);
+
 protected:
   enum ImageLoadType {
     // Most normal image loads
@@ -228,6 +234,15 @@ protected:
   // want a non-const nsIContent.
   virtual nsIContent* AsContent() = 0;
 
+  enum class ImageDecodingType : uint8_t {
+    Auto,
+    Async,
+    Sync,
+  };
+
+  static const nsAttrValue::EnumTable kDecodingTable[];
+  static const nsAttrValue::EnumTable* kDecodingTableDefault;
+
 private:
   /**
    * Struct used to manage the native image observers.
@@ -443,6 +458,19 @@ private:
    */
   void MakePendingScriptedRequestsCurrent();
 
+  /**
+   * Depending on the configured decoding hint, and/or how recently we updated
+   * the image request, force or stop the frame from decoding the image
+   * synchronously when it is drawn.
+   * @param aPrepareNextRequest True if this is when updating the image request.
+   * @param aFrame If called from FrameCreated the frame passed to FrameCreated.
+   *               This is our frame, but at the time of the FrameCreated call
+   *               our primary frame pointer hasn't been set yet, so this is
+   *               only way to get our frame.
+   */
+  void MaybeForceSyncDecoding(bool aPrepareNextRequest,
+                              nsIFrame* aFrame = nullptr);
+
   /**
    * Typically we will have only one observer (our frame in the screen
    * prescontext), so we want to only make space for one and to
@@ -522,6 +550,9 @@ private:
   //
   // Also we use this variable to check if some evil code is reentering LoadImage.
   bool mIsStartingImageLoad;
+
+  // If true, force frames to synchronously decode images on draw.
+  bool mSyncDecodingHint;
 };
 
 #endif // nsImageLoadingContent_h__
diff --git a/dom/base/nsJSUtils.cpp b/dom/base/nsJSUtils.cpp
index fb5552c0d961..b408c0a7dc94 100644
--- a/dom/base/nsJSUtils.cpp
+++ b/dom/base/nsJSUtils.cpp
@@ -473,7 +473,7 @@ nsJSUtils::CompileModule(JSContext* aCx,
                        JS::SourceBufferHolder& aSrcBuf,
                        JS::Handle<JSObject*> aEvaluationGlobal,
                        JS::CompileOptions &aCompileOptions,
-                       JS::MutableHandle<JSObject*> aModule)
+                       JS::MutableHandle<JSScript*> aScript)
 {
   AUTO_PROFILER_LABEL("nsJSUtils::CompileModule", JS);
 
@@ -487,7 +487,7 @@ nsJSUtils::CompileModule(JSContext* aCx,
 
   NS_ENSURE_TRUE(xpc::Scriptability::Get(aEvaluationGlobal).Allowed(), NS_OK);
 
-  if (!JS::CompileModule(aCx, aCompileOptions, aSrcBuf, aModule)) {
+  if (!JS::CompileModule(aCx, aCompileOptions, aSrcBuf, aScript)) {
     return NS_ERROR_FAILURE;
   }
 
@@ -496,7 +496,7 @@ nsJSUtils::CompileModule(JSContext* aCx,
 
 nsresult
 nsJSUtils::InitModuleSourceElement(JSContext* aCx,
-                                   JS::Handle<JSObject*> aModule,
+                                   JS::Handle<JSScript*> aScript,
                                    nsIScriptElement* aElement)
 {
   JS::Rooted<JS::Value> value(aCx);
@@ -509,8 +509,7 @@ nsJSUtils::InitModuleSourceElement(JSContext* aCx,
   MOZ_ASSERT(value.isObject());
   JS::Rooted<JSObject*> object(aCx, &value.toObject());
 
-  JS::Rooted<JSScript*> script(aCx, JS::GetModuleScript(aModule));
-  if (!JS::InitScriptSourceElement(aCx, script, object, nullptr)) {
+  if (!JS::InitScriptSourceElement(aCx, aScript, object, nullptr)) {
     return NS_ERROR_FAILURE;
   }
 
@@ -518,7 +517,7 @@ nsJSUtils::InitModuleSourceElement(JSContext* aCx,
 }
 
 nsresult
-nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSObject*> aModule)
+nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSScript*> aScript)
 {
   AUTO_PROFILER_LABEL("nsJSUtils::ModuleInstantiate", JS);
 
@@ -527,9 +526,9 @@ nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSObject*> aModule)
   MOZ_ASSERT(CycleCollectedJSContext::Get() &&
              CycleCollectedJSContext::Get()->MicroTaskLevel());
 
-  NS_ENSURE_TRUE(xpc::Scriptability::Get(aModule).Allowed(), NS_OK);
+  NS_ENSURE_TRUE(xpc::Scriptability::Get(aScript).Allowed(), NS_OK);
 
-  if (!JS::ModuleInstantiate(aCx, aModule)) {
+  if (!JS::ModuleInstantiate(aCx, aScript)) {
     return NS_ERROR_FAILURE;
   }
 
@@ -537,7 +536,7 @@ nsJSUtils::ModuleInstantiate(JSContext* aCx, JS::Handle<JSObject*> aModule)
 }
 
 nsresult
-nsJSUtils::ModuleEvaluate(JSContext* aCx, JS::Handle<JSObject*> aModule)
+nsJSUtils::ModuleEvaluate(JSContext* aCx, JS::Handle<JSScript*> aScript)
 {
   AUTO_PROFILER_LABEL("nsJSUtils::ModuleEvaluate", JS);
 
@@ -546,9 +545,9 @@ nsJSUtils::ModuleEvaluate(JSContext* aCx, JS::Handle<JSObject*> aModule)
   MOZ_ASSERT(CycleCollectedJSContext::Get() &&
              CycleCollectedJSContext::Get()->MicroTaskLevel());
 
-  NS_ENSURE_TRUE(xpc::Scriptability::Get(aModule).Allowed(), NS_OK);
+  NS_ENSURE_TRUE(xpc::Scriptability::Get(aScript).Allowed(), NS_OK);
 
-  if (!JS::ModuleEvaluate(aCx, aModule)) {
+  if (!JS::ModuleEvaluate(aCx, aScript)) {
     return NS_ERROR_FAILURE;
   }
 
diff --git a/dom/base/nsJSUtils.h b/dom/base/nsJSUtils.h
index a4b4cb4a87de..6de2bc6ac7dc 100644
--- a/dom/base/nsJSUtils.h
+++ b/dom/base/nsJSUtils.h
@@ -189,17 +189,17 @@ public:
                                 JS::SourceBufferHolder& aSrcBuf,
                                 JS::Handle<JSObject*> aEvaluationGlobal,
                                 JS::CompileOptions &aCompileOptions,
-                                JS::MutableHandle<JSObject*> aModule);
+                                JS::MutableHandle<JSScript*> aScript);
 
   static nsresult InitModuleSourceElement(JSContext* aCx,
-                                          JS::Handle<JSObject*> aModule,
+                                          JS::Handle<JSScript*> aScript,
                                           nsIScriptElement* aElement);
 
   static nsresult ModuleInstantiate(JSContext* aCx,
-                                    JS::Handle<JSObject*> aModule);
+                                    JS::Handle<JSScript*> aScript);
 
   static nsresult ModuleEvaluate(JSContext* aCx,
-                                 JS::Handle<JSObject*> aModule);
+                                 JS::Handle<JSScript*> aScript);
 
   // Returns false if an exception got thrown on aCx.  Passing a null
   // aElement is allowed; that wil produce an empty aScopeChain.
diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h
index cf47fe0afa8f..d10714e5a2c0 100644
--- a/dom/bindings/BindingUtils.h
+++ b/dom/bindings/BindingUtils.h
@@ -1721,7 +1721,9 @@ FindAssociatedGlobal(JSContext* cx, nsIGlobalObject* const& p)
 
   JSObject* global = p->GetGlobalJSObject();
   if (!global) {
-    return nullptr;
+    // nsIGlobalObject doesn't have a JS object anymore,
+    // fallback to the current global.
+    return JS::CurrentGlobalOrNull(cx);
   }
 
   MOZ_ASSERT(JS_IsGlobalObject(global));
diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 77a56643b16b..2c7641ee3f97 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1860,7 +1860,6 @@ addExternalIface('nsIWebBrowserPersistDocumentReceiver',
                  notflattened=True)
 addExternalIface('nsIWebProgressListener', nativeType='nsIWebProgressListener',
                  notflattened=True)
-addExternalIface('nsIScriptableRegion', nativeType='nsIScriptableRegion', notflattened=True)
 addExternalIface('OutputStream', nativeType='nsIOutputStream',
                  notflattened=True)
 addExternalIface('Principal', nativeType='nsIPrincipal',
diff --git a/dom/encoding/TextDecoder.cpp b/dom/encoding/TextDecoder.cpp
index c7d43988bf01..396b77cd0fd1 100644
--- a/dom/encoding/TextDecoder.cpp
+++ b/dom/encoding/TextDecoder.cpp
@@ -15,7 +15,8 @@ namespace mozilla {
 namespace dom {
 
 void
-TextDecoder::Init(const nsAString& aLabel, const bool aFatal,
+TextDecoder::Init(const nsAString& aLabel,
+                  const TextDecoderOptions& aOptions,
                   ErrorResult& aRv)
 {
   // Let encoding be the result of getting an encoding from label.
@@ -28,21 +29,24 @@ TextDecoder::Init(const nsAString& aLabel, const bool aFatal,
     aRv.ThrowRangeError<MSG_ENCODING_NOT_SUPPORTED>(label);
     return;
   }
-  InitWithEncoding(WrapNotNull(encoding), aFatal);
+  InitWithEncoding(WrapNotNull(encoding), aOptions);
 }
 
 void
 TextDecoder::InitWithEncoding(NotNull<const Encoding*> aEncoding,
-                              const bool aFatal)
+                              const TextDecoderOptions& aOptions)
 {
   aEncoding->Name(mEncoding);
-  // If the constructor is called with an options argument,
-  // and the fatal property of the dictionary is set,
-  // set the internal fatal flag of the decoder object.
-  mFatal = aFatal;
+  // Store the flags passed via our options dictionary.
+  mFatal = aOptions.mFatal;
+  mIgnoreBOM = aOptions.mIgnoreBOM;
 
   // Create a decoder object for mEncoding.
-  mDecoder = aEncoding->NewDecoderWithBOMRemoval();
+  if (mIgnoreBOM) {
+    mDecoder = aEncoding->NewDecoderWithoutBOMHandling();
+  } else {
+    mDecoder = aEncoding->NewDecoderWithBOMRemoval();
+  }
 }
 
 void
diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h
index ead71cfafadd..3ab8514d3c65 100644
--- a/dom/encoding/TextDecoder.h
+++ b/dom/encoding/TextDecoder.h
@@ -33,7 +33,7 @@ public:
               ErrorResult& aRv)
   {
     nsAutoPtr<TextDecoder> txtDecoder(new TextDecoder());
-    txtDecoder->Init(aEncoding, aOptions.mFatal, aRv);
+    txtDecoder->Init(aEncoding, aOptions, aRv);
     if (aRv.Failed()) {
       return nullptr;
     }
@@ -42,6 +42,7 @@ public:
 
   TextDecoder()
     : mFatal(false)
+    , mIgnoreBOM(false)
   {
     MOZ_COUNT_CTOR(TextDecoder);
   }
@@ -60,22 +61,21 @@ public:
    * Validates provided label and throws an exception if invalid label.
    *
    * @param aLabel       The encoding label (case insensitive) provided.
-   * @param aFatal       indicates whether to throw an 'EncodingError'
-   *                     exception or not when decoding.
+   * @param aOptions     The TextDecoderOptions to use.
    * @return aRv         EncodingError exception else null.
    */
-  void Init(const nsAString& aLabel, const bool aFatal, ErrorResult& aRv);
+  void Init(const nsAString& aLabel, const TextDecoderOptions& aOptions,
+            ErrorResult& aRv);
 
   /**
    * Performs initialization with a Gecko-canonical encoding name (as opposed
    * to a label.)
    *
    * @param aEncoding    An Encoding object
-   * @param aFatal       indicates whether to throw an 'EncodingError'
-   *                     exception or not when decoding.
+   * @param aOptions     The TextDecoderOptions to use.
    */
   void InitWithEncoding(NotNull<const Encoding*> aEncoding,
-                        const bool aFatal);
+                        const TextDecoderOptions& aOptions);
 
   /**
    * Return the encoding name.
@@ -114,10 +114,15 @@ public:
     return mFatal;
   }
 
+  bool IgnoreBOM() const {
+    return mIgnoreBOM;
+  }
+
 private:
   nsCString mEncoding;
   mozilla::UniquePtr<mozilla::Decoder> mDecoder;
   bool mFatal;
+  bool mIgnoreBOM;
 };
 
 } // namespace dom
diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
index 27887f1f212a..58feef4dad20 100644
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -2139,29 +2139,9 @@ EventStateManager::DoDefaultDragStart(nsPresContext* aPresContext,
                                                 action, event, dataTransfer);
   }
   else {
-    // if dragging within a XUL tree and no custom drag image was
-    // set, the region argument to InvokeDragSessionWithImage needs
-    // to be set to the area encompassing the selected rows of the
-    // tree to ensure that the drag feedback gets clipped to those
-    // rows. For other content, region should be null.
-    nsCOMPtr<nsIScriptableRegion> region;
-#ifdef MOZ_XUL
-    if (dragTarget && !dragImage) {
-      if (dragTarget->NodeInfo()->Equals(nsGkAtoms::treechildren,
-                                         kNameSpaceID_XUL)) {
-        nsTreeBodyFrame* treeBody =
-          do_QueryFrame(dragTarget->GetPrimaryFrame());
-        if (treeBody) {
-          treeBody->GetSelectionRegion(getter_AddRefs(region));
-        }
-      }
-    }
-#endif
-
     dragService->InvokeDragSessionWithImage(dragTarget,
                                             aPrincipalURISpec, transArray,
-                                            region, action,
-                                            dragImage,
+                                            action, dragImage,
                                             imageX, imageY, event,
                                             dataTransfer);
   }
diff --git a/dom/html/HTMLImageElement.cpp b/dom/html/HTMLImageElement.cpp
index 3884443215d8..5dd41297c8bb 100644
--- a/dom/html/HTMLImageElement.cpp
+++ b/dom/html/HTMLImageElement.cpp
@@ -222,6 +222,12 @@ HTMLImageElement::Y()
   return GetXY().y;
 }
 
+void
+HTMLImageElement::GetDecoding(nsAString& aValue)
+{
+  GetEnumAttr(nsGkAtoms::decoding, kDecodingTableDefault->tag, aValue);
+}
+
 bool
 HTMLImageElement::ParseAttribute(int32_t aNamespaceID,
                                  nsAtom* aAttribute,
@@ -237,6 +243,10 @@ HTMLImageElement::ParseAttribute(int32_t aNamespaceID,
       ParseCORSValue(aValue, aResult);
       return true;
     }
+    if (aAttribute == nsGkAtoms::decoding) {
+      return aResult.ParseEnumValue(aValue, kDecodingTable, false,
+                                    kDecodingTableDefault);
+    }
     if (ParseImageAttribute(aAttribute, aValue, aResult)) {
       return true;
     }
@@ -378,6 +388,12 @@ HTMLImageElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
     mUseUrgentStartForChannel = EventStateManager::IsHandlingUserInput();
 
     PictureSourceSizesChanged(this, attrVal.String(), aNotify);
+  } else if (aName == nsGkAtoms::decoding &&
+             aNameSpaceID == kNameSpaceID_None) {
+    // Request sync or async image decoding.
+    SetSyncDecodingHint(aValue &&
+                        static_cast<ImageDecodingType>(aValue->GetEnumValue()) ==
+                          ImageDecodingType::Sync);
   }
 
   return nsGenericHTMLElement::AfterSetAttr(aNameSpaceID, aName,
diff --git a/dom/html/HTMLImageElement.h b/dom/html/HTMLImageElement.h
index 8acdcb80f77e..5bca5eeb70de 100644
--- a/dom/html/HTMLImageElement.h
+++ b/dom/html/HTMLImageElement.h
@@ -232,6 +232,11 @@ public:
   {
     GetEnumAttr(nsGkAtoms::referrerpolicy, EmptyCString().get(), aReferrer);
   }
+  void SetDecoding(const nsAString& aDecoding, ErrorResult& aError)
+  {
+    SetHTMLAttr(nsGkAtoms::decoding, aDecoding, aError);
+  }
+  void GetDecoding(nsAString& aValue);
 
   net::ReferrerPolicy
   GetImageReferrerPolicy() override
diff --git a/dom/indexedDB/ActorsChild.cpp b/dom/indexedDB/ActorsChild.cpp
index d838a477c8e5..98edffbac26b 100644
--- a/dom/indexedDB/ActorsChild.cpp
+++ b/dom/indexedDB/ActorsChild.cpp
@@ -675,22 +675,19 @@ DeserializeStructuredCloneFiles(
           break;
         }
 
-        case StructuredCloneFile::eWasmBytecode:
-        case StructuredCloneFile::eWasmCompiled: {
+        case StructuredCloneFile::eWasmBytecode: {
           if (aModuleSet) {
             MOZ_ASSERT(blobOrMutableFile.type() == BlobOrMutableFile::Tnull_t);
 
             StructuredCloneFile* file = aFiles.AppendElement();
             MOZ_ASSERT(file);
 
-            file->mType = serializedFile.type();
+            file->mType = StructuredCloneFile::eWasmBytecode;
 
             MOZ_ASSERT(moduleIndex < aModuleSet->Length());
             file->mWasmModule = aModuleSet->ElementAt(moduleIndex);
 
-            if (serializedFile.type() == StructuredCloneFile::eWasmCompiled) {
-              moduleIndex++;
-            }
+            moduleIndex++;
 
             break;
           }
@@ -707,12 +704,21 @@ DeserializeStructuredCloneFiles(
           StructuredCloneFile* file = aFiles.AppendElement();
           MOZ_ASSERT(file);
 
-          file->mType = serializedFile.type();
+          file->mType = StructuredCloneFile::eWasmBytecode;
           file->mBlob.swap(blob);
 
           break;
         }
 
+        case StructuredCloneFile::eWasmCompiled: {
+          StructuredCloneFile* file = aFiles.AppendElement();
+          MOZ_ASSERT(file);
+
+          file->mType = StructuredCloneFile::eWasmCompiled;
+
+          break;
+        }
+
         default:
           MOZ_CRASH("Should never get here!");
       }
@@ -1481,17 +1487,13 @@ class BackgroundRequestChild::PreprocessHelper final
   , public nsIInputStreamCallback
   , public nsIFileMetadataCallback
 {
-  typedef std::pair<nsCOMPtr<nsIInputStream>,
-                    nsCOMPtr<nsIInputStream>> StreamPair;
-
   nsCOMPtr<nsIEventTarget> mOwningEventTarget;
-  nsTArray<StreamPair> mStreamPairs;
+  nsTArray<nsCOMPtr<nsIInputStream>> mStreams;
   nsTArray<RefPtr<JS::WasmModule>> mModuleSet;
   BackgroundRequestChild* mActor;
 
-  // These 2 are populated when the processing of the stream pairs runs.
+  // This is populated when the processing of the stream runs.
   PRFileDesc* mCurrentBytecodeFileDesc;
-  PRFileDesc* mCurrentCompiledFileDesc;
 
   RefPtr<TaskQueue> mTaskQueue;
   nsCOMPtr<nsIEventTarget> mTaskQueueEventTarget;
@@ -1505,7 +1507,6 @@ public:
     , mOwningEventTarget(aActor->GetActorEventTarget())
     , mActor(aActor)
     , mCurrentBytecodeFileDesc(nullptr)
-    , mCurrentCompiledFileDesc(nullptr)
     , mModuleSetIndex(aModuleSetIndex)
     , mResultCode(NS_OK)
   {
@@ -1555,7 +1556,7 @@ private:
   RunOnOwningThread();
 
   void
-  ProcessCurrentStreamPair();
+  ProcessCurrentStream();
 
   nsresult
   WaitForStreamReady(nsIInputStream* aInputStream);
@@ -3387,26 +3388,12 @@ PreprocessHelper::Init(const nsTArray<StructuredCloneFile>& aFiles)
   AssertIsOnOwningThread();
   MOZ_ASSERT(!aFiles.IsEmpty());
 
-  uint32_t count = aFiles.Length();
-
-  // We should receive even number of files.
-  MOZ_ASSERT(count % 2 == 0);
-
-  // Let's process it as pairs.
-  count = count / 2;
-
-  nsTArray<StreamPair> streamPairs;
-  for (uint32_t index = 0; index < count; index++) {
-    uint32_t bytecodeIndex = index * 2;
-    uint32_t compiledIndex = bytecodeIndex + 1;
-
-    const StructuredCloneFile& bytecodeFile = aFiles[bytecodeIndex];
-    const StructuredCloneFile& compiledFile = aFiles[compiledIndex];
+  nsTArray<nsCOMPtr<nsIInputStream>> streams;
+  for (uint32_t index = 0; index < aFiles.Length(); index++) {
+    const StructuredCloneFile& bytecodeFile = aFiles[index];
 
     MOZ_ASSERT(bytecodeFile.mType == StructuredCloneFile::eWasmBytecode);
     MOZ_ASSERT(bytecodeFile.mBlob);
-    MOZ_ASSERT(compiledFile.mType == StructuredCloneFile::eWasmCompiled);
-    MOZ_ASSERT(compiledFile.mBlob);
 
     ErrorResult errorResult;
 
@@ -3417,17 +3404,10 @@ PreprocessHelper::Init(const nsTArray<StructuredCloneFile>& aFiles)
       return errorResult.StealNSResult();
     }
 
-    nsCOMPtr<nsIInputStream> compiledStream;
-    compiledFile.mBlob->CreateInputStream(getter_AddRefs(compiledStream),
-                                          errorResult);
-    if (NS_WARN_IF(errorResult.Failed())) {
-      return errorResult.StealNSResult();
-    }
-
-    streamPairs.AppendElement(StreamPair(bytecodeStream, compiledStream));
+    streams.AppendElement(bytecodeStream);
   }
 
-  mStreamPairs = std::move(streamPairs);
+  mStreams = std::move(streams);
 
   return NS_OK;
 }
@@ -3480,23 +3460,19 @@ PreprocessHelper::RunOnOwningThread()
 
 void
 BackgroundRequestChild::
-PreprocessHelper::ProcessCurrentStreamPair()
+PreprocessHelper::ProcessCurrentStream()
 {
   MOZ_ASSERT(!IsOnOwningThread());
-  MOZ_ASSERT(!mStreamPairs.IsEmpty());
-
-  nsresult rv;
-
-  const StreamPair& streamPair = mStreamPairs[0];
+  MOZ_ASSERT(!mStreams.IsEmpty());
 
   // We still don't have the current bytecode FileDesc.
   if (!mCurrentBytecodeFileDesc) {
-    const nsCOMPtr<nsIInputStream>& bytecodeStream = streamPair.first;
+    const nsCOMPtr<nsIInputStream>& bytecodeStream = mStreams[0];
     MOZ_ASSERT(bytecodeStream);
 
     mCurrentBytecodeFileDesc = GetFileDescriptorFromStream(bytecodeStream);
     if (!mCurrentBytecodeFileDesc) {
-      rv = WaitForStreamReady(bytecodeStream);
+      nsresult rv = WaitForStreamReady(bytecodeStream);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         ContinueWithStatus(rv);
       }
@@ -3504,21 +3480,7 @@ PreprocessHelper::ProcessCurrentStreamPair()
     }
   }
 
-  if (!mCurrentCompiledFileDesc) {
-    const nsCOMPtr<nsIInputStream>& compiledStream = streamPair.second;
-    MOZ_ASSERT(compiledStream);
-
-    mCurrentCompiledFileDesc = GetFileDescriptorFromStream(compiledStream);
-    if (!mCurrentCompiledFileDesc) {
-      rv = WaitForStreamReady(compiledStream);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        ContinueWithStatus(rv);
-      }
-      return;
-    }
-  }
-
-  MOZ_ASSERT(mCurrentBytecodeFileDesc && mCurrentCompiledFileDesc);
+  MOZ_ASSERT(mCurrentBytecodeFileDesc);
 
   JS::BuildIdCharVector buildId;
   bool ok = GetBuildId(&buildId);
@@ -3529,7 +3491,6 @@ PreprocessHelper::ProcessCurrentStreamPair()
 
   RefPtr<JS::WasmModule> module =
     JS::DeserializeWasmModule(mCurrentBytecodeFileDesc,
-                              mCurrentCompiledFileDesc,
                               std::move(buildId),
                               nullptr,
                               0);
@@ -3539,7 +3500,7 @@ PreprocessHelper::ProcessCurrentStreamPair()
   }
 
   mModuleSet.AppendElement(module);
-  mStreamPairs.RemoveElementAt(0);
+  mStreams.RemoveElementAt(0);
 
   ContinueWithStatus(NS_OK);
 }
@@ -3584,18 +3545,17 @@ PreprocessHelper::ContinueWithStatus(nsresult aStatus)
 
   // Let's reset the value for the next operation.
   mCurrentBytecodeFileDesc = nullptr;
-  mCurrentCompiledFileDesc = nullptr;
 
   nsCOMPtr<nsIEventTarget> eventTarget;
 
   if (NS_WARN_IF(NS_FAILED(aStatus))) {
     // If the previous operation failed, we don't continue the processing of the
-    // other stream pairs.
+    // other streams.
     MOZ_ASSERT(mResultCode == NS_OK);
     mResultCode = aStatus;
 
     eventTarget = mOwningEventTarget;
-  } else if (mStreamPairs.IsEmpty()) {
+  } else if (mStreams.IsEmpty()) {
     // If all the streams have been processed, we can go back to the owning
     // thread.
     eventTarget = mOwningEventTarget;
@@ -3619,7 +3579,7 @@ PreprocessHelper::Run()
   if (IsOnOwningThread()) {
     RunOnOwningThread();
   } else {
-    ProcessCurrentStreamPair();
+    ProcessCurrentStream();
   }
 
   return NS_OK;
@@ -3648,7 +3608,7 @@ PreprocessHelper::DataIsReady(nsIInputStream* aStream)
 {
   MOZ_ASSERT(!IsOnOwningThread());
   MOZ_ASSERT(aStream);
-  MOZ_ASSERT(!mStreamPairs.IsEmpty());
+  MOZ_ASSERT(!mStreams.IsEmpty());
 
   // We still don't have the current bytecode FileDesc.
   if (!mCurrentBytecodeFileDesc) {
@@ -3658,20 +3618,8 @@ PreprocessHelper::DataIsReady(nsIInputStream* aStream)
       return NS_OK;
     }
 
-    // Let's continue with the processing of the current pair.
-    ProcessCurrentStreamPair();
-    return NS_OK;
-  }
-
-  if (!mCurrentCompiledFileDesc) {
-    mCurrentCompiledFileDesc = GetFileDescriptorFromStream(aStream);
-    if (!mCurrentCompiledFileDesc) {
-      ContinueWithStatus(NS_ERROR_FAILURE);
-      return NS_OK;
-    }
-
-    // Let's continue with the processing of the current pair.
-    ProcessCurrentStreamPair();
+    // Let's continue with the processing of the current stream.
+    ProcessCurrentStream();
     return NS_OK;
   }
 
diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
index 381bc3b9d9e8..b1f2407dccec 100644
--- a/dom/indexedDB/ActorsParent.cpp
+++ b/dom/indexedDB/ActorsParent.cpp
@@ -9633,9 +9633,6 @@ public:
   already_AddRefed<nsIFile>
   GetFile(FileInfo* aFileInfo);
 
-  already_AddRefed<nsIFile>
-  GetCheckedFile(FileInfo* aFileInfo);
-
   already_AddRefed<nsIFile>
   GetJournalFile(FileInfo* aFileInfo);
 
@@ -9645,18 +9642,10 @@ public:
                        nsIInputStream* aInputStream,
                        bool aCompress);
 
-  nsresult
-  ReplaceFile(nsIFile* aFile,
-              nsIFile* aNewFile,
-              nsIFile* aNewJournalFile);
-
   nsresult
   RemoveFile(nsIFile* aFile,
              nsIFile* aJournalFile);
 
-  already_AddRefed<FileInfo>
-  GetNewFileInfo();
-
 private:
   nsresult
   SyncCopy(nsIInputStream* aInputStream,
@@ -9735,136 +9724,6 @@ DeserializeStructuredCloneFile(FileManager* aFileManager,
   return NS_OK;
 }
 
-nsresult
-CheckWasmModule(FileHelper* aFileHelper,
-                StructuredCloneFile* aBytecodeFile,
-                StructuredCloneFile* aCompiledFile)
-{
-  MOZ_ASSERT(!IsOnBackgroundThread());
-  MOZ_ASSERT(aFileHelper);
-  MOZ_ASSERT(aBytecodeFile);
-  MOZ_ASSERT(aCompiledFile);
-  MOZ_ASSERT(aBytecodeFile->mType == StructuredCloneFile::eWasmBytecode);
-  MOZ_ASSERT(aCompiledFile->mType == StructuredCloneFile::eWasmCompiled);
-
-  nsCOMPtr<nsIFile> compiledFile =
-    aFileHelper->GetCheckedFile(aCompiledFile->mFileInfo);
-  if (NS_WARN_IF(!compiledFile)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsresult rv;
-
-  bool match;
-  {
-    ScopedPRFileDesc compiledFileDesc;
-    rv = compiledFile->OpenNSPRFileDesc(PR_RDONLY,
-                                        0644,
-                                        &compiledFileDesc.rwget());
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    JS::BuildIdCharVector buildId;
-    bool ok = GetBuildId(&buildId);
-    if (NS_WARN_IF(!ok)) {
-      return NS_ERROR_FAILURE;
-    }
-
-    match = JS::CompiledWasmModuleAssumptionsMatch(compiledFileDesc,
-                                                   std::move(buildId));
-  }
-  if (match) {
-    return NS_OK;
-  }
-
-  // Re-compile the module.  It would be preferable to do this in the child
-  // (content process) instead of here in the parent, but that would be way more
-  // complex and without significant memory allocation or security benefits.
-  // See the discussion starting from
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=1312808#c9 for more details.
-  nsCOMPtr<nsIFile> bytecodeFile =
-    aFileHelper->GetCheckedFile(aBytecodeFile->mFileInfo);
-  if (NS_WARN_IF(!bytecodeFile)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  ScopedPRFileDesc bytecodeFileDesc;
-  rv = bytecodeFile->OpenNSPRFileDesc(PR_RDONLY,
-                                      0644,
-                                      &bytecodeFileDesc.rwget());
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  JS::BuildIdCharVector buildId;
-  bool ok = GetBuildId(&buildId);
-  if (NS_WARN_IF(!ok)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  RefPtr<JS::WasmModule> module = JS::DeserializeWasmModule(bytecodeFileDesc,
-                                                            nullptr,
-                                                            std::move(buildId),
-                                                            nullptr,
-                                                            0);
-  if (NS_WARN_IF(!module)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  size_t compiledSize = module->compiledSerializedSize();
-  UniquePtr<uint8_t[]> compiled(new (fallible) uint8_t[compiledSize]);
-  if (NS_WARN_IF(!compiled)) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  module->compiledSerialize(compiled.get(), compiledSize);
-
-  nsCOMPtr<nsIInputStream> inputStream;
-  rv = NS_NewByteInputStream(getter_AddRefs(inputStream),
-                             reinterpret_cast<const char*>(compiled.get()),
-                             compiledSize);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  RefPtr<FileInfo> newFileInfo = aFileHelper->GetNewFileInfo();
-
-  nsCOMPtr<nsIFile> newFile = aFileHelper->GetFile(newFileInfo);
-  if (NS_WARN_IF(!newFile)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  nsCOMPtr<nsIFile> newJournalFile =
-    aFileHelper->GetJournalFile(newFileInfo);
-  if (NS_WARN_IF(!newJournalFile)) {
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = aFileHelper->CreateFileFromStream(newFile,
-                                         newJournalFile,
-                                         inputStream,
-                                         /* aCompress */ false);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    nsresult rv2 = aFileHelper->RemoveFile(newFile, newJournalFile);
-    if (NS_WARN_IF(NS_FAILED(rv2))) {
-      return rv;
-    }
-    return rv;
-  }
-
-  rv = aFileHelper->ReplaceFile(compiledFile, newFile, newJournalFile);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    nsresult rv2 = aFileHelper->RemoveFile(newFile, newJournalFile);
-    if (NS_WARN_IF(NS_FAILED(rv2))) {
-      return rv;
-    }
-    return rv;
-  }
-
-  return NS_OK;
-}
-
 nsresult
 DeserializeStructuredCloneFiles(FileManager* aFileManager,
                                 const nsAString& aText,
@@ -9878,7 +9737,6 @@ DeserializeStructuredCloneFiles(FileManager* aFileManager,
 
   nsAutoString token;
   nsresult rv;
-  Maybe<FileHelper> fileHelper;
 
   while (tokenizer.hasMoreTokens()) {
     token = tokenizer.nextToken();
@@ -9898,26 +9756,10 @@ DeserializeStructuredCloneFiles(FileManager* aFileManager,
       *aHasPreprocessInfo = true;
     }
     else if (file->mType == StructuredCloneFile::eWasmCompiled) {
-      if (fileHelper.isNothing()) {
-        fileHelper.emplace(aFileManager);
-
-        rv = fileHelper->Init();
-        if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
-        }
-      }
-
       MOZ_ASSERT(aResult.Length() > 1);
       MOZ_ASSERT(aResult[aResult.Length() - 2].mType ==
                    StructuredCloneFile::eWasmBytecode);
 
-      StructuredCloneFile* previousFile = &aResult[aResult.Length() - 2];
-
-      rv = CheckWasmModule(fileHelper.ptr(), previousFile, file);
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-
       *aHasPreprocessInfo = true;
     }
   }
@@ -9978,9 +9820,7 @@ SerializeStructuredCloneFiles(
   for (uint32_t index = 0; index < count; index++) {
     const StructuredCloneFile& file = aFiles[index];
 
-    if (aForPreprocess &&
-        file.mType != StructuredCloneFile::eWasmBytecode &&
-        file.mType != StructuredCloneFile::eWasmCompiled) {
+    if (aForPreprocess && file.mType != StructuredCloneFile::eWasmBytecode) {
       continue;
     }
 
@@ -10064,15 +9904,14 @@ SerializeStructuredCloneFiles(
         break;
       }
 
-      case StructuredCloneFile::eWasmBytecode:
-      case StructuredCloneFile::eWasmCompiled: {
+      case StructuredCloneFile::eWasmBytecode: {
         if (!aForPreprocess) {
           SerializedStructuredCloneFile* serializedFile =
             aResult.AppendElement(fallible);
           MOZ_ASSERT(serializedFile);
 
           serializedFile->file() = null_t();
-          serializedFile->type() = file.mType;
+          serializedFile->type() = StructuredCloneFile::eWasmBytecode;
         } else {
           RefPtr<FileBlobImpl> impl = new FileBlobImpl(nativeFile);
           impl->SetFileId(file.mFileInfo->Id());
@@ -10091,7 +9930,7 @@ SerializeStructuredCloneFiles(
           MOZ_ASSERT(serializedFile);
 
           serializedFile->file() = ipcBlob;
-          serializedFile->type() = file.mType;
+          serializedFile->type() = StructuredCloneFile::eWasmBytecode;
 
           aDatabase->MapBlob(ipcBlob, file.mFileInfo);
         }
@@ -10099,6 +9938,16 @@ SerializeStructuredCloneFiles(
         break;
       }
 
+      case StructuredCloneFile::eWasmCompiled: {
+        SerializedStructuredCloneFile* serializedFile =
+          aResult.AppendElement(fallible);
+        MOZ_ASSERT(serializedFile);
+
+        serializedFile->file() = null_t();
+        serializedFile->type() = StructuredCloneFile::eWasmCompiled;
+        break;
+      }
+
       default:
         MOZ_CRASH("Should never get here!");
     }
@@ -29137,22 +28986,6 @@ FileHelper::GetFile(FileInfo* aFileInfo)
   return file.forget();
 }
 
-already_AddRefed<nsIFile>
-FileHelper::GetCheckedFile(FileInfo* aFileInfo)
-{
-  MOZ_ASSERT(!IsOnBackgroundThread());
-  MOZ_ASSERT(aFileInfo);
-  MOZ_ASSERT(mFileManager);
-  MOZ_ASSERT(mFileDirectory);
-
-  const int64_t fileId = aFileInfo->Id();
-  MOZ_ASSERT(fileId > 0);
-
-  nsCOMPtr<nsIFile> file =
-    mFileManager->GetCheckedFileForId(mFileDirectory, fileId);
-  return file.forget();
-}
-
 already_AddRefed<nsIFile>
 FileHelper::GetJournalFile(FileInfo* aFileInfo)
 {
@@ -29279,59 +29112,6 @@ FileHelper::CreateFileFromStream(nsIFile* aFile,
   return NS_OK;
 }
 
-nsresult
-FileHelper::ReplaceFile(nsIFile* aFile,
-                        nsIFile* aNewFile,
-                        nsIFile* aNewJournalFile)
-{
-  MOZ_ASSERT(!IsOnBackgroundThread());
-  MOZ_ASSERT(aFile);
-  MOZ_ASSERT(aNewFile);
-  MOZ_ASSERT(aNewJournalFile);
-  MOZ_ASSERT(mFileManager);
-  MOZ_ASSERT(mFileDirectory);
-  MOZ_ASSERT(mJournalDirectory);
-
-  nsresult rv;
-
-  int64_t fileSize;
-
-  if (mFileManager->EnforcingQuota()) {
-    rv = aFile->GetFileSize(&fileSize);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-
-  nsAutoString fileName;
-  rv = aFile->GetLeafName(fileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  rv = aNewFile->RenameTo(nullptr, fileName);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  if (mFileManager->EnforcingQuota()) {
-    QuotaManager* quotaManager = QuotaManager::Get();
-    MOZ_ASSERT(quotaManager);
-
-    quotaManager->DecreaseUsageForOrigin(mFileManager->Type(),
-                                         mFileManager->Group(),
-                                         mFileManager->Origin(),
-                                         fileSize);
-  }
-
-  rv = aNewJournalFile->Remove(false);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  return NS_OK;
-}
-
 nsresult
 FileHelper::RemoveFile(nsIFile* aFile,
                        nsIFile* aJournalFile)
@@ -29370,14 +29150,6 @@ FileHelper::RemoveFile(nsIFile* aFile,
   return NS_OK;
 }
 
-already_AddRefed<FileInfo>
-FileHelper::GetNewFileInfo()
-{
-  MOZ_ASSERT(mFileManager);
-
-  return mFileManager->GetNewFileInfo();
-}
-
 class FileHelper::ReadCallback final : public nsIInputStreamCallback
 {
 public:
diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp
index c7e949dc75db..6f32a570c014 100644
--- a/dom/indexedDB/IDBObjectStore.cpp
+++ b/dom/indexedDB/IDBObjectStore.cpp
@@ -209,288 +209,6 @@ GenerateRequest(JSContext* aCx, IDBObjectStore* aObjectStore)
   return request.forget();
 }
 
-// Blob internal code clones this stream before it's passed to IPC, so we
-// serialize module's optimized code only when AsyncWait() is called.
-class WasmCompiledModuleStream final
-  : public nsIAsyncInputStream
-  , public nsICloneableInputStream
-  , private JS::WasmModuleListener
-{
-  nsCOMPtr<nsISerialEventTarget> mOwningThread;
-
-  // Initially and while waiting for compilation to complete, the mModule field
-  // is non-null, keeping alive the module whose code needs to be serialized.
-  RefPtr<JS::WasmModule> mModule;
-
-  // A module stream can have up to one input stream callback.
-  nsCOMPtr<nsIInputStreamCallback> mCallback;
-
-  // When a module's optimized code is ready to be serialized, it will be
-  // serialized into mStream and the mModule will be released. At this point,
-  // stream reads will succeed.
-  nsCOMPtr<nsIInputStream> mStream;
-
-  // When the stream is finished reading or closed, mStatus will be changed from
-  // NS_OK to NS_BASE_STREAM_CLOSED or whatever status was passed to
-  // CloseWithStatus.
-  nsresult mStatus;
-
-public:
-  explicit WasmCompiledModuleStream(JS::WasmModule* aModule)
-    : mOwningThread(GetCurrentThreadSerialEventTarget())
-    , mModule(aModule)
-    , mStatus(NS_OK)
-  {
-    AssertIsOnOwningThread();
-    MOZ_ASSERT(aModule);
-  }
-
-  bool
-  IsOnOwningThread() const
-  {
-    MOZ_ASSERT(mOwningThread);
-
-    bool current;
-    return NS_SUCCEEDED(mOwningThread->IsOnCurrentThread(&current)) && current;
-  }
-
-  void
-  AssertIsOnOwningThread() const
-  {
-    MOZ_ASSERT(IsOnOwningThread());
-  }
-
-private:
-  // Copy constructor for cloning.
-  explicit WasmCompiledModuleStream(const WasmCompiledModuleStream& aOther)
-    : mOwningThread(aOther.mOwningThread)
-    , mModule(aOther.mModule)
-    , mStatus(aOther.mStatus)
-  {
-    AssertIsOnOwningThread();
-
-    if (aOther.mStream) {
-      nsCOMPtr<nsICloneableInputStream> cloneableStream =
-        do_QueryInterface(aOther.mStream);
-      MOZ_ASSERT(cloneableStream);
-
-      MOZ_ALWAYS_SUCCEEDS(cloneableStream->Clone(getter_AddRefs(mStream)));
-    }
-  }
-
-  ~WasmCompiledModuleStream() override
-  {
-    AssertIsOnOwningThread();
-
-    MOZ_ALWAYS_SUCCEEDS(Close());
-  }
-
-  void
-  CallCallback()
-  {
-    AssertIsOnOwningThread();
-    MOZ_ASSERT(mCallback);
-
-    nsCOMPtr<nsIInputStreamCallback> callback;
-    callback.swap(mCallback);
-
-    callback->OnInputStreamReady(this);
-  }
-
-  NS_DECL_THREADSAFE_ISUPPORTS
-
-  // nsIInputStream:
-
-  NS_IMETHOD
-  Close() override
-  {
-    AssertIsOnOwningThread();
-
-    return CloseWithStatus(NS_BASE_STREAM_CLOSED);
-  }
-
-  NS_IMETHOD
-  Available(uint64_t* _retval) override
-  {
-    AssertIsOnOwningThread();
-
-    if (NS_FAILED(mStatus)) {
-      return mStatus;
-    }
-
-    if (!mStream) {
-      *_retval = 0;
-      return NS_OK;
-    }
-
-    return mStream->Available(_retval);
-  }
-
-  NS_IMETHOD
-  Read(char* aBuf, uint32_t aCount, uint32_t* _retval) override
-  {
-    AssertIsOnOwningThread();
-
-    return ReadSegments(NS_CopySegmentToBuffer, aBuf, aCount, _retval);
-  }
-
-  NS_IMETHOD
-  ReadSegments(nsWriteSegmentFun aWriter,
-               void* aClosure,
-               uint32_t aCount,
-               uint32_t* _retval) override
-  {
-    AssertIsOnOwningThread();
-
-    if (NS_FAILED(mStatus)) {
-      *_retval = 0;
-      return NS_OK;
-    }
-
-    if (!mStream) {
-      return NS_BASE_STREAM_WOULD_BLOCK;
-    }
-
-    return mStream->ReadSegments(aWriter, aClosure, aCount, _retval);
-  }
-
-  NS_IMETHOD
-  IsNonBlocking(bool* _retval) override
-  {
-    AssertIsOnOwningThread();
-
-    *_retval = true;
-    return NS_OK;
-  }
-
-  // nsIAsyncInputStream:
-
-  NS_IMETHOD
-  CloseWithStatus(nsresult aStatus) override
-  {
-    AssertIsOnOwningThread();
-
-    if (NS_FAILED(mStatus)) {
-      return NS_OK;
-    }
-
-    mModule = nullptr;
-
-    if (mStream) {
-      MOZ_ALWAYS_SUCCEEDS(mStream->Close());
-      mStream = nullptr;
-    }
-
-    mStatus = NS_FAILED(aStatus) ? aStatus : NS_BASE_STREAM_CLOSED;
-
-    if (mCallback) {
-      CallCallback();
-    }
-
-    return NS_OK;
-  }
-
-  NS_IMETHOD
-  AsyncWait(nsIInputStreamCallback* aCallback,
-            uint32_t aFlags,
-            uint32_t aRequestedCount,
-            nsIEventTarget* aEventTarget) override
-  {
-    AssertIsOnOwningThread();
-    MOZ_ASSERT_IF(mCallback, !aCallback);
-
-    if (aFlags) {
-      return NS_ERROR_NOT_IMPLEMENTED;
-    }
-
-    if (!aCallback) {
-      mCallback = nullptr;
-      return NS_OK;
-    }
-
-    if (aEventTarget) {
-      mCallback =
-        NS_NewInputStreamReadyEvent("WasmCompiledModuleStream::AsyncWait",
-                                    aCallback,
-                                    aEventTarget);
-    } else {
-      mCallback = aCallback;
-    }
-
-    if (NS_FAILED(mStatus) || mStream) {
-      CallCallback();
-      return NS_OK;
-    }
-
-    MOZ_ASSERT(mModule);
-    mModule->notifyWhenCompilationComplete(this);
-
-    return NS_OK;
-  }
-
-  // nsICloneableInputStream:
-
-  NS_IMETHOD
-  GetCloneable(bool* aCloneable) override
-  {
-    AssertIsOnOwningThread();
-
-    *aCloneable = true;
-    return NS_OK;
-  }
-
-  NS_IMETHOD
-  Clone(nsIInputStream** _retval) override
-  {
-    AssertIsOnOwningThread();
-
-    nsCOMPtr<nsIInputStream> clone = new WasmCompiledModuleStream(*this);
-
-    clone.forget(_retval);
-    return NS_OK;
-  }
-
-  // JS::WasmModuleListener:
-
-  void
-  onCompilationComplete() override
-  {
-    if (!IsOnOwningThread()) {
-      MOZ_ALWAYS_SUCCEEDS(mOwningThread->Dispatch(NewCancelableRunnableMethod(
-        "WasmCompiledModuleStream::onCompilationComplete",
-        this,
-        &WasmCompiledModuleStream::onCompilationComplete)));
-      return;
-    }
-
-    if (NS_FAILED(mStatus) || !mCallback) {
-      return;
-    }
-
-    MOZ_ASSERT(mModule);
-
-    size_t compiledSize = mModule->compiledSerializedSize();
-
-    nsCString compiled;
-    compiled.SetLength(compiledSize);
-
-    mModule->compiledSerialize(
-      reinterpret_cast<uint8_t*>(compiled.BeginWriting()), compiledSize);
-
-    MOZ_ALWAYS_SUCCEEDS(NS_NewCStringInputStream(getter_AddRefs(mStream),
-                                                 std::move(compiled)));
-
-    mModule = nullptr;
-
-    CallCallback();
-  }
-};
-
-NS_IMPL_ISUPPORTS(WasmCompiledModuleStream,
-                  nsIInputStream,
-                  nsIAsyncInputStream,
-                  nsICloneableInputStream)
-
 bool
 StructuredCloneWriteCallback(JSContext* aCx,
                              JSStructuredCloneWriter* aWriter,
@@ -647,61 +365,6 @@ StructuredCloneWriteCallback(JSContext* aCx,
     }
   }
 
-  if (JS::IsWasmModuleObject(aObj)) {
-    RefPtr<JS::WasmModule> module = JS::GetWasmModule(aObj);
-    MOZ_ASSERT(module);
-
-    size_t bytecodeSize = module->bytecodeSerializedSize();
-    UniquePtr<uint8_t[], JS::FreePolicy> bytecode(js_pod_malloc<uint8_t>(bytecodeSize));
-    module->bytecodeSerialize(bytecode.get(), bytecodeSize);
-
-    RefPtr<BlobImpl> blobImpl =
-      new MemoryBlobImpl(bytecode.release(), bytecodeSize, EmptyString());
-
-    RefPtr<Blob> bytecodeBlob = Blob::Create(nullptr, blobImpl);
-
-    if (module->compilationComplete()) {
-      size_t compiledSize = module->compiledSerializedSize();
-      UniquePtr<uint8_t[]> compiled(new uint8_t[compiledSize]);
-      module->compiledSerialize(compiled.get(), compiledSize);
-
-      blobImpl =
-        new MemoryBlobImpl(compiled.release(), compiledSize, EmptyString());
-    } else {
-      nsCOMPtr<nsIInputStream> stream(new WasmCompiledModuleStream(module));
-
-      blobImpl = StreamBlobImpl::Create(stream.forget(), EmptyString(),
-                                        UINT64_MAX);
-    }
-
-    RefPtr<Blob> compiledBlob = Blob::Create(nullptr, blobImpl);
-
-    if (cloneWriteInfo->mFiles.Length() + 1 > size_t(UINT32_MAX)) {
-      MOZ_ASSERT(false, "Fix the structured clone data to use a bigger type!");
-      return false;
-    }
-
-    const uint32_t index = cloneWriteInfo->mFiles.Length();
-
-    // The ordering of the bytecode and compiled file is significant and must
-    // never be changed. These two files must always form a pair
-    // [eWasmBytecode, eWasmCompiled]. Everything else depends on it!
-    if (!JS_WriteUint32Pair(aWriter, SCTAG_DOM_WASM, /* flags */ 0) ||
-        !JS_WriteUint32Pair(aWriter, index, index + 1)) {
-      return false;
-    }
-
-    StructuredCloneFile* newFile = cloneWriteInfo->mFiles.AppendElement();
-    newFile->mBlob = bytecodeBlob;
-    newFile->mType = StructuredCloneFile::eWasmBytecode;
-
-    newFile = cloneWriteInfo->mFiles.AppendElement();
-    newFile->mBlob = compiledBlob;
-    newFile->mType = StructuredCloneFile::eWasmCompiled;
-
-    return true;
-  }
-
   return StructuredCloneHolder::WriteFullySerializableObjects(aCx, aWriter, aObj);
 }
 
@@ -768,29 +431,6 @@ CopyingStructuredCloneWriteCallback(JSContext* aCx,
     }
   }
 
-  if (JS::IsWasmModuleObject(aObj)) {
-    RefPtr<JS::WasmModule> module = JS::GetWasmModule(aObj);
-    MOZ_ASSERT(module);
-
-    if (cloneInfo->mFiles.Length() > size_t(UINT32_MAX)) {
-      MOZ_ASSERT(false,
-                 "Fix the structured clone data to use a bigger type!");
-      return false;
-    }
-
-    const uint32_t index = cloneInfo->mFiles.Length();
-
-    if (!JS_WriteUint32Pair(aWriter, SCTAG_DOM_WASM, index)) {
-      return false;
-    }
-
-    StructuredCloneFile* newFile = cloneInfo->mFiles.AppendElement();
-    newFile->mWasmModule = module;
-    newFile->mType = StructuredCloneFile::eWasmBytecode;
-
-    return true;
-  }
-
   return StructuredCloneHolder::WriteFullySerializableObjects(aCx, aWriter, aObj);
 }
 
@@ -1116,7 +756,7 @@ public:
                           JS::MutableHandle<JSObject*> aResult)
   {
     MOZ_ASSERT(aCx);
-    MOZ_ASSERT(aFile.mType == StructuredCloneFile::eWasmCompiled);
+    MOZ_ASSERT(aFile.mType == StructuredCloneFile::eWasmBytecode);
     MOZ_ASSERT(!aFile.mBlob);
 
     // If we don't have a WasmModule, we are probably using it for an index
@@ -1184,7 +824,7 @@ CommonStructuredCloneReadCallback(JSContext* aCx,
         return nullptr;
       }
 
-      StructuredCloneFile& file = cloneReadInfo->mFiles[data.compiledIndex];
+      StructuredCloneFile& file = cloneReadInfo->mFiles[data.bytecodeIndex];
 
       if (NS_WARN_IF(!ValueDeserializationHelper::CreateAndWrapWasmModule(aCx,
                                                                           file,
diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini
index 686a2e36b24e..2fa79f5f4a91 100644
--- a/dom/indexedDB/test/mochitest.ini
+++ b/dom/indexedDB/test/mochitest.ini
@@ -114,12 +114,7 @@ support-files =
   unit/test_upgrade_add_index.js
   unit/test_unique_index_update.js
   unit/test_view_put_get_values.js
-  unit/test_wasm_cursors.js
-  unit/test_wasm_getAll.js
-  unit/test_wasm_index_getAllObjects.js
-  unit/test_wasm_indexes.js
   unit/test_wasm_put_get_values.js
-  unit/test_wasm_serialize_tiering.js
   unit/test_writer_starvation.js
 
 [test_abort_deleted_index.html]
@@ -271,9 +266,4 @@ scheme=https
 [test_unique_index_update.html]
 [test_upgrade_add_index.html]
 [test_view_put_get_values.html]
-[test_wasm_cursors.html]
-[test_wasm_getAll.html]
-[test_wasm_index_getAllObjects.html]
-[test_wasm_indexes.html]
 [test_wasm_put_get_values.html]
-[test_wasm_serialize_tiering.html]
diff --git a/dom/indexedDB/test/test_wasm_cursors.html b/dom/indexedDB/test/test_wasm_cursors.html
deleted file mode 100644
index 142b6a8ebaa9..000000000000
--- a/dom/indexedDB/test/test_wasm_cursors.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript" src="unit/test_wasm_cursors.js"></script>
-  <script type="text/javascript" src="file.js"></script>
-  <script type="text/javascript" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>
diff --git a/dom/indexedDB/test/test_wasm_getAll.html b/dom/indexedDB/test/test_wasm_getAll.html
deleted file mode 100644
index 029270e4051f..000000000000
--- a/dom/indexedDB/test/test_wasm_getAll.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript" src="unit/test_wasm_getAll.js"></script>
-  <script type="text/javascript" src="file.js"></script>
-  <script type="text/javascript" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>
diff --git a/dom/indexedDB/test/test_wasm_index_getAllObjects.html b/dom/indexedDB/test/test_wasm_index_getAllObjects.html
deleted file mode 100644
index 4f96bb7d35dc..000000000000
--- a/dom/indexedDB/test/test_wasm_index_getAllObjects.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript" src="unit/test_wasm_index_getAllObjects.js"></script>
-  <script type="text/javascript" src="file.js"></script>
-  <script type="text/javascript" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>
diff --git a/dom/indexedDB/test/test_wasm_indexes.html b/dom/indexedDB/test/test_wasm_indexes.html
deleted file mode 100644
index f3b39dc53b17..000000000000
--- a/dom/indexedDB/test/test_wasm_indexes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript" src="unit/test_wasm_indexes.js"></script>
-  <script type="text/javascript" src="file.js"></script>
-  <script type="text/javascript" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>
diff --git a/dom/indexedDB/test/test_wasm_serialize_tiering.html b/dom/indexedDB/test/test_wasm_serialize_tiering.html
deleted file mode 100644
index 45e36e131fd9..000000000000
--- a/dom/indexedDB/test/test_wasm_serialize_tiering.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-  Any copyright is dedicated to the Public Domain.
-  http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<head>
-  <title>Indexed Database Property Test</title>
-
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-
-  <script type="text/javascript" src="unit/test_wasm_serialize_tiering.js"></script>
-  <script type="text/javascript" src="file.js"></script>
-  <script type="text/javascript" src="helpers.js"></script>
-
-</head>
-
-<body onload="runTest();"></body>
-
-</html>
diff --git a/dom/indexedDB/test/unit/test_upgrade_add_index.js b/dom/indexedDB/test/unit/test_upgrade_add_index.js
index bdf12e68fbec..edeb29478cae 100644
--- a/dom/indexedDB/test/unit/test_upgrade_add_index.js
+++ b/dom/indexedDB/test/unit/test_upgrade_add_index.js
@@ -54,19 +54,6 @@ function* testSteps()
     info("not storing crypto key");
   }
 
-  if (isWasmSupported()) {
-    info("creating wasm");
-    getWasmBinary("(module (func (nop)))");
-    let binary = yield undefined;
-    allData.push({
-      id: 2,
-      what: "wasm",
-      data: getWasmModule(binary)
-    });
-  } else {
-    info("not storing wasm");
-  }
-
   // -- Create the IDB and populate it with the base data.
   info("opening initial database");
   let request = indexedDB.open(this.window ? window.location.pathname : "Splendid Test", 1);
diff --git a/dom/indexedDB/test/unit/test_wasm_cursors.js b/dom/indexedDB/test/unit/test_wasm_cursors.js
deleted file mode 100644
index 88fe228347d5..000000000000
--- a/dom/indexedDB/test/unit/test_wasm_cursors.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var testGenerator = testSteps();
-
-function* testSteps()
-{
-  const name =
-    this.window ? window.location.pathname : "test_wasm_cursors.js";
-
-  const objectStoreName = "Wasm";
-
-  const wasmData = { key: 1, value: null };
-
-  if (!isWasmSupported()) {
-    finishTest();
-    return;
-  }
-
-  getWasmBinary("(module (func (nop)))");
-  let binary = yield undefined;
-  wasmData.value = getWasmModule(binary);
-
-  info("Opening database");
-
-  let request = indexedDB.open(name);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = continueToNextStepSync;
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  // upgradeneeded
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = continueToNextStepSync;
-
-  info("Creating objectStore");
-
-  request.result.createObjectStore(objectStoreName);
-
-  yield undefined;
-
-  // success
-  let db = request.result;
-  db.onerror = errorHandler;
-
-  info("Storing wasm");
-
-  let objectStore = db.transaction([objectStoreName], "readwrite")
-                      .objectStore(objectStoreName);
-  request = objectStore.add(wasmData.value, wasmData.key);
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
-
-  is(request.result, wasmData.key, "Got correct key");
-
-  info("Opening cursor");
-
-  request = objectStore.openCursor();
-  request.addEventListener("error", new ExpectError("UnknownError", true));
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  finishTest();
-}
diff --git a/dom/indexedDB/test/unit/test_wasm_getAll.js b/dom/indexedDB/test/unit/test_wasm_getAll.js
deleted file mode 100644
index 9b0454435788..000000000000
--- a/dom/indexedDB/test/unit/test_wasm_getAll.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var testGenerator = testSteps();
-
-function* testSteps()
-{
-  const name =
-    this.window ? window.location.pathname : "test_wasm_getAll.js";
-
-  const objectStoreName = "Wasm";
-
-  const wasmData = [
-    { key: 1, value: 42 },
-    { key: 2, value: [null, null, null] },
-    { key: 3, value: [null, null, null, null, null] }
-  ];
-
-  if (!isWasmSupported()) {
-    finishTest();
-    return;
-  }
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 1)))`);
-  let binary = yield undefined;
-  wasmData[1].value[0] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 2)))`);
-  binary = yield undefined;
-  wasmData[1].value[1] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 3)))`);
-  binary = yield undefined;
-  wasmData[1].value[2] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 4)))`);
-  binary = yield undefined;
-  wasmData[2].value[0] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 5)))`);
-  binary = yield undefined;
-  wasmData[2].value[1] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 6)))`);
-  binary = yield undefined;
-  wasmData[2].value[2] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 7)))`);
-  binary = yield undefined;
-  wasmData[2].value[3] = getWasmModule(binary);
-
-  getWasmBinary(`(module (func (export "run") (result i32) (i32.const 8)))`);
-  binary = yield undefined;
-  wasmData[2].value[4] = getWasmModule(binary);
-
-  let request = indexedDB.open(name, 1);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = continueToNextStepSync;
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  // upgradeneeded
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = continueToNextStepSync;
-
-  info("Creating objectStore");
-
-  request.result.createObjectStore(objectStoreName);
-
-  yield undefined;
-
-  // success
-  let db = request.result;
-  db.onerror = errorHandler;
-
-  info("Storing values");
-
-  let objectStore = db.transaction([objectStoreName], "readwrite")
-                      .objectStore(objectStoreName);
-  let addedCount = 0;
-  for (let i in wasmData) {
-    request = objectStore.add(wasmData[i].value, wasmData[i].key);
-    request.onsuccess = function(event) {
-      if (++addedCount == wasmData.length) {
-        continueToNextStep();
-      }
-    };
-  }
-  yield undefined;
-
-  info("Getting values");
-
-  request = db.transaction(objectStoreName)
-              .objectStore(objectStoreName)
-              .getAll();
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
-
-  info("Verifying values");
-
-  // Can't call yield inside of the verify function.
-  let modulesToProcess = [];
-
-  function verifyArray(array1, array2) {
-    is(array1 instanceof Array, true, "Got an array object");
-    is(array1.length, array2.length, "Same length");
-  }
-
-  function verifyData(data1, data2) {
-    if (data2 instanceof Array) {
-      verifyArray(data1, data2);
-      for (let i in data2) {
-        verifyData(data1[i], data2[i]);
-      }
-    } else if (data2 instanceof WebAssembly.Module) {
-      modulesToProcess.push({ module1: data1, module2: data2 });
-    } else {
-      is(data1, data2, "Same value");
-    }
-  }
-
-  verifyArray(request.result, wasmData);
-  for (let i in wasmData) {
-    verifyData(request.result[i], wasmData[i].value);
-  }
-
-  for (let moduleToProcess of modulesToProcess) {
-    verifyWasmModule(moduleToProcess.module1, moduleToProcess.module2);
-    yield undefined;
-  }
-
-  finishTest();
-}
diff --git a/dom/indexedDB/test/unit/test_wasm_index_getAllObjects.js b/dom/indexedDB/test/unit/test_wasm_index_getAllObjects.js
deleted file mode 100644
index 95162e941d06..000000000000
--- a/dom/indexedDB/test/unit/test_wasm_index_getAllObjects.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var testGenerator = testSteps();
-
-function* testSteps()
-{
-  const name =
-    this.window ? window.location.pathname : "test_wasm_getAll.js";
-
-  const objectStoreName = "Wasm";
-
-  const wasmData = [
-    { key: 1, value: { name: "foo1", data: 42 } },
-    { key: 2, value: { name: "foo2", data: [null, null, null] } },
-    { key: 3, value: { name: "foo3", data: [null, null, null, null, null] } }
-  ];
-
-  const indexData = { name: "nameIndex", keyPath: "name", options: { } };
-
-  if (!isWasmSupported()) {
-    finishTest();
-    return;
-  }
-
-  getWasmBinary("(module (func (result i32) (i32.const 1)))");
-  let binary = yield undefined;
-  wasmData[1].value.data[0] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 2)))");
-  binary = yield undefined;
-  wasmData[1].value.data[1] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 3)))");
-  binary = yield undefined;
-  wasmData[1].value.data[2] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 4)))");
-  binary = yield undefined;
-  wasmData[2].value.data[0] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 5)))");
-  binary = yield undefined;
-  wasmData[2].value.data[1] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 6)))");
-  binary = yield undefined;
-  wasmData[2].value.data[2] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 7)))");
-  binary = yield undefined;
-  wasmData[2].value.data[3] = getWasmModule(binary);
-
-  getWasmBinary("(module (func (result i32) (i32.const 8)))");
-  binary = yield undefined;
-  wasmData[2].value.data[4] = getWasmModule(binary);
-
-  let request = indexedDB.open(name, 1);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = continueToNextStepSync;
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  // upgradeneeded
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = continueToNextStepSync;
-
-  info("Creating objectStore");
-
-  let objectStore = request.result.createObjectStore(objectStoreName);
-
-  info("Creating index");
-
-  objectStore.createIndex(indexData.name, indexData.keyPath, indexData.options);
-
-  yield undefined;
-
-  // success
-  let db = request.result;
-  db.onerror = errorHandler;
-
-  info("Storing values");
-
-  objectStore = db.transaction([objectStoreName], "readwrite")
-                  .objectStore(objectStoreName);
-  let addedCount = 0;
-  for (let i in wasmData) {
-    request = objectStore.add(wasmData[i].value, wasmData[i].key);
-    request.onsuccess = function(event) {
-      if (++addedCount == wasmData.length) {
-        continueToNextStep();
-      }
-    };
-  }
-  yield undefined;
-
-  info("Getting values");
-
-  request = db.transaction(objectStoreName)
-              .objectStore(objectStoreName)
-              .index("nameIndex")
-              .getAll();
-  request.addEventListener("error", new ExpectError("UnknownError", true));
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  finishTest();
-}
diff --git a/dom/indexedDB/test/unit/test_wasm_indexes.js b/dom/indexedDB/test/unit/test_wasm_indexes.js
deleted file mode 100644
index f1e273e29846..000000000000
--- a/dom/indexedDB/test/unit/test_wasm_indexes.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var testGenerator = testSteps();
-
-function* testSteps()
-{
-  const name =
-    this.window ? window.location.pathname : "test_wasm_indexes.js";
-
-  const objectStoreName = "Wasm";
-
-  const wasmData = { key: 1, value: { name: "foo", data: null } };
-
-  const indexData = { name: "nameIndex", keyPath: "name", options: { } };
-
-  if (!isWasmSupported()) {
-    finishTest();
-    return;
-  }
-
-  getWasmBinary("(module (func (nop)))");
-  let binary = yield undefined;
-  wasmData.value.data = getWasmModule(binary);
-
-  info("Opening database");
-
-  let request = indexedDB.open(name);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = continueToNextStepSync;
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  // upgradeneeded
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = continueToNextStepSync;
-
-  info("Creating objectStore");
-
-  let objectStore = request.result.createObjectStore(objectStoreName);
-
-  info("Creating index");
-
-  objectStore.createIndex(indexData.name, indexData.keyPath, indexData.options);
-
-  yield undefined;
-
-  // success
-  let db = request.result;
-  db.onerror = errorHandler;
-
-  info("Storing wasm");
-
-  objectStore = db.transaction([objectStoreName], "readwrite")
-                  .objectStore(objectStoreName);
-  request = objectStore.add(wasmData.value, wasmData.key);
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
-
-  is(request.result, wasmData.key, "Got correct key");
-
-  info("Getting wasm");
-
-  request = objectStore.index("nameIndex").get("foo");
-  request.addEventListener("error", new ExpectError("UnknownError", true));
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  info("Opening cursor");
-
-  request = objectStore.index("nameIndex").openCursor();
-  request.addEventListener("error", new ExpectError("UnknownError", true));
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  finishTest();
-}
diff --git a/dom/indexedDB/test/unit/test_wasm_put_get_values.js b/dom/indexedDB/test/unit/test_wasm_put_get_values.js
index 71bb151851bd..94d327155d8a 100644
--- a/dom/indexedDB/test/unit/test_wasm_put_get_values.js
+++ b/dom/indexedDB/test/unit/test_wasm_put_get_values.js
@@ -45,38 +45,21 @@ function* testSteps()
   let db = request.result;
   db.onerror = errorHandler;
 
-  info("Storing wasm");
+  info("Testing failure to store wasm");
 
   let objectStore = db.transaction([objectStoreName], "readwrite")
                       .objectStore(objectStoreName);
-  request = objectStore.add(wasmData.value, wasmData.key);
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
 
-  is(request.result, wasmData.key, "Got correct key");
-
-  info("Getting wasm");
-
-  request = objectStore.get(wasmData.key);
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
-
-  info("Verifying wasm");
-
-  verifyWasmModule(request.result, wasmData.value);
-  yield undefined;
-
-  info("Getting wasm in new transaction");
-
-  request = db.transaction([objectStoreName])
-              .objectStore(objectStoreName).get(wasmData.key);
-  request.onsuccess = continueToNextStepSync;
-  yield undefined;
-
-  info("Verifying wasm");
-
-  verifyWasmModule(request.result, wasmData.value);
-  yield undefined;
+  // storing a wasm module in IDB should now fail
+  let failed = false;
+  try {
+    objectStore.add(wasmData.value, wasmData.key);
+  } catch (err) {
+    failed = true;
+    ok(err instanceof DOMException, "caught right error type");
+    is(err.name, "DataCloneError", "caught right error name");
+  }
+  ok(failed, "error was thrown");
 
   finishTest();
 }
diff --git a/dom/indexedDB/test/unit/test_wasm_recompile.js b/dom/indexedDB/test/unit/test_wasm_recompile.js
index e1e18ef90558..3cc2a2196a18 100644
--- a/dom/indexedDB/test/unit/test_wasm_recompile.js
+++ b/dom/indexedDB/test/unit/test_wasm_recompile.js
@@ -94,9 +94,9 @@ function* testSteps()
 
   let newCompiledBuffer = fileReader.result;
 
-  info("Verifying blobs differ");
+  info("Verifying that re-storing of re-compiled code has been disabled");
 
-  ok(!compareBuffers(newCompiledBuffer, compiledBuffer), "Blobs differ");
+  ok(compareBuffers(newCompiledBuffer, compiledBuffer), "Blobs don't differ");
 
   info("Getting wasm again");
 
diff --git a/dom/indexedDB/test/unit/test_wasm_serialize_tiering.js b/dom/indexedDB/test/unit/test_wasm_serialize_tiering.js
deleted file mode 100644
index 5a02695ce725..000000000000
--- a/dom/indexedDB/test/unit/test_wasm_serialize_tiering.js
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-var testGenerator = testSteps();
-
-function* testSteps()
-{
-  const name =
-    this.window ? window.location.pathname : "test_wasm_serialize_tiering.js";
-
-  const objectStoreName = "Wasm";
-
-  if (!isWasmSupported()) {
-    finishTest();
-    return;
-  }
-
-  // Make a module big enough so that tiering is significant.
-  const N = 50;
-  let bigFunc = `(func (result f64)\n`;
-  for (let i = 0; i < N; i++) {
-    bigFunc += `  f64.const 1.0\n`;
-  }
-  for (let i = 0; i < N - 1; i++) {
-    bigFunc += `  f64.add\n`;
-  }
-  bigFunc += `)`;
-  let bigModule = `(module \n`;
-  for (let i = 0; i < 100; i++) {
-    bigModule += bigFunc;
-  }
-  bigModule += `  (export "run" (func 10))\n`;
-  bigModule += `)`;
-
-  getWasmBinary(bigModule);
-  let bigBinary = yield undefined;
-
-  info("Opening database");
-
-  let request = indexedDB.open(name);
-  request.onerror = errorHandler;
-  request.onupgradeneeded = continueToNextStepSync;
-  request.onsuccess = unexpectedSuccessHandler;
-  yield undefined;
-
-  // upgradeneeded
-  request.onupgradeneeded = unexpectedSuccessHandler;
-  request.onsuccess = continueToNextStepSync;
-
-  info("Creating objectStore");
-
-  request.result.createObjectStore(objectStoreName);
-
-  yield undefined;
-
-  // success
-  let db = request.result;
-  db.onerror = errorHandler;
-
-  info("Storing wasm modules");
-
-  let objectStore = db.transaction([objectStoreName], "readwrite")
-                      .objectStore(objectStoreName);
-
-  const NumModules = 5;
-  const NumCopies = 5;
-
-  let finishedAdds = 0;
-  for (let moduleIndex = 0; moduleIndex < NumModules; moduleIndex++) {
-    let module = new WebAssembly.Module(bigBinary);
-    for (let copyIndex = 0; copyIndex < NumCopies; copyIndex++) {
-      let key = String(moduleIndex) + " " + String(copyIndex);
-      let request = objectStore.add(module, key);
-      request.onsuccess = function() {
-        is(request.result, key, "Got correct key");
-        if (++finishedAdds === NumModules * NumCopies) {
-          continueToNextStepSync();
-        }
-      };
-    }
-  }
-  yield undefined;
-
-  info("Getting wasm");
-
-  let finishedGets = 0;
-  for (let moduleIndex = 0; moduleIndex < NumModules; moduleIndex++) {
-    for (let copyIndex = 0; copyIndex < NumCopies; copyIndex++) {
-      let key = String(moduleIndex) + " " + String(copyIndex);
-      let request = objectStore.get(key);
-      request.onsuccess = function() {
-        let module = request.result;
-        let instance = new WebAssembly.Instance(module);
-        is(instance.exports.run(), N, "Got correct run() result");
-        if (++finishedGets === NumModules * NumCopies) {
-          continueToNextStepSync();
-        }
-      };
-    }
-  }
-  yield undefined;
-
-  finishTest();
-}
diff --git a/dom/indexedDB/test/unit/xpcshell-head-parent-process.js b/dom/indexedDB/test/unit/xpcshell-head-parent-process.js
index c91b60cb1e7a..80485fa71fe8 100644
--- a/dom/indexedDB/test/unit/xpcshell-head-parent-process.js
+++ b/dom/indexedDB/test/unit/xpcshell-head-parent-process.js
@@ -646,7 +646,3 @@ var SpecialPowers = {
     }
   },
 };
-
-// This can be removed soon when on by default.
-if (SpecialPowers.isMainProcess())
-  SpecialPowers.setBoolPref("javascript.options.wasm_baselinejit", true);
diff --git a/dom/indexedDB/test/unit/xpcshell-parent-process.ini b/dom/indexedDB/test/unit/xpcshell-parent-process.ini
index 20ba78135d94..061a8e4febca 100644
--- a/dom/indexedDB/test/unit/xpcshell-parent-process.ini
+++ b/dom/indexedDB/test/unit/xpcshell-parent-process.ini
@@ -66,15 +66,6 @@ skip-if = os == "android"
 [test_temporary_storage.js]
 # bug 951017: intermittent failure on Android x86 emulator
 skip-if = os == "android" && processor == "x86"
-[test_view_put_get_values.js]
-[test_wasm_cursors.js]
-[test_wasm_getAll.js]
-skip-if = coverage # bug 1336727
-[test_wasm_index_getAllObjects.js]
-[test_wasm_indexes.js]
 [test_wasm_put_get_values.js]
-skip-if = coverage # bug 1336727
 [test_wasm_recompile.js]
 skip-if = coverage # bug 1336727
-[test_wasm_serialize_tiering.js]
-skip-if = coverage # bug 1336727
diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build
index bf6583ea3c44..b5fd3e37c8eb 100644
--- a/dom/plugins/ipc/hangui/moz.build
+++ b/dom/plugins/ipc/hangui/moz.build
@@ -26,7 +26,6 @@ OS_LIBS += [
     'comctl32',
 ]
 
-if ((CONFIG['MOZ_PGO'] or
-     (not CONFIG['HAVE_64BIT_BUILD'] and CONFIG['ENABLE_CLANG_PLUGIN']))
+if (not CONFIG['HAVE_64BIT_BUILD'] and CONFIG['ENABLE_CLANG_PLUGIN']
     and CONFIG['CC_TYPE'] == 'clang-cl'):
     AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/dom/quota/ActorsParent.cpp b/dom/quota/ActorsParent.cpp
index 51bab7e469c3..c110b643526e 100644
--- a/dom/quota/ActorsParent.cpp
+++ b/dom/quota/ActorsParent.cpp
@@ -5361,10 +5361,6 @@ QuotaManager::EnsureOriginIsInitializedInternal(
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
-
-    mTemporaryStorageInitialized = true;
-
-    CheckTemporaryStorageLimits();
   }
 
   bool created;
diff --git a/dom/script/ModuleScript.cpp b/dom/script/ModuleScript.cpp
index 35b188ab8df2..949a68f9bc48 100644
--- a/dom/script/ModuleScript.cpp
+++ b/dom/script/ModuleScript.cpp
@@ -21,7 +21,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(ModuleScript)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ModuleScript)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mLoader)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mBaseURL)
-  tmp->UnlinkModuleRecord();
+  tmp->UnlinkScript();
   tmp->mParseError.setUndefined();
   tmp->mErrorToRethrow.setUndefined();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -31,7 +31,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(ModuleScript)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(ModuleScript)
-  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mModuleRecord)
+  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mScript)
   NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mParseError)
   NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mErrorToRethrow)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
@@ -46,42 +46,42 @@ ModuleScript::ModuleScript(ScriptLoader* aLoader, nsIURI* aBaseURL)
 {
   MOZ_ASSERT(mLoader);
   MOZ_ASSERT(mBaseURL);
-  MOZ_ASSERT(!mModuleRecord);
+  MOZ_ASSERT(!mScript);
   MOZ_ASSERT(!HasParseError());
   MOZ_ASSERT(!HasErrorToRethrow());
 }
 
 void
-ModuleScript::UnlinkModuleRecord()
+ModuleScript::UnlinkScript()
 {
   // Remove module's back reference to this object request if present.
-  if (mModuleRecord) {
-    MOZ_ASSERT(JS::GetModuleHostDefinedField(mModuleRecord).toPrivate() ==
+  if (mScript) {
+    MOZ_ASSERT(JS::GetModuleHostDefinedField(mScript).toPrivate() ==
                this);
-    JS::SetModuleHostDefinedField(mModuleRecord, JS::UndefinedValue());
-    mModuleRecord = nullptr;
+    JS::SetModuleHostDefinedField(mScript, JS::UndefinedValue());
+    mScript = nullptr;
   }
 }
 
 ModuleScript::~ModuleScript()
 {
   // The object may be destroyed without being unlinked first.
-  UnlinkModuleRecord();
+  UnlinkScript();
   DropJSObjects(this);
 }
 
 void
-ModuleScript::SetModuleRecord(JS::Handle<JSObject*> aModuleRecord)
+ModuleScript::SetScript(JS::Handle<JSScript*> aScript)
 {
-  MOZ_ASSERT(!mModuleRecord);
+  MOZ_ASSERT(!mScript);
   MOZ_ASSERT(!HasParseError());
   MOZ_ASSERT(!HasErrorToRethrow());
 
-  mModuleRecord = aModuleRecord;
+  mScript = aScript;
 
   // Make module's host defined field point to this module script object.
-  // This is cleared in the UnlinkModuleRecord().
-  JS::SetModuleHostDefinedField(mModuleRecord, JS::PrivateValue(this));
+  // This is cleared in the UnlinkScript().
+  JS::SetModuleHostDefinedField(mScript, JS::PrivateValue(this));
   HoldJSObjects(this);
 }
 
@@ -92,7 +92,7 @@ ModuleScript::SetParseError(const JS::Value& aError)
   MOZ_ASSERT(!HasParseError());
   MOZ_ASSERT(!HasErrorToRethrow());
 
-  UnlinkModuleRecord();
+  UnlinkScript();
   mParseError = aError;
   HoldJSObjects(this);
 }
@@ -103,9 +103,9 @@ ModuleScript::SetErrorToRethrow(const JS::Value& aError)
   MOZ_ASSERT(!aError.isUndefined());
   MOZ_ASSERT(!HasErrorToRethrow());
 
-  // This is only called after SetModuleRecord() or SetParseError() so we don't
+  // This is only called after SetScript() or SetParseError() so we don't
   // need to call HoldJSObjects() here.
-  MOZ_ASSERT(mModuleRecord || HasParseError());
+  MOZ_ASSERT(mScript || HasParseError());
 
   mErrorToRethrow = aError;
 }
@@ -113,7 +113,7 @@ ModuleScript::SetErrorToRethrow(const JS::Value& aError)
 void
 ModuleScript::SetSourceElementAssociated()
 {
-  MOZ_ASSERT(mModuleRecord);
+  MOZ_ASSERT(mScript);
   MOZ_ASSERT(!mSourceElementAssociated);
 
   mSourceElementAssociated = true;
diff --git a/dom/script/ModuleScript.h b/dom/script/ModuleScript.h
index bb5d4117da82..dffa3173e5e5 100644
--- a/dom/script/ModuleScript.h
+++ b/dom/script/ModuleScript.h
@@ -22,7 +22,7 @@ class ModuleScript final : public nsISupports
 {
   RefPtr<ScriptLoader> mLoader;
   nsCOMPtr<nsIURI> mBaseURL;
-  JS::Heap<JSObject*> mModuleRecord;
+  JS::Heap<JSScript*> mScript;
   JS::Heap<JS::Value> mParseError;
   JS::Heap<JS::Value> mErrorToRethrow;
   bool mSourceElementAssociated;
@@ -36,13 +36,13 @@ public:
   ModuleScript(ScriptLoader* aLoader,
                nsIURI* aBaseURL);
 
-  void SetModuleRecord(JS::Handle<JSObject*> aModuleRecord);
+  void SetScript(JS::Handle<JSScript*> aScript);
   void SetParseError(const JS::Value& aError);
   void SetErrorToRethrow(const JS::Value& aError);
   void SetSourceElementAssociated();
 
   ScriptLoader* Loader() const { return mLoader; }
-  JSObject* ModuleRecord() const { return mModuleRecord; }
+  JSScript* Script() const { return mScript; }
   nsIURI* BaseURL() const { return mBaseURL; }
   JS::Value ParseError() const { return mParseError; }
   JS::Value ErrorToRethrow() const { return mErrorToRethrow; }
@@ -50,7 +50,7 @@ public:
   bool HasErrorToRethrow() const { return !mErrorToRethrow.isUndefined(); }
   bool SourceElementAssociated() const { return mSourceElementAssociated; }
 
-  void UnlinkModuleRecord();
+  void UnlinkScript();
 };
 
 } // dom namespace
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
index 09dca944eabb..1cb8bc6b1b43 100644
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -478,12 +478,12 @@ ScriptLoader::CreateModuleScript(ModuleLoadRequest* aRequest)
   nsresult rv;
   {
     JSContext* cx = aes.cx();
-    JS::Rooted<JSObject*> module(cx);
+    JS::Rooted<JSScript*> script(cx);
 
     if (aRequest->mWasCompiledOMT) {
-      module = JS::FinishOffThreadModule(cx, aRequest->mOffThreadToken);
+      script = JS::FinishOffThreadModule(cx, aRequest->mOffThreadToken);
       aRequest->mOffThreadToken = nullptr;
-      rv = module ? NS_OK : NS_ERROR_FAILURE;
+      rv = script ? NS_OK : NS_ERROR_FAILURE;
     } else {
       JS::Rooted<JSObject*> global(cx, globalObject->GetGlobalJSObject());
 
@@ -491,17 +491,21 @@ ScriptLoader::CreateModuleScript(ModuleLoadRequest* aRequest)
       rv = FillCompileOptionsForRequest(aes, aRequest, global, &options);
 
       if (NS_SUCCEEDED(rv)) {
-        SourceBufferHolder srcBuf = GetScriptSource(cx, aRequest);
-        rv = nsJSUtils::CompileModule(cx, srcBuf, global, options, &module);
+        auto srcBuf = GetScriptSource(cx, aRequest);
+        if (srcBuf) {
+          rv = nsJSUtils::CompileModule(cx, *srcBuf, global, options, &script);
+        } else {
+          rv = NS_ERROR_OUT_OF_MEMORY;
+        }
       }
     }
 
-    MOZ_ASSERT(NS_SUCCEEDED(rv) == (module != nullptr));
+    MOZ_ASSERT(NS_SUCCEEDED(rv) == (script != nullptr));
 
     RefPtr<ModuleScript> moduleScript = new ModuleScript(this, aRequest->mBaseURL);
     aRequest->mModuleScript = moduleScript;
 
-    if (!module) {
+    if (!script) {
       LOG(("ScriptLoadRequest (%p):   compilation failed (%d)",
            aRequest, unsigned(rv)));
 
@@ -517,7 +521,7 @@ ScriptLoader::CreateModuleScript(ModuleLoadRequest* aRequest)
       return NS_OK;
     }
 
-    moduleScript->SetModuleRecord(module);
+    moduleScript->SetScript(script);
 
     // Validate requested modules and treat failure to resolve module specifiers
     // the same as a parse error.
@@ -610,14 +614,14 @@ ResolveRequestedModules(ModuleLoadRequest* aRequest, nsCOMArray<nsIURI>* aUrlsOu
   ModuleScript* ms = aRequest->mModuleScript;
 
   AutoJSAPI jsapi;
-  if (!jsapi.Init(ms->ModuleRecord())) {
+  if (!jsapi.Init(JS::GetScriptGlobal(ms->Script()))) {
     return NS_ERROR_FAILURE;
   }
 
   JSContext* cx = jsapi.cx();
-  JS::Rooted<JSObject*> moduleRecord(cx, ms->ModuleRecord());
+  JS::Rooted<JSScript*> script(cx, ms->Script());
   JS::Rooted<JSObject*> requestedModules(cx);
-  requestedModules = JS::GetRequestedModules(cx, moduleRecord);
+  requestedModules = JS::GetRequestedModules(cx, script);
   MOZ_ASSERT(requestedModules);
 
   uint32_t length;
@@ -751,14 +755,14 @@ ScriptLoader::StartFetchingModuleAndDependencies(ModuleLoadRequest* aParent,
 }
 
 // 8.1.3.8.1 HostResolveImportedModule(referencingModule, specifier)
-JSObject*
-HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule,
+JSScript*
+HostResolveImportedModule(JSContext* aCx, JS::Handle<JSScript*> aScript,
                           JS::Handle<JSString*> aSpecifier)
 {
   // Let referencing module script be referencingModule.[[HostDefined]].
-  JS::Value value = JS::GetModuleHostDefinedField(aModule);
+  JS::Value value = JS::GetModuleHostDefinedField(aScript);
   auto script = static_cast<ModuleScript*>(value.toPrivate());
-  MOZ_ASSERT(script->ModuleRecord() == aModule);
+  MOZ_ASSERT(script->Script() == aScript);
 
   // Let url be the result of resolving a module specifier given referencing
   // module script and specifier.
@@ -779,25 +783,25 @@ HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule,
   MOZ_ASSERT(ms, "Resolved module not found in module map");
 
   MOZ_ASSERT(!ms->HasParseError());
-  MOZ_ASSERT(ms->ModuleRecord());
+  MOZ_ASSERT(ms->Script());
 
-  return ms->ModuleRecord();
+  return ms->Script();
 }
 
 bool
-HostPopulateImportMeta(JSContext* aCx, JS::Handle<JSObject*> aModule,
+HostPopulateImportMeta(JSContext* aCx, JS::Handle<JSScript*> aScript,
                        JS::Handle<JSObject*> aMetaObject)
 {
-  MOZ_DIAGNOSTIC_ASSERT(aModule);
+  MOZ_DIAGNOSTIC_ASSERT(aScript);
 
-  JS::Value value = JS::GetModuleHostDefinedField(aModule);
+  JS::Value value = JS::GetModuleHostDefinedField(aScript);
   if (value.isUndefined()) {
     JS_ReportErrorASCII(aCx, "Module script not found");
     return false;
   }
 
   auto script = static_cast<ModuleScript*>(value.toPrivate());
-  MOZ_DIAGNOSTIC_ASSERT(script->ModuleRecord() == aModule);
+  MOZ_DIAGNOSTIC_ASSERT(script->Script() == aScript);
 
   nsAutoCString url;
   MOZ_DIAGNOSTIC_ASSERT(script->BaseURL());
@@ -928,18 +932,18 @@ ScriptLoader::InstantiateModuleTree(ModuleLoadRequest* aRequest)
     return true;
   }
 
-  MOZ_ASSERT(moduleScript->ModuleRecord());
+  MOZ_ASSERT(moduleScript->Script());
 
   nsAutoMicroTask mt;
   AutoJSAPI jsapi;
-  if (NS_WARN_IF(!jsapi.Init(moduleScript->ModuleRecord()))) {
+  if (NS_WARN_IF(!jsapi.Init(JS::GetScriptGlobal(moduleScript->Script())))) {
     return false;
   }
 
   EnsureModuleResolveHook(jsapi.cx());
 
-  JS::Rooted<JSObject*> module(jsapi.cx(), moduleScript->ModuleRecord());
-  bool ok = NS_SUCCEEDED(nsJSUtils::ModuleInstantiate(jsapi.cx(), module));
+  JS::Rooted<JSScript*> script(jsapi.cx(), moduleScript->Script());
+  bool ok = NS_SUCCEEDED(nsJSUtils::ModuleInstantiate(jsapi.cx(), script));
 
   if (!ok) {
     LOG(("ScriptLoadRequest (%p): Instantiate failed", aRequest));
@@ -1824,11 +1828,11 @@ ScriptLoader::AttemptAsyncScriptCompile(ScriptLoadRequest* aRequest,
 
   if (aRequest->IsModuleRequest()) {
     MOZ_ASSERT(aRequest->IsTextSource());
-    SourceBufferHolder srcBuf = GetScriptSource(cx, aRequest);
-    if (!JS::CompileOffThreadModule(cx, options,
-                                    srcBuf,
-                                    OffThreadScriptLoaderCallback,
-                                    static_cast<void*>(runnable))) {
+    auto srcBuf = GetScriptSource(cx, aRequest);
+    if (!srcBuf || !JS::CompileOffThreadModule(cx, options,
+                                               *srcBuf,
+                                               OffThreadScriptLoaderCallback,
+                                               static_cast<void*>(runnable))) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
   } else if (aRequest->IsBytecode()) {
@@ -1852,11 +1856,11 @@ ScriptLoader::AttemptAsyncScriptCompile(ScriptLoadRequest* aRequest,
 #endif
   } else {
     MOZ_ASSERT(aRequest->IsTextSource());
-    SourceBufferHolder srcBuf = GetScriptSource(cx, aRequest);
-    if (!JS::CompileOffThread(cx, options,
-                              srcBuf,
-                              OffThreadScriptLoaderCallback,
-                              static_cast<void*>(runnable))) {
+    auto srcBuf = GetScriptSource(cx, aRequest);
+    if (!srcBuf || !JS::CompileOffThread(cx, options,
+                                         *srcBuf,
+                                         OffThreadScriptLoaderCallback,
+                                         static_cast<void*>(runnable))) {
       return NS_ERROR_OUT_OF_MEMORY;
     }
   }
@@ -1896,7 +1900,7 @@ ScriptLoader::CompileOffThreadOrProcessRequest(ScriptLoadRequest* aRequest)
   return ProcessRequest(aRequest);
 }
 
-SourceBufferHolder
+mozilla::Maybe<SourceBufferHolder>
 ScriptLoader::GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest)
 {
   // Return a SourceBufferHolder object holding the script's source text.
@@ -1909,15 +1913,17 @@ ScriptLoader::GetScriptSource(JSContext* aCx, ScriptLoadRequest* aRequest)
 
     size_t nbytes = inlineData.Length() * sizeof(char16_t);
     JS::UniqueTwoByteChars chars(static_cast<char16_t*>(JS_malloc(aCx, nbytes)));
-    MOZ_RELEASE_ASSERT(chars);
+    if (!chars) {
+      return Nothing();
+    }
+
     memcpy(chars.get(), inlineData.get(), nbytes);
-    return SourceBufferHolder(std::move(chars), inlineData.Length());
+    return Some(SourceBufferHolder(std::move(chars), inlineData.Length()));
   }
 
   size_t length = aRequest->ScriptText().length();
-  return SourceBufferHolder(aRequest->ScriptText().extractOrCopyRawBuffer(),
-                            length,
-                            SourceBufferHolder::GiveOwnership);
+  JS::UniqueTwoByteChars chars(aRequest->ScriptText().extractOrCopyRawBuffer());
+  return Some(SourceBufferHolder(std::move(chars), length));
 }
 
 nsresult
@@ -2297,20 +2303,19 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
         return NS_OK; // An error is reported by AutoEntryScript.
       }
 
-      JS::Rooted<JSObject*> module(cx, moduleScript->ModuleRecord());
-      MOZ_ASSERT(module);
+      JS::Rooted<JSScript*> script(cx, moduleScript->Script());
+      MOZ_ASSERT(script);
 
       if (!moduleScript->SourceElementAssociated()) {
-        rv = nsJSUtils::InitModuleSourceElement(cx, module, aRequest->Element());
+        rv = nsJSUtils::InitModuleSourceElement(cx, script, aRequest->Element());
         NS_ENSURE_SUCCESS(rv, rv);
         moduleScript->SetSourceElementAssociated();
 
         // The script is now ready to be exposed to the debugger.
-        JS::Rooted<JSScript*> script(cx, JS::GetModuleScript(module));
         JS::ExposeScriptToDebugger(cx, script);
       }
 
-      rv = nsJSUtils::ModuleEvaluate(cx, module);
+      rv = nsJSUtils::ModuleEvaluate(cx, script);
       MOZ_ASSERT(NS_FAILED(rv) == aes.HasException());
       if (NS_FAILED(rv)) {
         LOG(("ScriptLoadRequest (%p):   evaluation failed", aRequest));
@@ -2369,14 +2374,17 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
                                               &script);
               } else {
                 MOZ_ASSERT(aRequest->IsTextSource());
-                SourceBufferHolder srcBuf = GetScriptSource(cx, aRequest);
+                auto srcBuf = GetScriptSource(cx, aRequest);
 
-                if (recordreplay::IsRecordingOrReplaying()) {
-                  recordreplay::NoteContentParse(this, options.filename(), "application/javascript",
-                                                 srcBuf.get(), srcBuf.length());
+                if (srcBuf) {
+                  if (recordreplay::IsRecordingOrReplaying()) {
+                    recordreplay::NoteContentParse(this, options.filename(), "application/javascript",
+                                                   srcBuf->get(), srcBuf->length());
+                  }
+                  rv = exec.CompileAndExec(options, *srcBuf, &script);
+                } else {
+                  rv = NS_ERROR_OUT_OF_MEMORY;
                 }
-
-                rv = exec.CompileAndExec(options, srcBuf, &script);
               }
             }
           }
diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h
index 92e3cc08f149..d1189ced936a 100644
--- a/dom/script/ScriptLoader.h
+++ b/dom/script/ScriptLoader.h
@@ -24,6 +24,7 @@
 #include "mozilla/dom/ScriptLoadRequest.h"
 #include "mozilla/dom/SRIMetadata.h"
 #include "mozilla/dom/SRICheck.h"
+#include "mozilla/Maybe.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/net/ReferrerPolicy.h"
 #include "mozilla/Vector.h"
@@ -506,8 +507,8 @@ private:
 
   void MaybeMoveToLoadedList(ScriptLoadRequest* aRequest);
 
-  JS::SourceBufferHolder GetScriptSource(JSContext* aCx,
-                                         ScriptLoadRequest* aRequest);
+  mozilla::Maybe<JS::SourceBufferHolder> GetScriptSource(JSContext* aCx,
+                                                         ScriptLoadRequest* aRequest);
 
   void SetModuleFetchStarted(ModuleLoadRequest *aRequest);
   void SetModuleFetchFinishedAndResumeWaitingRequests(ModuleLoadRequest* aRequest,
@@ -519,8 +520,8 @@ private:
   RefPtr<mozilla::GenericPromise> WaitForModuleFetch(nsIURI* aURL);
   ModuleScript* GetFetchedModule(nsIURI* aURL) const;
 
-  friend JSObject*
-  HostResolveImportedModule(JSContext* aCx, JS::Handle<JSObject*> aModule,
+  friend JSScript*
+  HostResolveImportedModule(JSContext* aCx, JS::Handle<JSScript*> aScript,
                           JS::Handle<JSString*> aSpecifier);
 
   // Returns wether we should save the bytecode of this script after the
diff --git a/dom/svg/SVGImageElement.cpp b/dom/svg/SVGImageElement.cpp
index deb58be89897..1da6f36ea90c 100644
--- a/dom/svg/SVGImageElement.cpp
+++ b/dom/svg/SVGImageElement.cpp
@@ -114,6 +114,12 @@ SVGImageElement::Href()
          : mStringAttributes[XLINK_HREF].ToDOMAnimatedString(this);
 }
 
+void
+SVGImageElement::GetDecoding(nsAString& aValue)
+{
+  GetEnumAttr(nsGkAtoms::decoding, kDecodingTableDefault->tag, aValue);
+}
+
 //----------------------------------------------------------------------
 
 nsresult
@@ -152,6 +158,24 @@ SVGImageElement::AsyncEventRunning(AsyncEventDispatcher* aEvent)
 //----------------------------------------------------------------------
 // nsIContent methods:
 
+bool
+SVGImageElement::ParseAttribute(int32_t aNamespaceID,
+                                 nsAtom* aAttribute,
+                                 const nsAString& aValue,
+                                 nsIPrincipal* aMaybeScriptedPrincipal,
+                                 nsAttrValue& aResult)
+{
+  if (aNamespaceID == kNameSpaceID_None) {
+    if (aAttribute == nsGkAtoms::decoding) {
+      return aResult.ParseEnumValue(aValue, kDecodingTable, false,
+                                    kDecodingTableDefault);
+    }
+  }
+
+  return SVGImageElementBase::ParseAttribute(aNamespaceID, aAttribute, aValue,
+                                             aMaybeScriptedPrincipal, aResult);
+}
+
 nsresult
 SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
                               const nsAttrValue* aValue,
@@ -168,6 +192,12 @@ SVGImageElement::AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
     } else {
       CancelImageRequests(aNotify);
     }
+  } else if (aName == nsGkAtoms::decoding &&
+             aNamespaceID == kNameSpaceID_None) {
+    // Request sync or async image decoding.
+    SetSyncDecodingHint(aValue &&
+                        static_cast<ImageDecodingType>(aValue->GetEnumValue())
+                          == ImageDecodingType::Sync);
   }
   return SVGImageElementBase::AfterSetAttr(aNamespaceID, aName,
                                            aValue, aOldValue,
diff --git a/dom/svg/SVGImageElement.h b/dom/svg/SVGImageElement.h
index 83a85d0a4ef9..c2ee0532e314 100644
--- a/dom/svg/SVGImageElement.h
+++ b/dom/svg/SVGImageElement.h
@@ -45,6 +45,11 @@ public:
   virtual void AsyncEventRunning(AsyncEventDispatcher* aEvent) override;
 
   // nsIContent interface
+  bool ParseAttribute(int32_t aNamespaceID,
+                      nsAtom* aAttribute,
+                      const nsAString& aValue,
+                      nsIPrincipal* aMaybeScriptedPrincipal,
+                      nsAttrValue& aResult) override;
   virtual nsresult AfterSetAttr(int32_t aNamespaceID, nsAtom* aName,
                                 const nsAttrValue* aValue,
                                 const nsAttrValue* aOldValue,
@@ -81,6 +86,12 @@ public:
   already_AddRefed<DOMSVGAnimatedPreserveAspectRatio> PreserveAspectRatio();
   already_AddRefed<SVGAnimatedString> Href();
 
+  void SetDecoding(const nsAString& aDecoding, ErrorResult& aError)
+  {
+    SetAttr(nsGkAtoms::decoding, aDecoding, aError);
+  }
+  void GetDecoding(nsAString& aValue);
+
 protected:
   nsresult LoadSVGImage(bool aForce, bool aNotify);
 
diff --git a/dom/url/moz.build b/dom/url/moz.build
index 45d33a449295..2c8545912907 100644
--- a/dom/url/moz.build
+++ b/dom/url/moz.build
@@ -30,6 +30,3 @@ BROWSER_CHROME_MANIFESTS += [ 'tests/browser.ini' ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/dom/webidl/Document.webidl b/dom/webidl/Document.webidl
index 6022e5f2f9a4..5c7587e57a97 100644
--- a/dom/webidl/Document.webidl
+++ b/dom/webidl/Document.webidl
@@ -407,6 +407,11 @@ partial interface Document {
   [ChromeOnly, Throws]
   readonly attribute Promise<Document> documentReadyForIdle;
 
+  // Lazily created command dispatcher, returns null if the document is not
+  // chrome privileged.
+  [ChromeOnly]
+  readonly attribute XULCommandDispatcher? commandDispatcher;
+
   [ChromeOnly]
   attribute Node? popupNode;
 
diff --git a/dom/webidl/HTMLImageElement.webidl b/dom/webidl/HTMLImageElement.webidl
index 42664c65064b..ae91af091c57 100644
--- a/dom/webidl/HTMLImageElement.webidl
+++ b/dom/webidl/HTMLImageElement.webidl
@@ -37,6 +37,8 @@ interface HTMLImageElement : HTMLElement {
            attribute unsigned long width;
            [CEReactions, SetterThrows]
            attribute unsigned long height;
+           [CEReactions, SetterThrows]
+           attribute DOMString decoding;
   readonly attribute unsigned long naturalWidth;
   readonly attribute unsigned long naturalHeight;
   readonly attribute boolean complete;
diff --git a/dom/webidl/SVGImageElement.webidl b/dom/webidl/SVGImageElement.webidl
index 67dab60f58cb..4ba236bed470 100644
--- a/dom/webidl/SVGImageElement.webidl
+++ b/dom/webidl/SVGImageElement.webidl
@@ -21,6 +21,8 @@ interface SVGImageElement : SVGGraphicsElement {
   readonly attribute SVGAnimatedLength height;
   [Constant]
   readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
+  [CEReactions, SetterThrows]
+  attribute DOMString decoding;
 };
 
 SVGImageElement implements MozImageLoadingContent;
diff --git a/dom/webidl/TextDecoder.webidl b/dom/webidl/TextDecoder.webidl
index 3fff4a2553f2..9246c2a3207d 100644
--- a/dom/webidl/TextDecoder.webidl
+++ b/dom/webidl/TextDecoder.webidl
@@ -17,12 +17,15 @@ interface TextDecoder {
   readonly attribute DOMString encoding;
   [Constant]
   readonly attribute boolean fatal;
+  [Constant]
+  readonly attribute boolean ignoreBOM;
   [Throws]
   USVString decode(optional BufferSource input, optional TextDecodeOptions options);
 };
 
 dictionary TextDecoderOptions {
   boolean fatal = false;
+  boolean ignoreBOM = false;
 };
 
 dictionary TextDecodeOptions {
diff --git a/dom/webidl/TreeBoxObject.webidl b/dom/webidl/TreeBoxObject.webidl
index 397e2b8cb40b..125361fbf734 100644
--- a/dom/webidl/TreeBoxObject.webidl
+++ b/dom/webidl/TreeBoxObject.webidl
@@ -6,7 +6,6 @@
  */
 
 interface MozTreeView;
-interface nsIScriptableRegion;
 
 dictionary TreeCellInfo {
     long row = 0;
@@ -55,11 +54,6 @@ interface TreeBoxObject : BoxObject {
    */
   readonly attribute long horizontalPosition;
 
-  /**
-   * Return the region for the visible parts of the selection, in device pixels
-   */
-  readonly attribute nsIScriptableRegion selectionRegion;
-
   /**
    * Get the index of the first visible row.
    */
diff --git a/dom/webidl/XULDocument.webidl b/dom/webidl/XULDocument.webidl
index 6b157dec3bb9..52235d38a8a3 100644
--- a/dom/webidl/XULDocument.webidl
+++ b/dom/webidl/XULDocument.webidl
@@ -10,8 +10,6 @@ interface MozObserver;
 [Func="IsChromeOrXBL"]
 interface XULDocument : Document {
 
-  readonly attribute XULCommandDispatcher? commandDispatcher;
-
   [Throws]
   void addBroadcastListenerFor(Element broadcaster, Element observer,
                                DOMString attr);
diff --git a/dom/xul/XULDocument.cpp b/dom/xul/XULDocument.cpp
index 61fe7f1b1b76..219d05025958 100644
--- a/dom/xul/XULDocument.cpp
+++ b/dom/xul/XULDocument.cpp
@@ -47,7 +47,6 @@
 #include "nsString.h"
 #include "nsPIDOMWindow.h"
 #include "nsPIWindowRoot.h"
-#include "nsXULCommandDispatcher.h"
 #include "nsXULElement.h"
 #include "nsXULPrototypeCache.h"
 #include "mozilla/Logging.h"
@@ -235,14 +234,12 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(XULDocument, XMLDocument)
     // XXX tmp->mContextStack?
 
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCurrentPrototype)
-    NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCommandDispatcher)
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrototypes)
     NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLocalStore)
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(XULDocument, XMLDocument)
-    NS_IMPL_CYCLE_COLLECTION_UNLINK(mCommandDispatcher)
     NS_IMPL_CYCLE_COLLECTION_UNLINK(mLocalStore)
     //XXX We should probably unlink all the objects we traverse.
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -1019,16 +1016,7 @@ XULDocument::AddElementToDocumentPre(Element* aElement)
         AddToIdTable(aElement, id);
     }
 
-    // 2. If the element is a 'command updater' (i.e., has a
-    // "commandupdater='true'" attribute), then add the element to the
-    // document's command dispatcher
-    if (aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::commandupdater,
-                              nsGkAtoms::_true, eCaseMatters)) {
-        rv = nsXULContentUtils::SetCommandUpdater(this, aElement);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    // 3. Check for a broadcaster hookup attribute, in which case
+    // 2. Check for a broadcaster hookup attribute, in which case
     // we'll hook the node up as a listener on a broadcaster.
     bool listener, resolved;
     rv = CheckBroadcasterHookup(aElement, &listener, &resolved);
@@ -1106,7 +1094,7 @@ XULDocument::RemoveSubtreeFromDocument(nsIContent* aContent)
         nsXBLService::DetachGlobalKeyHandler(aElement);
     }
 
-    // 1. Remove any children from the document.
+    // Remove any children from the document.
     for (nsIContent* child = aElement->GetLastChild();
          child;
          child = child->GetPreviousSibling()) {
@@ -1125,15 +1113,7 @@ XULDocument::RemoveSubtreeFromDocument(nsIContent* aContent)
         RemoveFromIdTable(aElement, id);
     }
 
-    // 3. If the element is a 'command updater', then remove the
-    // element from the document's command dispatcher.
-    if (aElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::commandupdater,
-                              nsGkAtoms::_true, eCaseMatters)) {
-        rv = mCommandDispatcher->RemoveCommandUpdater(aElement);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    // 4. Remove the element from our broadcaster map, since it is no longer
+    // Remove the element from our broadcaster map, since it is no longer
     // in the document.
     nsCOMPtr<Element> broadcaster, listener;
     nsAutoString attribute, broadcasterID;
@@ -1171,9 +1151,6 @@ XULDocument::Init()
     nsresult rv = XMLDocument::Init();
     NS_ENSURE_SUCCESS(rv, rv);
 
-    // Create our command dispatcher and hook it up.
-    mCommandDispatcher = new nsXULCommandDispatcher(this);
-
     if (gRefCnt++ == 0) {
         // ensure that the XUL prototype cache is instantiated successfully,
         // so that we can use nsXULPrototypeCache::GetInstance() without
diff --git a/dom/xul/XULDocument.h b/dom/xul/XULDocument.h
index 697cc4ea01f3..2887bed4253e 100644
--- a/dom/xul/XULDocument.h
+++ b/dom/xul/XULDocument.h
@@ -15,7 +15,6 @@
 #include "mozilla/StyleSheet.h"
 #include "nsForwardReference.h"
 #include "nsIContent.h"
-#include "nsIDOMXULCommandDispatcher.h"
 #include "nsCOMArray.h"
 #include "nsIURI.h"
 #include "nsIStreamListener.h"
@@ -136,10 +135,6 @@ public:
     void TraceProtos(JSTracer* aTrc);
 
     // WebIDL API
-    nsIDOMXULCommandDispatcher* GetCommandDispatcher() const
-    {
-        return mCommandDispatcher;
-    }
     void AddBroadcastListenerFor(Element& aBroadcaster, Element& aListener,
                                  const nsAString& aAttr, ErrorResult& aRv);
     void RemoveBroadcastListenerFor(Element& aBroadcaster, Element& aListener,
@@ -220,8 +215,6 @@ protected:
      */
     bool                       mStillWalking;
 
-    nsCOMPtr<nsIDOMXULCommandDispatcher>     mCommandDispatcher; // [OWNER] of the focus tracker
-
     uint32_t mPendingSheets;
 
     /**
diff --git a/dom/xul/moz.build b/dom/xul/moz.build
index 0e920753292f..c01839113caf 100644
--- a/dom/xul/moz.build
+++ b/dom/xul/moz.build
@@ -16,6 +16,7 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 if CONFIG['MOZ_XUL']:
     EXPORTS += [
+        'nsXULCommandDispatcher.h',
         'nsXULElement.h',
     ]
 
diff --git a/dom/xul/nsXULContentUtils.cpp b/dom/xul/nsXULContentUtils.cpp
index bb97f37cca7e..b776e3f87fbf 100644
--- a/dom/xul/nsXULContentUtils.cpp
+++ b/dom/xul/nsXULContentUtils.cpp
@@ -86,48 +86,3 @@ nsXULContentUtils::FindChildByTag(nsIContent* aElement,
     *aResult = nullptr;
     return NS_RDF_NO_VALUE; // not found
 }
-
-nsresult
-nsXULContentUtils::SetCommandUpdater(nsIDocument* aDocument, Element* aElement)
-{
-    // Deal with setting up a 'commandupdater'. Pulls the 'events' and
-    // 'targets' attributes off of aElement, and adds it to the
-    // document's command dispatcher.
-    MOZ_ASSERT(aDocument != nullptr, "null ptr");
-    if (! aDocument)
-        return NS_ERROR_NULL_POINTER;
-
-    MOZ_ASSERT(aElement != nullptr, "null ptr");
-    if (! aElement)
-        return NS_ERROR_NULL_POINTER;
-
-    nsresult rv;
-
-    NS_ASSERTION(aDocument->IsXULDocument(), "not a xul document");
-    if (! aDocument->IsXULDocument())
-        return NS_ERROR_UNEXPECTED;
-
-    XULDocument* xuldoc = aDocument->AsXULDocument();
-    nsCOMPtr<nsIDOMXULCommandDispatcher> dispatcher =
-        xuldoc->GetCommandDispatcher();
-    NS_ASSERTION(dispatcher != nullptr, "no dispatcher");
-    if (! dispatcher)
-        return NS_ERROR_UNEXPECTED;
-
-    nsAutoString events;
-    aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::events, events);
-    if (events.IsEmpty())
-        events.Assign('*');
-
-    nsAutoString targets;
-    aElement->GetAttr(kNameSpaceID_None, nsGkAtoms::targets, targets);
-
-    if (targets.IsEmpty())
-        targets.Assign('*');
-
-    rv = dispatcher->AddCommandUpdater(aElement, events, targets);
-    if (NS_FAILED(rv)) return rv;
-
-    return NS_OK;
-}
-
diff --git a/dom/xul/nsXULContentUtils.h b/dom/xul/nsXULContentUtils.h
index 2635d9df2cd9..ab9db0783a2b 100644
--- a/dom/xul/nsXULContentUtils.h
+++ b/dom/xul/nsXULContentUtils.h
@@ -45,9 +45,6 @@ public:
                    nsAtom* aTag,
                    mozilla::dom::Element** aResult);
 
-    static nsresult
-    SetCommandUpdater(nsIDocument* aDocument, mozilla::dom::Element* aElement);
-
     static nsICollation*
     GetCollation();
 };
diff --git a/gfx/2d/RectAbsolute.h b/gfx/2d/RectAbsolute.h
index 90c9be7a97a7..95933037c07c 100644
--- a/gfx/2d/RectAbsolute.h
+++ b/gfx/2d/RectAbsolute.h
@@ -56,6 +56,16 @@ public:
   MOZ_ALWAYS_INLINE T& Right() { return right; }
   MOZ_ALWAYS_INLINE T& Top() { return top; }
   MOZ_ALWAYS_INLINE T& Bottom() { return bottom; }
+  T Area() const { return Width() * Height(); }
+
+  void Inflate(T aD) { Inflate(aD, aD); }
+  void Inflate(T aDx, T aDy)
+  {
+    left -= aDx;
+    top -= aDy;
+    right += aDx;
+    bottom += aDy;
+  }
 
   MOZ_ALWAYS_INLINE void SetBox(T aLeft, T aTop, T aRight, T aBottom)
   {
@@ -80,7 +90,9 @@ public:
 
   static Sub FromRect(const Rect& aRect)
   {
-    MOZ_ASSERT(!aRect.Overflows());
+    if (aRect.Overflows()) {
+      return Sub();
+    }
     return Sub(aRect.x, aRect.y, aRect.XMost(), aRect.YMost());
   }
 
@@ -91,6 +103,9 @@ public:
     result.top = std::max<T>(top, aOther.top);
     result.right = std::min<T>(right, aOther.right);
     result.bottom = std::min<T>(bottom, aOther.bottom);
+    if (result.right < result.left || result.bottom < result.top) {
+      result.SizeTo(0, 0);
+    }
     return result;
   }
 
@@ -103,6 +118,137 @@ public:
     return left == aOther.left && top == aOther.top &&
            right == aOther.right && bottom == aOther.bottom;
   }
+
+  bool IsEqualInterior(const Sub& aRect) const
+  {
+    return IsEqualEdges(aRect) || (IsEmpty() && aRect.IsEmpty());
+  }
+
+  MOZ_ALWAYS_INLINE void MoveBy(T aDx, T aDy) { left += aDx; right += aDx; top += aDy; bottom += aDy; }
+  MOZ_ALWAYS_INLINE void MoveBy(const Point& aPoint) { left += aPoint.x; right += aPoint.x; top += aPoint.y; bottom += aPoint.y; }
+  MOZ_ALWAYS_INLINE void SizeTo(T aWidth, T aHeight) { right = left + aWidth; bottom = top + aHeight; }
+
+  bool Contains(const Sub& aRect) const
+  {
+    return aRect.IsEmpty() ||
+      (left <= aRect.left && aRect.right <= right &&
+       top <= aRect.top && aRect.bottom <= bottom);
+  }
+  bool Contains(T aX, T aY) const
+  {
+    return (left <= aX && aX < right &&
+            top <= aY && aY < bottom);
+  }
+
+  bool Intersects(const Sub& aRect) const
+  {
+    return !IsEmpty() && !aRect.IsEmpty() &&
+      left < aRect.right && aRect.left < right &&
+      top < aRect.bottom && aRect.top < bottom;
+  }
+
+  void SetEmpty() {
+    left = right = top = bottom = 0;
+  }
+
+  // Returns the smallest rectangle that contains both the area of both
+  // this and aRect2.
+  // Thus, empty input rectangles are ignored.
+  // If both rectangles are empty, returns this.
+  // WARNING! This is not safe against overflow, prefer using SafeUnion instead
+  // when dealing with int-based rects.
+  MOZ_MUST_USE Sub Union(const Sub& aRect) const
+  {
+    if (IsEmpty()) {
+      return aRect;
+    } else if (aRect.IsEmpty()) {
+      return *static_cast<const Sub*>(this);
+    } else {
+      return UnionEdges(aRect);
+    }
+  }
+  // Returns the smallest rectangle that contains both the points (including
+  // edges) of both aRect1 and aRect2.
+  // Thus, empty input rectangles are allowed to affect the result.
+  // WARNING! This is not safe against overflow, prefer using SafeUnionEdges
+  // instead when dealing with int-based rects.
+  MOZ_MUST_USE Sub UnionEdges(const Sub& aRect) const
+  {
+    Sub result;
+    result.left = std::min(left, aRect.left);
+    result.top = std::min(top, aRect.top);
+    result.right = std::max(XMost(), aRect.XMost());
+    result.bottom = std::max(YMost(), aRect.YMost());
+    return result;
+  }
+
+  // Scale 'this' by aScale without doing any rounding.
+  void Scale(T aScale) { Scale(aScale, aScale); }
+  // Scale 'this' by aXScale and aYScale, without doing any rounding.
+  void Scale(T aXScale, T aYScale)
+  {
+    right = XMost() * aXScale;
+    bottom = YMost() * aYScale;
+    left = left * aXScale;
+    top = top * aYScale;
+  }
+  // Scale 'this' by aScale, converting coordinates to integers so that the result is
+  // the smallest integer-coordinate rectangle containing the unrounded result.
+  // Note: this can turn an empty rectangle into a non-empty rectangle
+  void ScaleRoundOut(double aScale) { ScaleRoundOut(aScale, aScale); }
+  // Scale 'this' by aXScale and aYScale, converting coordinates to integers so
+  // that the result is the smallest integer-coordinate rectangle containing the
+  // unrounded result.
+  // Note: this can turn an empty rectangle into a non-empty rectangle
+  void ScaleRoundOut(double aXScale, double aYScale)
+  {
+    right = static_cast<T>(ceil(double(XMost()) * aXScale));
+    bottom = static_cast<T>(ceil(double(YMost()) * aYScale));
+    left = static_cast<T>(floor(double(left) * aXScale));
+    top = static_cast<T>(floor(double(top) * aYScale));
+  }
+  // Scale 'this' by aScale, converting coordinates to integers so that the result is
+  // the largest integer-coordinate rectangle contained by the unrounded result.
+  void ScaleRoundIn(double aScale) { ScaleRoundIn(aScale, aScale); }
+  // Scale 'this' by aXScale and aYScale, converting coordinates to integers so
+  // that the result is the largest integer-coordinate rectangle contained by the
+  // unrounded result.
+  void ScaleRoundIn(double aXScale, double aYScale)
+  {
+    right = static_cast<T>(floor(double(XMost()) * aXScale));
+    bottom = static_cast<T>(floor(double(YMost()) * aYScale));
+    left = static_cast<T>(ceil(double(left) * aXScale));
+    top = static_cast<T>(ceil(double(top) * aYScale));
+  }
+  // Scale 'this' by 1/aScale, converting coordinates to integers so that the result is
+  // the smallest integer-coordinate rectangle containing the unrounded result.
+  // Note: this can turn an empty rectangle into a non-empty rectangle
+  void ScaleInverseRoundOut(double aScale) { ScaleInverseRoundOut(aScale, aScale); }
+  // Scale 'this' by 1/aXScale and 1/aYScale, converting coordinates to integers so
+  // that the result is the smallest integer-coordinate rectangle containing the
+  // unrounded result.
+  // Note: this can turn an empty rectangle into a non-empty rectangle
+  void ScaleInverseRoundOut(double aXScale, double aYScale)
+  {
+    right = static_cast<T>(ceil(double(XMost()) / aXScale));
+    bottom = static_cast<T>(ceil(double(YMost()) / aYScale));
+    left = static_cast<T>(floor(double(left) / aXScale));
+    top = static_cast<T>(floor(double(top) / aYScale));
+  }
+  // Scale 'this' by 1/aScale, converting coordinates to integers so that the result is
+  // the largest integer-coordinate rectangle contained by the unrounded result.
+  void ScaleInverseRoundIn(double aScale) { ScaleInverseRoundIn(aScale, aScale); }
+  // Scale 'this' by 1/aXScale and 1/aYScale, converting coordinates to integers so
+  // that the result is the largest integer-coordinate rectangle contained by the
+  // unrounded result.
+  void ScaleInverseRoundIn(double aXScale, double aYScale)
+  {
+    right = static_cast<T>(floor(double(XMost()) / aXScale));
+    bottom = static_cast<T>(floor(double(YMost()) / aYScale));
+    left = static_cast<T>(ceil(double(left) / aXScale));
+    top = static_cast<T>(ceil(double(top) / aYScale));
+  }
+
 };
 
 template <class Units>
diff --git a/gfx/ots/README.mozilla b/gfx/ots/README.mozilla
index f958c4d3d9b1..d4b8a8d8f10a 100644
--- a/gfx/ots/README.mozilla
+++ b/gfx/ots/README.mozilla
@@ -2,7 +2,7 @@ This is the Sanitiser for OpenType project, from http://code.google.com/p/ots/.
 
 Our reference repository is https://github.com/khaledhosny/ots/.
 
-Current revision: 7c8f3fc9cf8b79edb241d94a4847968a5009e78d (7.0.0)
+Current revision: b2d8733abf5b141f20881b071b68d2dbe73c5baf (7.1.7)
 
 Upstream files included: LICENSE, src/, include/, tests/*.cc
 
diff --git a/gfx/ots/ots-lz4.patch b/gfx/ots/ots-lz4.patch
index a3f8fa210cb4..01806b90fd16 100644
--- a/gfx/ots/ots-lz4.patch
+++ b/gfx/ots/ots-lz4.patch
@@ -1,7 +1,8 @@
 diff --git a/gfx/ots/src/glat.cc b/gfx/ots/src/glat.cc
 --- a/gfx/ots/src/glat.cc
 +++ b/gfx/ots/src/glat.cc
-@@ -5,7 +5,7 @@
+@@ -4,9 +4,9 @@
+ 
  #include "glat.h"
  
  #include "gloc.h"
@@ -10,7 +11,9 @@ diff --git a/gfx/ots/src/glat.cc b/gfx/ots/src/glat.cc
  #include <list>
  
  namespace ots {
-@@ -201,14 +201,15 @@ bool OpenTypeGLAT_v3::Parse(const uint8_t* data, size_t length,
+ 
+@@ -200,16 +200,17 @@ bool OpenTypeGLAT_v3::Parse(const uint8_
+       if (prevent_decompression) {
          return DropGraphite("Illegal nested compression");
        }
        std::vector<uint8_t> decompressed(this->compHead & FULL_SIZE);
@@ -23,7 +26,7 @@ diff --git a/gfx/ots/src/glat.cc b/gfx/ots/src/glat.cc
 +          reinterpret_cast<char*>(decompressed.data()),
            decompressed.size(),  // target output size
 -          decompressed.size());  // output buffer size
--      if (ret != decompressed.size()) {
+-      if (ret < 0 || unsigned(ret) != decompressed.size()) {
 -        return DropGraphite("Decompression failed with error code %d", ret);
 +          &outputSize);  // return output size
 +      if (!ret || outputSize != decompressed.size()) {
@@ -31,10 +34,12 @@ diff --git a/gfx/ots/src/glat.cc b/gfx/ots/src/glat.cc
        }
        return this->Parse(decompressed.data(), decompressed.size(), true);
      }
+     default:
 diff --git a/gfx/ots/src/silf.cc b/gfx/ots/src/silf.cc
 --- a/gfx/ots/src/silf.cc
 +++ b/gfx/ots/src/silf.cc
-@@ -5,7 +5,7 @@
+@@ -4,9 +4,9 @@
+ 
  #include "silf.h"
  
  #include "name.h"
@@ -43,7 +48,9 @@ diff --git a/gfx/ots/src/silf.cc b/gfx/ots/src/silf.cc
  #include <cmath>
  
  namespace ots {
-@@ -39,14 +39,15 @@ bool OpenTypeSILF::Parse(const uint8_t* data, size_t length,
+ 
+@@ -38,16 +38,17 @@ bool OpenTypeSILF::Parse(const uint8_t* 
+         if (prevent_decompression) {
            return DropGraphite("Illegal nested compression");
          }
          std::vector<uint8_t> decompressed(this->compHead & FULL_SIZE);
@@ -56,7 +63,7 @@ diff --git a/gfx/ots/src/silf.cc b/gfx/ots/src/silf.cc
 +            reinterpret_cast<char*>(decompressed.data()),
              decompressed.size(),  // target output size
 -            decompressed.size());  // output buffer size
--        if (ret != decompressed.size()) {
+-        if (ret < 0 || unsigned(ret) != decompressed.size()) {
 -          return DropGraphite("Decompression failed with error code %d", ret);
 +            &outputSize);   // return output size
 +        if (!ret || outputSize != decompressed.size()) {
@@ -64,3 +71,4 @@ diff --git a/gfx/ots/src/silf.cc b/gfx/ots/src/silf.cc
          }
          return this->Parse(decompressed.data(), decompressed.size(), true);
        }
+       default:
diff --git a/gfx/ots/ots-visibility.patch b/gfx/ots/ots-visibility.patch
index 2bf5033cbe96..c1265472b8ff 100644
--- a/gfx/ots/ots-visibility.patch
+++ b/gfx/ots/ots-visibility.patch
@@ -1,7 +1,8 @@
 diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-sanitiser.h
 --- a/gfx/ots/include/opentype-sanitiser.h
 +++ b/gfx/ots/include/opentype-sanitiser.h
-@@ -5,6 +5,26 @@
+@@ -4,8 +4,28 @@
+ 
  #ifndef OPENTYPE_SANITISER_H_
  #define OPENTYPE_SANITISER_H_
  
@@ -28,7 +29,9 @@ diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-san
  #if defined(_WIN32)
  #include <stdlib.h>
  typedef signed char int8_t;
-@@ -161,7 +181,7 @@ enum TableAction {
+ typedef unsigned char uint8_t;
+@@ -164,9 +184,9 @@ enum TableAction {
+   TABLE_ACTION_PASSTHRU, // Serialize the table unchanged
    TABLE_ACTION_DROP      // Drop the table
  };
  
@@ -37,3 +40,4 @@ diff --git a/gfx/ots/include/opentype-sanitiser.h b/gfx/ots/include/opentype-san
    public:
      OTSContext() {}
      virtual ~OTSContext() {}
+ 
diff --git a/gfx/ots/src/graphite.h b/gfx/ots/src/graphite.h
index 1bd95f5c94a1..452cb26a87b1 100644
--- a/gfx/ots/src/graphite.h
+++ b/gfx/ots/src/graphite.h
@@ -14,6 +14,7 @@ template<typename ParentType>
 class TablePart {
  public:
   TablePart(ParentType* parent) : parent(parent) { }
+  virtual ~TablePart() { }
   virtual bool ParsePart(Buffer& table) = 0;
   virtual bool SerializePart(OTSStream* out) const = 0;
  protected:
diff --git a/gfx/ots/src/layout.cc b/gfx/ots/src/layout.cc
index e7c4f03baad6..1d6aabd5e0d3 100644
--- a/gfx/ots/src/layout.cc
+++ b/gfx/ots/src/layout.cc
@@ -1393,10 +1393,10 @@ bool ParseDeviceTable(const ots::Font *font,
     return true;
   }
   if (start_size > end_size) {
-    return OTS_FAILURE_MSG("bad size range: %u > %u", start_size, end_size);
+    return OTS_FAILURE_MSG("Bad device table size range: %u > %u", start_size, end_size);
   }
   if (delta_format == 0 || delta_format > kMaxDeltaFormatType) {
-    return OTS_FAILURE_MSG("bad delta format: %u", delta_format);
+    return OTS_FAILURE_MSG("Bad device table delta format: 0x%x", delta_format);
   }
   // The number of delta values per uint16. The device table should contain
   // at least |num_units| * 2 bytes compressed data.
diff --git a/gfx/ots/src/os2.cc b/gfx/ots/src/os2.cc
index a2042fc59e08..5376a1dbb1a2 100644
--- a/gfx/ots/src/os2.cc
+++ b/gfx/ots/src/os2.cc
@@ -152,7 +152,7 @@ bool OpenTypeOS2::Parse(const uint8_t *data, size_t length) {
   if ((this->table.version < 4) &&
       (this->table.selection & 0x300)) {
     // bit 8 and 9 must be unset in OS/2 table versions less than 4.
-    Warning("fSelection bits 8 and 9 must be unset for table version %d",
+    Warning("fsSelection bits 8 and 9 must be unset for table version %d",
             this->table.version);
   }
 
diff --git a/gfx/src/nsRect.h b/gfx/src/nsRect.h
index 8895e7fbe20b..55120b62b8de 100644
--- a/gfx/src/nsRect.h
+++ b/gfx/src/nsRect.h
@@ -130,7 +130,7 @@ struct nsRect :
     *this = aRect1.Union(aRect2);
   }
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#if defined(_MSC_VER) && !defined(__clang__) && (defined(_M_X64) || defined(_M_IX86))
   // Only MSVC supports inlining intrinsics for archs you're not compiling for.
   MOZ_MUST_USE nsRect Intersect(const nsRect& aRect) const
   {
diff --git a/gfx/src/nsRectAbsolute.h b/gfx/src/nsRectAbsolute.h
index 2f137677e0cb..3238e53c4f1b 100644
--- a/gfx/src/nsRectAbsolute.h
+++ b/gfx/src/nsRectAbsolute.h
@@ -18,6 +18,39 @@ struct nsRectAbsolute :
   nsRectAbsolute() : Super() {}
   nsRectAbsolute(nscoord aX1, nscoord aY1, nscoord aX2, nscoord aY2) :
       Super(aX1, aY1, aX2, aY2) {}
+
+  MOZ_ALWAYS_INLINE nscoord SafeWidth() const
+  {
+    int64_t width = right;
+    width -= left;
+    return nscoord(std::min<int64_t>(std::numeric_limits<nscoord>::max(), width));
+  }
+  MOZ_ALWAYS_INLINE nscoord SafeHeight() const
+  {
+    int64_t height = bottom;
+    height -= top;
+    return nscoord(std::min<int64_t>(std::numeric_limits<nscoord>::max(), height));
+  }
+
+  nsRect ToNSRect() const
+  {
+    return nsRect(left, top, nscoord(SafeWidth()), nscoord(SafeHeight()));
+  }
+
+  MOZ_MUST_USE nsRectAbsolute UnsafeUnion(const nsRectAbsolute& aRect) const
+  {
+    return Super::Union(aRect);
+  }
+
+  MOZ_ALWAYS_INLINE void MoveBy(const nsPoint& aPoint) { left += aPoint.x; right += aPoint.x; top += aPoint.y; bottom += aPoint.y; }
+
+  void Inflate(const nsMargin& aMargin)
+  {
+    left -= aMargin.left;
+    top -= aMargin.top;
+    right += aMargin.right;
+    bottom += aMargin.bottom;
+  }
 };
 
 #endif /* NSRECTABSOLUTE_H */
diff --git a/gfx/src/nsRegion.cpp b/gfx/src/nsRegion.cpp
index 686427c4aaae..e16ae48a8d21 100644
--- a/gfx/src/nsRegion.cpp
+++ b/gfx/src/nsRegion.cpp
@@ -63,7 +63,7 @@ nsRegion::AssertStateInternal() const
     }
   }
 
-  if (!(mBounds == CalculateBounds())) {
+  if (!(mBounds.IsEqualEdges(CalculateBounds()))) {
     failed = true;
   }
 
@@ -89,7 +89,7 @@ bool nsRegion::Contains(const nsRegion& aRgn) const
   return true;
 }
 
-bool nsRegion::Intersects(const nsRect& aRect) const
+bool nsRegion::Intersects(const nsRectAbsolute& aRect) const
 {
   if (mBands.IsEmpty()) {
     return mBounds.Intersects(aRect);
@@ -130,7 +130,7 @@ void nsRegion::Inflate(const nsMargin& aMargin)
 {
   nsRegion newRegion;
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
-    nsRect rect = iter.Get();
+    nsRectAbsolute rect = iter.GetAbsolute();
     rect.Inflate(aMargin);
     newRegion.AddRect(rect);
   }
@@ -489,7 +489,7 @@ nsRegion& nsRegion::ScaleRoundOut (float aXScale, float aYScale)
 
   nsRegion newRegion;
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
-    nsRect rect = iter.Get();
+    nsRectAbsolute rect = iter.GetAbsolute();
     rect.ScaleRoundOut(aXScale, aYScale);
     newRegion.AddRect(rect);
   }
@@ -502,7 +502,7 @@ nsRegion& nsRegion::ScaleInverseRoundOut (float aXScale, float aYScale)
 {
   nsRegion newRegion;
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
-    nsRect rect = iter.Get();
+    nsRectAbsolute rect = iter.GetAbsolute();
     rect.ScaleInverseRoundOut(aXScale, aYScale);
     newRegion.AddRect(rect);
   }
@@ -535,7 +535,7 @@ nsRegion& nsRegion::Transform (const mozilla::gfx::Matrix4x4 &aTransform)
   nsRegion newRegion;
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
     nsRect rect = nsIntRegion::ToRect(TransformRect(nsIntRegion::FromRect(iter.Get()), aTransform));
-    newRegion.AddRect(rect);
+    newRegion.AddRect(nsRectAbsolute::FromRect(rect));
   }
 
   *this = std::move(newRegion);
@@ -552,7 +552,7 @@ nsRegion nsRegion::ScaleToOtherAppUnitsRoundOut (int32_t aFromAPP, int32_t aToAP
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
     nsRect rect = iter.Get();
     rect = rect.ScaleToOtherAppUnitsRoundOut(aFromAPP, aToAPP);
-    newRegion.AddRect(rect);
+    newRegion.AddRect(nsRectAbsolute::FromRect(rect));
   }
 
   return newRegion;
@@ -568,7 +568,7 @@ nsRegion nsRegion::ScaleToOtherAppUnitsRoundIn (int32_t aFromAPP, int32_t aToAPP
   for (RectIterator iter = RectIterator(*this); !iter.Done(); iter.Next()) {
     nsRect rect = iter.Get();
     rect = rect.ScaleToOtherAppUnitsRoundIn(aFromAPP, aToAPP);
-    newRegion.AddRect(rect);
+    newRegion.AddRect(nsRectAbsolute::FromRect(rect));
   }
 
   return newRegion;
@@ -641,7 +641,7 @@ nsIntRegion nsRegion::ScaleToInsidePixels (float aScaleX, float aScaleY,
    */
 
   if (mBands.IsEmpty()) {
-    nsIntRect rect = mBounds.ScaleToInsidePixels(aScaleX, aScaleY, aAppUnitsPerPixel);
+    nsIntRect rect = mBounds.ToNSRect().ScaleToInsidePixels(aScaleX, aScaleY, aAppUnitsPerPixel);
     return nsIntRegion(rect);
   }
 
diff --git a/gfx/src/nsRegion.h b/gfx/src/nsRegion.h
index f1392ad6ca0e..3048f6e0e980 100644
--- a/gfx/src/nsRegion.h
+++ b/gfx/src/nsRegion.h
@@ -16,6 +16,7 @@
 #include "nsError.h"                    // for nsresult
 #include "nsPoint.h"                    // for nsIntPoint, nsPoint
 #include "nsRect.h"                     // for mozilla::gfx::IntRect, nsRect
+#include "nsRectAbsolute.h"
 #include "nsMargin.h"                   // for nsIntMargin
 #include "nsRegionFwd.h"                // for nsIntRegion
 #include "nsString.h"                   // for nsCString
@@ -120,7 +121,7 @@ struct Band
   using StripArray = AutoTArray<Strip, 2>;
 #endif
 
-  MOZ_IMPLICIT Band(const nsRect& aRect)
+  MOZ_IMPLICIT Band(const nsRectAbsolute& aRect)
     : top(aRect.Y()), bottom(aRect.YMost())
   {
     mStrips.AppendElement(Strip{ aRect.X(), aRect.XMost() });
@@ -511,6 +512,9 @@ public:
 
   nsRegion() { }
   MOZ_IMPLICIT nsRegion(const nsRect& aRect) {
+    mBounds = nsRectAbsolute::FromRect(aRect);
+  }
+  MOZ_IMPLICIT nsRegion(const nsRectAbsolute& aRect) {
     mBounds = aRect;
   }
   explicit nsRegion(mozilla::gfx::ArrayView<pixman_box32_t> aRects)
@@ -701,7 +705,7 @@ public:
 
     mBands = std::move(newBands);
     if (!mBands.Length()) {
-      mBounds = nsRect();
+      mBounds = nsRectAbsolute();
     } else {
       mBounds = CalculateBounds();
     }
@@ -711,13 +715,13 @@ public:
     return *this;
   }
 
-  nsRegion& AndWith(const nsRect& aRect)
+  nsRegion& AndWith(const nsRectAbsolute& aRect)
   {
 #ifdef DEBUG_REGIONS
     class OperationStringGeneratorAndWith : public OperationStringGenerator
     {
     public:
-      OperationStringGeneratorAndWith(nsRegion& aRegion, const nsRect& aRect)
+      OperationStringGeneratorAndWith(nsRegion& aRegion, const nsRectAbsolute& aRect)
         : mRegion(&aRegion), mRegionCopy(aRegion), mRect(aRect)
       {
         aRegion.mCurrentOpGenerator = this;
@@ -737,7 +741,7 @@ public:
     private:
       nsRegion * mRegion;
       nsRegion mRegionCopy;
-      nsRect mRect;
+      nsRectAbsolute mRect;
     };
 
     OperationStringGeneratorAndWith opGenerator(*this, aRect);
@@ -801,6 +805,9 @@ public:
     AssertState();
     return *this;
   }
+  nsRegion& AndWith(const nsRect& aRect) {
+    return AndWith(nsRectAbsolute::FromRect(aRect));
+  }
   nsRegion& And(const nsRegion& aRgn1, const nsRegion& aRgn2)
   {
     if (&aRgn1 == this) {
@@ -855,7 +862,7 @@ public:
     And(mBands, aRgn1.mBands, aRgn2.mBands);
 
     if (!mBands.Length()) {
-      mBounds = nsRect();
+      mBounds = nsRectAbsolute();
     } else {
       mBounds = CalculateBounds();
     }
@@ -868,7 +875,7 @@ public:
   {
     return And(aRegion, aRect);
   }
-  nsRegion& And(const nsRegion& aRegion, const nsRect& aRect)
+  nsRegion& And(const nsRegion& aRegion, const nsRectAbsolute& aRect)
   {
     if (&aRegion == this) {
       return AndWith(aRect);
@@ -877,7 +884,7 @@ public:
     class OperationStringGeneratorAnd : public OperationStringGenerator
     {
     public:
-      OperationStringGeneratorAnd(nsRegion& aThisRegion, const nsRegion& aRegion, const nsRect& aRect)
+      OperationStringGeneratorAnd(nsRegion& aThisRegion, const nsRegion& aRegion, const nsRectAbsolute& aRect)
         : mThisRegion(&aThisRegion), mRegion(aRegion), mRect(aRect)
       {
         aThisRegion.mCurrentOpGenerator = this;
@@ -897,7 +904,7 @@ public:
     private:
       nsRegion* mThisRegion;
       nsRegion mRegion;
-      nsRect mRect;
+      nsRectAbsolute mRect;
     };
 
     OperationStringGeneratorAnd opGenerator(*this, aRegion, aRect);
@@ -958,6 +965,10 @@ public:
     AssertState();
     return *this;
   }
+  nsRegion& And(const nsRegion& aRegion, const nsRect& aRect)
+  {
+    return And(aRegion, nsRectAbsolute::FromRect(aRect));
+  }
   nsRegion& And(const nsRect& aRect1, const nsRect& aRect2)
   {
     nsRect tmpRect;
@@ -969,13 +980,13 @@ public:
   nsRegion& OrWith(const nsRegion& aOther)
   {
     for (RectIterator idx(aOther); !idx.Done(); idx.Next()) {
-      AddRect(idx.Get());
+      AddRect(idx.GetAbsolute());
     }
     return *this;
   }
   nsRegion& OrWith(const nsRect& aOther)
   {
-    AddRect(aOther);
+    AddRect(nsRectAbsolute::FromRect(aOther));
     return *this;
   }
   nsRegion& Or(const nsRegion& aRgn1, const nsRegion& aRgn2)
@@ -984,7 +995,7 @@ public:
       *this = aRgn1;
     }
     for (RectIterator idx(aRgn2); !idx.Done(); idx.Next()) {
-      AddRect(idx.Get());
+      AddRect(idx.GetAbsolute());
     }
     return *this;
   }
@@ -993,7 +1004,7 @@ public:
     if (&aRegion != this) {
       *this = aRegion;
     }
-    AddRect(aRect);
+    AddRect(nsRectAbsolute::FromRect(aRect));
     return *this;
   }
   nsRegion& Or(const nsRect& aRect, const nsRegion& aRegion)
@@ -1381,7 +1392,7 @@ public:
 
 private:
   // Internal helper for executing subtraction.
-  void RunSubtraction(const nsRect& aRect)
+  void RunSubtraction(const nsRectAbsolute& aRect)
   {
     Strip rectStrip(aRect.X(), aRect.XMost());
 
@@ -1448,7 +1459,7 @@ private:
   }
 
 public:
-  nsRegion& SubWith(const nsRect& aRect) {
+  nsRegion& SubWith(const nsRectAbsolute& aRect) {
     if (!mBounds.Intersects(aRect)) {
       return *this;
     }
@@ -1462,7 +1473,7 @@ public:
     class OperationStringGeneratorSubWith : public OperationStringGenerator
     {
     public:
-      OperationStringGeneratorSubWith(nsRegion& aRegion, const nsRect& aRect)
+      OperationStringGeneratorSubWith(nsRegion& aRegion, const nsRectAbsolute& aRect)
         : mRegion(&aRegion), mRegionCopy(aRegion), mRect(aRect)
       {
         aRegion.mCurrentOpGenerator = this;
@@ -1482,7 +1493,7 @@ public:
     private:
       nsRegion * mRegion;
       nsRegion mRegionCopy;
-      nsRect mRect;
+      nsRectAbsolute mRect;
     };
 
     OperationStringGeneratorSubWith opGenerator(*this, aRect);
@@ -1494,7 +1505,7 @@ public:
 
     RunSubtraction(aRect);
 
-    if (aRect.x <= mBounds.x || aRect.y <= mBounds.y ||
+    if (aRect.X() <= mBounds.X() || aRect.Y() <= mBounds.Y() ||
         aRect.XMost() >= mBounds.XMost() || aRect.YMost() >= mBounds.YMost()) {
       mBounds = CalculateBounds();
     }
@@ -1502,7 +1513,7 @@ public:
     AssertState();
     return *this;
   }
-  nsRegion& Sub(const nsRegion& aRegion, const nsRect& aRect)
+  nsRegion& Sub(const nsRegion& aRegion, const nsRectAbsolute& aRect)
   {
     if (aRect.Contains(aRegion.mBounds)) {
       SetEmpty();
@@ -1515,7 +1526,7 @@ public:
     class OperationStringGeneratorSub : public OperationStringGenerator
     {
     public:
-      OperationStringGeneratorSub(nsRegion& aRegion, const nsRegion& aRegionOther, const nsRect& aRect)
+      OperationStringGeneratorSub(nsRegion& aRegion, const nsRegion& aRegionOther, const nsRectAbsolute& aRect)
         : mRegion(&aRegion), mRegionOther(aRegionOther), mRect(aRect)
       {
         aRegion.mCurrentOpGenerator = this;
@@ -1535,7 +1546,7 @@ public:
     private:
       nsRegion * mRegion;
       nsRegion mRegionOther;
-      nsRect mRect;
+      nsRectAbsolute mRect;
     };
 
     OperationStringGeneratorSub opGenerator(*this, aRegion, aRect);
@@ -1632,16 +1643,33 @@ public:
     EnsureSimplified();
     return *this;
   }
+  nsRegion& SubWith(const nsRect& aRect) {
+    return SubWith(nsRectAbsolute::FromRect(aRect));
+  }
   nsRegion& Sub(const nsRect& aRect, const nsRegion& aRegion)
   {
     Copy(aRect);
     return SubWith(aRegion);
   }
+  nsRegion& Sub(const nsRectAbsolute& aRect, const nsRegion& aRegion)
+  {
+    Copy(aRect);
+    return SubWith(aRegion);
+  }
   nsRegion& Sub(const nsRect& aRect1, const nsRect& aRect2)
   {
     Copy(aRect1);
     return SubWith(aRect2);
   }
+  nsRegion& Sub(const nsRegion& aRegion, const nsRect& aRect)
+  {
+    return Sub(aRegion, nsRectAbsolute::FromRect(aRect));
+  }
+  nsRegion& Sub(const nsRectAbsolute& aRect1, const nsRectAbsolute& aRect2)
+  {
+    Copy(aRect1);
+    return SubWith(aRect2);
+  }
 
   /**
    * Returns true if the given point is inside the region. A region
@@ -1673,7 +1701,7 @@ public:
     }
     return false;
   }
-  bool Contains(const nsRect& aRect) const
+  bool Contains(const nsRectAbsolute& aRect) const
   {
     if (aRect.IsEmpty()) {
       return false;
@@ -1726,9 +1754,16 @@ public:
     }
     return false;
   }
+  bool Contains(const nsRect& aRect) const
+  {
+    return Contains(nsRectAbsolute::FromRect(aRect));
+  }
 
   bool Contains(const nsRegion& aRgn) const;
-  bool Intersects(const nsRect& aRect) const;
+  bool Intersects(const nsRectAbsolute& aRect) const;
+  bool Intersects(const nsRect& aRect) const {
+    return Intersects(nsRectAbsolute::FromRect(aRect));
+  }
 
   void MoveBy(int32_t aXOffset, int32_t aYOffset)
   {
@@ -1848,7 +1883,8 @@ public:
 
     return rects;
   }
-  const nsRect GetBounds() const { return mBounds; }
+  const nsRect GetBounds() const { return mBounds.ToNSRect(); }
+  const nsRectAbsolute GetAbsoluteBounds() const { return mBounds; }
   uint64_t Area() const;
 
   /**
@@ -1940,6 +1976,13 @@ private:
   }
 
   nsRegion& Copy(const nsRect& aRect)
+  {
+    mBands.Clear();
+    mBounds = nsRectAbsolute::FromRect(aRect);
+    return *this;
+  }
+
+  nsRegion& Copy(const nsRectAbsolute& aRect)
   {
     mBands.Clear();
     mBounds = aRect;
@@ -1952,20 +1995,19 @@ private:
     }
   }
 
-  static inline nsRect BoxToRect(const pixman_box32_t &aBox)
+  static inline nsRectAbsolute BoxToRect(const pixman_box32_t &aBox)
   {
-    return nsRect(aBox.x1, aBox.y1,
-      aBox.x2 - aBox.x1,
-      aBox.y2 - aBox.y1);
+    return nsRectAbsolute(aBox.x1, aBox.y1,
+                          aBox.x2, aBox.y2);
   }
 
-  void AddRect(const nsRect& aRect)
+  void AddRect(const nsRectAbsolute& aRect)
   {
 #ifdef DEBUG_REGIONS
     class OperationStringGeneratorAddRect : public OperationStringGenerator
     {
     public:
-      OperationStringGeneratorAddRect(nsRegion& aRegion, const nsRect& aRect)
+      OperationStringGeneratorAddRect(nsRegion& aRegion, const nsRectAbsolute& aRect)
         : mRegion(&aRegion), mRegionCopy(aRegion), mRect(aRect)
       {
         aRegion.mCurrentOpGenerator = this;
@@ -1985,7 +2027,7 @@ private:
     private:
       nsRegion* mRegion;
       nsRegion mRegionCopy;
-      nsRect mRect;
+      nsRectAbsolute mRect;
     };
 
     OperationStringGeneratorAddRect opGenerator(*this, aRect);
@@ -1994,12 +2036,6 @@ private:
       return;
     }
 
-    if (aRect.Overflows()) {
-      // We don't accept rects which overflow.
-      gfxWarning() << "Passing overflowing rect to AddRect.";
-      return;
-    }
-
     if (mBands.IsEmpty()) {
       if (mBounds.IsEmpty()) {
         mBounds = aRect;
@@ -2109,7 +2145,7 @@ private:
 
   // Most callers could probably do this on the fly, if this ever shows up
   // in profiles we could optimize this.
-  nsRect CalculateBounds() const
+  nsRectAbsolute CalculateBounds() const
   {
     if (mBands.IsEmpty()) {
       return mBounds;
@@ -2125,7 +2161,7 @@ private:
       rightMost = std::max(rightMost, band.mStrips.LastElement().right);
     }
 
-    return nsRect(leftMost, top, rightMost - leftMost, bottom - top);
+    return nsRectAbsolute(leftMost, top, rightMost, bottom);
   }
 
   static uint32_t ComputeMergedAreaIncrease(const Band& aTopBand,
@@ -2164,7 +2200,7 @@ private:
 
   BandArray mBands;
   // Considering we only ever OR with nsRects, the bounds should fit in an nsRect as well.
-  nsRect mBounds;
+  nsRectAbsolute mBounds;
 #ifdef DEBUG_REGIONS
   friend class OperationStringGenerator;
   OperationStringGenerator* mCurrentOpGenerator;
@@ -2196,13 +2232,22 @@ public:
     const nsRect Get() const
     {
       if (mRegion.mBands.IsEmpty()) {
-        return mRegion.mBounds;
+        return mRegion.GetBounds();
       }
       return nsRect(mCurrentStrip->left, mCurrentBand->top,
         mCurrentStrip->right - mCurrentStrip->left,
         mCurrentBand->bottom - mCurrentBand->top);
     }
 
+    const nsRectAbsolute GetAbsolute() const
+    {
+      if (mRegion.mBands.IsEmpty()) {
+        return mRegion.mBounds;
+      }
+      return nsRectAbsolute(mCurrentStrip->left, mCurrentBand->top,
+                            mCurrentStrip->right, mCurrentBand->bottom);
+    }
+
     void Next()
     {
       if (mRegion.mBands.IsEmpty()) {
diff --git a/gfx/tests/gtest/TestRegion.cpp b/gfx/tests/gtest/TestRegion.cpp
index 1527daea293d..6de240a92b51 100644
--- a/gfx/tests/gtest/TestRegion.cpp
+++ b/gfx/tests/gtest/TestRegion.cpp
@@ -224,6 +224,11 @@ TEST(Gfx, RegionIsEqual)
 }
 
 TEST(Gfx, RegionOrWith) {
+  PR_Sleep(PR_SecondsToInterval(10));
+  {
+    nsRegion r(nsRect(11840, 11840, 4640, -10880));
+    r.OrWith(nsRect(160, 160, 7720, 880));
+  }
   {
     nsRegion r(nsRect(79, 31, 75, 12));
     r.OrWith(nsRect(22, 43, 132, 5));
diff --git a/gfx/thebes/gfxFontMissingGlyphs.cpp b/gfx/thebes/gfxFontMissingGlyphs.cpp
index db03843c91d6..9c2a2b029341 100644
--- a/gfx/thebes/gfxFontMissingGlyphs.cpp
+++ b/gfx/thebes/gfxFontMissingGlyphs.cpp
@@ -243,7 +243,7 @@ gfxFontMissingGlyphs::DrawMissingGlyph(uint32_t aChar,
                           rect.Height() - 2.0 * halfBorderWidth);
     if (!borderStrokeRect.IsEmpty()) {
         ColorPattern adjustedColor = color;
-        color.mColor.a *= BOX_BORDER_OPACITY;
+        adjustedColor.mColor.a *= BOX_BORDER_OPACITY;
 #ifdef MOZ_GFX_OPTIMIZE_MOBILE
         aDrawTarget.FillRect(borderStrokeRect, adjustedColor);
 #else
diff --git a/ipc/contentproc/moz.build b/ipc/contentproc/moz.build
index 10e80926af53..07cf0b97c676 100644
--- a/ipc/contentproc/moz.build
+++ b/ipc/contentproc/moz.build
@@ -23,6 +23,3 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
         '/security/sandbox/chromium',
         '/security/sandbox/chromium-shim',
     ]
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/js/public/HeapAPI.h b/js/public/HeapAPI.h
index 2c38c98e0f11..6e9cb7c37a55 100644
--- a/js/public/HeapAPI.h
+++ b/js/public/HeapAPI.h
@@ -26,12 +26,6 @@ namespace gc {
 
 struct Cell;
 
-/*
- * The low bit is set so this should never equal a normal pointer, and the high
- * bit is set so this should never equal the upper 32 bits of a 64-bit pointer.
- */
-const uint32_t Relocated = uintptr_t(0xbad0bad1);
-
 const size_t ArenaShift = 12;
 const size_t ArenaSize = size_t(1) << ArenaShift;
 const size_t ArenaMask = ArenaSize - 1;
@@ -205,17 +199,20 @@ struct Zone
 
 struct String
 {
-    static const uint32_t NON_ATOM_BIT     = JS_BIT(0);
-    static const uint32_t LINEAR_BIT       = JS_BIT(1);
-    static const uint32_t INLINE_CHARS_BIT = JS_BIT(3);
-    static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6);
-    static const uint32_t EXTERNAL_FLAGS   = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5);
-    static const uint32_t TYPE_FLAGS_MASK  = JS_BIT(6) - 1;
-    static const uint32_t PERMANENT_ATOM_MASK    = NON_ATOM_BIT | JS_BIT(5);
-    static const uint32_t PERMANENT_ATOM_FLAGS   = JS_BIT(5);
+    static const uint32_t NON_ATOM_BIT     = JS_BIT(1);
+    static const uint32_t LINEAR_BIT       = JS_BIT(4);
+    static const uint32_t INLINE_CHARS_BIT = JS_BIT(6);
+    static const uint32_t LATIN1_CHARS_BIT = JS_BIT(9);
+    static const uint32_t EXTERNAL_FLAGS   = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(8);
+    static const uint32_t TYPE_FLAGS_MASK  = JS_BITMASK(9) - JS_BIT(2) - JS_BIT(0);
+    static const uint32_t PERMANENT_ATOM_MASK    = NON_ATOM_BIT | JS_BIT(8);
+    static const uint32_t PERMANENT_ATOM_FLAGS   = JS_BIT(8);
+
+    uintptr_t flags_;
+  #if JS_BITS_PER_WORD == 32
+    uint32_t length_;
+  #endif
 
-    uint32_t flags;
-    uint32_t length;
     union {
         const JS::Latin1Char* nonInlineCharsLatin1;
         const char16_t* nonInlineCharsTwoByte;
@@ -224,18 +221,25 @@ struct String
     };
     const JSStringFinalizer* externalFinalizer;
 
-    static bool nurseryCellIsString(const js::gc::Cell* cell) {
-        MOZ_ASSERT(IsInsideNursery(cell));
-        return reinterpret_cast<const String*>(cell)->flags & NON_ATOM_BIT;
+    inline uint32_t flags() const {
+        return uint32_t(flags_);
+    }
+    inline uint32_t length() const {
+  #if JS_BITS_PER_WORD == 32
+        return length_;
+  #else
+        return uint32_t(flags_ >> 32);
+  #endif
     }
 
     static bool isPermanentAtom(const js::gc::Cell* cell) {
-        uint32_t flags = reinterpret_cast<const String*>(cell)->flags;
+        uint32_t flags = reinterpret_cast<const String*>(cell)->flags();
         return (flags & PERMANENT_ATOM_MASK) == PERMANENT_ATOM_FLAGS;
     }
 };
 
 struct Symbol {
+    uintptr_t reserved_;
     uint32_t code_;
     static const uint32_t WellKnownAPILimit = 0x80000000;
 
diff --git a/js/public/Realm.h b/js/public/Realm.h
index 719adbc2f5bb..1e8f00481c0d 100644
--- a/js/public/Realm.h
+++ b/js/public/Realm.h
@@ -73,6 +73,11 @@ GetCompartmentForRealm(Realm* realm)
 extern JS_PUBLIC_API(Realm*)
 GetObjectRealmOrNull(JSObject* obj);
 
+// Return a script's realm. All scripts are created in a particular realm, which
+// never changes.
+extern JS_PUBLIC_API(Realm*)
+GetScriptRealm(JSScript* script);
+
 // Get the value of the "private data" internal field of the given Realm.
 // This field is initially null and is set using SetRealmPrivate.
 // It's a pointer to embeddding-specific data that SpiderMonkey never uses.
diff --git a/js/src/builtin/Array.cpp b/js/src/builtin/Array.cpp
index 3e66c8aa8785..3f4a36fd3c17 100644
--- a/js/src/builtin/Array.cpp
+++ b/js/src/builtin/Array.cpp
@@ -791,8 +791,12 @@ js::ArraySetLength(JSContext* cx, Handle<ArrayObject*> arr, HandleId id,
             MOZ_ASSERT(oldCapacity >= oldInitializedLength);
             if (oldInitializedLength > newLen)
                 arr->setDenseInitializedLengthMaybeNonExtensible(cx, newLen);
-            if (oldCapacity > newLen)
-                arr->shrinkElements(cx, newLen);
+            if (oldCapacity > newLen) {
+                if (arr->isExtensible())
+                    arr->shrinkElements(cx, newLen);
+                else
+                    MOZ_ASSERT(arr->getDenseInitializedLength() == arr->getDenseCapacity());
+            }
 
             // We've done the work of deleting any dense elements needing
             // deletion, and there are no sparse elements.  Thus we can skip
diff --git a/js/src/builtin/ModuleObject.cpp b/js/src/builtin/ModuleObject.cpp
index b5349aefb618..ece71b2860ed 100644
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -1643,9 +1643,10 @@ ArrayObject* ModuleBuilder::createArray(const JS::Rooted<GCHashMap<K, V>>& map)
 }
 
 JSObject*
-js::GetOrCreateModuleMetaObject(JSContext* cx, HandleObject moduleArg)
+js::GetOrCreateModuleMetaObject(JSContext* cx, HandleScript script)
 {
-    HandleModuleObject module = moduleArg.as<ModuleObject>();
+    MOZ_ASSERT(script->module());
+    RootedModuleObject module(cx, script->module());
     if (JSObject* obj = module->metaObject())
         return obj;
 
@@ -1659,7 +1660,7 @@ js::GetOrCreateModuleMetaObject(JSContext* cx, HandleObject moduleArg)
         return nullptr;
     }
 
-    if (!func(cx, module, metaObject))
+    if (!func(cx, script, metaObject))
         return nullptr;
 
     module->setMetaObject(metaObject);
diff --git a/js/src/builtin/ModuleObject.h b/js/src/builtin/ModuleObject.h
index 8bc625729fc3..9216acbc7111 100644
--- a/js/src/builtin/ModuleObject.h
+++ b/js/src/builtin/ModuleObject.h
@@ -412,7 +412,7 @@ class MOZ_STACK_CLASS ModuleBuilder
 };
 
 JSObject*
-GetOrCreateModuleMetaObject(JSContext* cx, HandleObject module);
+GetOrCreateModuleMetaObject(JSContext* cx, HandleScript script);
 
 } // namespace js
 
diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
index 0700b18f3f76..120b38440f54 100644
--- a/js/src/builtin/TestingFunctions.cpp
+++ b/js/src/builtin/TestingFunctions.cpp
@@ -796,7 +796,7 @@ WasmHasTier2CompilationCompleted(JSContext* cx, unsigned argc, Value* vp)
     }
 
     Rooted<WasmModuleObject*> module(cx, &unwrapped->as<WasmModuleObject>());
-    args.rval().set(BooleanValue(module->module().compilationComplete()));
+    args.rval().set(BooleanValue(!module->module().testingTier2Active()));
     return true;
 }
 
diff --git a/js/src/frontend/BytecodeCompiler.cpp b/js/src/frontend/BytecodeCompiler.cpp
index 73529af9f0eb..824128e00fc2 100644
--- a/js/src/frontend/BytecodeCompiler.cpp
+++ b/js/src/frontend/BytecodeCompiler.cpp
@@ -47,7 +47,7 @@ class MOZ_STACK_CLASS BytecodeCompiler
 
     JSScript* compileGlobalScript(ScopeKind scopeKind);
     JSScript* compileEvalScript(HandleObject environment, HandleScope enclosingScope);
-    ModuleObject* compileModule();
+    JSScript* compileModule();
     bool compileStandaloneFunction(MutableHandleFunction fun, GeneratorKind generatorKind,
                                    FunctionAsyncKind asyncKind,
                                    const Maybe<uint32_t>& parameterListEnd);
@@ -394,7 +394,7 @@ BytecodeCompiler::compileEvalScript(HandleObject environment, HandleScope enclos
     return compileScript(environment, &evalsc);
 }
 
-ModuleObject*
+JSScript*
 BytecodeCompiler::compileModule()
 {
     if (!createSourceAndParser(ParseGoal::Module))
@@ -438,7 +438,7 @@ BytecodeCompiler::compileModule()
         return nullptr;
 
     MOZ_ASSERT_IF(!cx->helperThread(), !cx->isExceptionPending());
-    return module;
+    return script;
 }
 
 // Compile a standalone JS function, which might appear as the value of an
@@ -687,7 +687,7 @@ frontend::CompileEvalScript(JSContext* cx, LifoAlloc& alloc,
 
 }
 
-ModuleObject*
+JSScript*
 frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& optionsInput,
                         SourceBufferHolder& srcBuf, LifoAlloc& alloc,
                         ScriptSourceObject** sourceObjectOut)
@@ -705,15 +705,15 @@ frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& optionsInpu
     RootedScope emptyGlobalScope(cx, &cx->global()->emptyGlobalScope());
     BytecodeCompiler compiler(cx, alloc, options, srcBuf, emptyGlobalScope);
     AutoInitializeSourceObject autoSSO(compiler, sourceObjectOut);
-    ModuleObject* module = compiler.compileModule();
-    if (!module)
+    JSScript* script = compiler.compileModule();
+    if (!script)
         return nullptr;
 
     assertException.reset();
-    return module;
+    return script;
 }
 
-ModuleObject*
+JSScript*
 frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
                         SourceBufferHolder& srcBuf)
 {
@@ -723,17 +723,18 @@ frontend::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
         return nullptr;
 
     LifoAlloc& alloc = cx->tempLifoAlloc();
-    RootedModuleObject module(cx, CompileModule(cx, options, srcBuf, alloc));
-    if (!module)
+    RootedScript script(cx, CompileModule(cx, options, srcBuf, alloc));
+    if (!script)
         return nullptr;
 
     // This happens in GlobalHelperThreadState::finishModuleParseTask() when a
     // module is compiled off thread.
+    RootedModuleObject module(cx, script->module());
     if (!ModuleObject::Freeze(cx, module))
         return nullptr;
 
     assertException.reset();
-    return module;
+    return script;
 }
 
 // When leaving this scope, the given function should either:
diff --git a/js/src/frontend/BytecodeCompiler.h b/js/src/frontend/BytecodeCompiler.h
index 84209b7c1b7a..16943f9047b2 100644
--- a/js/src/frontend/BytecodeCompiler.h
+++ b/js/src/frontend/BytecodeCompiler.h
@@ -21,7 +21,6 @@ namespace js {
 
 class LazyScript;
 class LifoAlloc;
-class ModuleObject;
 class ScriptSourceObject;
 
 namespace frontend {
@@ -53,11 +52,11 @@ CompileEvalScript(JSContext* cx, LifoAlloc& alloc,
                   SourceBufferHolder& srcBuf,
                   ScriptSourceObject** sourceObjectOut = nullptr);
 
-ModuleObject*
+JSScript*
 CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
               SourceBufferHolder& srcBuf);
 
-ModuleObject*
+JSScript*
 CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
               SourceBufferHolder& srcBuf, LifoAlloc& alloc,
               ScriptSourceObject** sourceObjectOut = nullptr);
diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index cfaf8fb4aac9..a35d72711038 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -6070,11 +6070,13 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
     MOZ_ASSERT(sc->isFunctionBox());
     MOZ_ASSERT(sc->asFunctionBox()->isGenerator());
 
-    bool isAsyncGenerator = sc->asFunctionBox()->isAsync();
+    IteratorKind iterKind = sc->asFunctionBox()->isAsync()
+                            ? IteratorKind::Async
+                            : IteratorKind::Sync;
 
     if (!emitTree(iter))                                  // ITERABLE
         return false;
-    if (isAsyncGenerator) {
+    if (iterKind == IteratorKind::Async) {
         if (!emitAsyncIterator())                         // NEXT ITER
             return false;
     } else {
@@ -6102,7 +6104,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
     MOZ_ASSERT(this->stackDepth == startDepth);
 
     // 11.4.3.7 AsyncGeneratorYield step 5.
-    if (isAsyncGenerator) {
+    if (iterKind == IteratorKind::Async) {
         if (!emitAwaitInInnermostScope())                 // NEXT ITER RESULT
             return false;
     }
@@ -6118,7 +6120,8 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
     if (!tryCatch.emitCatch())                            // NEXT ITER RESULT
         return false;
 
-    stackDepth = startDepth;                              // NEXT ITER RESULT
+    MOZ_ASSERT(stackDepth == startDepth);
+
     if (!emit1(JSOP_EXCEPTION))                           // NEXT ITER RESULT EXCEPTION
         return false;
     if (!emitDupAt(2))                                    // NEXT ITER RESULT EXCEPTION ITER
@@ -6127,31 +6130,15 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
         return false;
     if (!emitAtomOp(cx->names().throw_, JSOP_CALLPROP))   // NEXT ITER RESULT EXCEPTION ITER THROW
         return false;
-    if (!emit1(JSOP_DUP))                                 // NEXT ITER RESULT EXCEPTION ITER THROW THROW
-        return false;
-    if (!emit1(JSOP_UNDEFINED))                           // NEXT ITER RESULT EXCEPTION ITER THROW THROW UNDEFINED
-        return false;
-    if (!emit1(JSOP_EQ))                                  // NEXT ITER RESULT EXCEPTION ITER THROW ?EQL
+
+    savedDepthTemp = stackDepth;
+    InternalIfEmitter ifThrowMethodIsNotDefined(this);
+    if (!emitPushNotUndefinedOrNull())                    // NEXT ITER RESULT EXCEPTION ITER THROW NOT-UNDEF-OR-NULL
         return false;
 
-    InternalIfEmitter ifThrowMethodIsNotDefined(this);
-    if (!ifThrowMethodIsNotDefined.emitThen())            // NEXT ITER RESULT EXCEPTION ITER THROW
-        return false;
-    savedDepthTemp = stackDepth;
-    if (!emit1(JSOP_POP))                                 // NEXT ITER RESULT EXCEPTION ITER
-        return false;
-    // ES 14.4.13, YieldExpression : yield * AssignmentExpression, step 5.b.iii.2
-    //
-    // If the iterator does not have a "throw" method, it calls IteratorClose
-    // and then throws a TypeError.
-    IteratorKind iterKind = isAsyncGenerator ? IteratorKind::Async : IteratorKind::Sync;
-    if (!emitIteratorCloseInInnermostScope(iterKind))     // NEXT ITER RESULT EXCEPTION
-        return false;
-    if (!emitUint16Operand(JSOP_THROWMSG, JSMSG_ITERATOR_NO_THROW)) // throw
-        return false;
-    stackDepth = savedDepthTemp;
-    if (!ifThrowMethodIsNotDefined.emitEnd())             // NEXT ITER OLDRESULT EXCEPTION ITER THROW
+    if (!ifThrowMethodIsNotDefined.emitThenElse())        // NEXT ITER RESULT EXCEPTION ITER THROW
         return false;
+
     // ES 14.4.13, YieldExpression : yield * AssignmentExpression, step 5.b.iii.4.
     // RESULT = ITER.throw(EXCEPTION)                     // NEXT ITER OLDRESULT EXCEPTION ITER THROW
     if (!emit1(JSOP_SWAP))                                // NEXT ITER OLDRESULT EXCEPTION THROW ITER
@@ -6162,7 +6149,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
         return false;
     checkTypeSet(JSOP_CALL);
 
-    if (isAsyncGenerator) {
+    if (iterKind == IteratorKind::Async) {
         if (!emitAwaitInInnermostScope())                 // NEXT ITER OLDRESULT RESULT
             return false;
     }
@@ -6182,6 +6169,26 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
     if (!emitJump(JSOP_GOTO, &checkResult))               // goto checkResult
         return false;
 
+    stackDepth = savedDepthTemp;
+    if (!ifThrowMethodIsNotDefined.emitElse())            // NEXT ITER RESULT EXCEPTION ITER THROW
+        return false;
+
+    if (!emit1(JSOP_POP))                                 // NEXT ITER RESULT EXCEPTION ITER
+        return false;
+    // ES 14.4.13, YieldExpression : yield * AssignmentExpression, step 5.b.iii.2
+    //
+    // If the iterator does not have a "throw" method, it calls IteratorClose
+    // and then throws a TypeError.
+    if (!emitIteratorCloseInInnermostScope(iterKind))     // NEXT ITER RESULT EXCEPTION
+        return false;
+    if (!emitUint16Operand(JSOP_THROWMSG, JSMSG_ITERATOR_NO_THROW)) // throw
+        return false;
+
+    stackDepth = savedDepthTemp;
+    if (!ifThrowMethodIsNotDefined.emitEnd())
+        return false;
+
+    stackDepth = startDepth;
     if (!tryCatch.emitFinally())
          return false;
 
@@ -6303,7 +6310,7 @@ BytecodeEmitter::emitYieldStar(ParseNode* iter)
         return false;
     checkTypeSet(JSOP_CALL);
 
-    if (isAsyncGenerator) {
+    if (iterKind == IteratorKind::Async) {
         if (!emitAwaitInInnermostScope())                        // NEXT ITER RESULT RESULT
             return false;
     }
diff --git a/js/src/gc/Cell.h b/js/src/gc/Cell.h
index 5e3a3f76ae13..5f5e52bd8213 100644
--- a/js/src/gc/Cell.h
+++ b/js/src/gc/Cell.h
@@ -48,10 +48,35 @@ struct Chunk;
 class StoreBuffer;
 class TenuredCell;
 
-// A GC cell is the base class for all GC things.
+// [SMDOC] GC Cell
+//
+// A GC cell is the base class for all GC things. All types allocated on the GC
+// heap extend either gc::Cell or gc::TenuredCell. If a type is always tenured,
+// prefer the TenuredCell class as base.
+//
+// The first word (a pointer or uintptr_t) of each Cell must reserve the low
+// Cell::ReservedBits bits for GC purposes. The remaining bits are available to
+// sub-classes and typically store a pointer to another gc::Cell.
+//
+// During moving GC operation a Cell may be marked as forwarded. This indicates
+// that a gc::RelocationOverlay is currently stored in the Cell's memory and
+// should be used to find the new location of the Cell.
 struct alignas(gc::CellAlignBytes) Cell
 {
   public:
+    // The low bits of the first word of each Cell are reserved for GC flags.
+    static constexpr int ReservedBits = 2;
+    static constexpr uintptr_t RESERVED_MASK = JS_BITMASK(ReservedBits);
+
+    // Indicates if the cell is currently a RelocationOverlay
+    static constexpr uintptr_t FORWARD_BIT = JS_BIT(0);
+
+    // When a Cell is in the nursery, this will indicate if it is a JSString (1)
+    // or JSObject (0). When not in nursery, this bit is still reserved for
+    // JSString to use as JSString::NON_ATOM bit. This may be removed by Bug
+    // 1376646.
+    static constexpr uintptr_t JSSTRING_BIT = JS_BIT(1);
+
     MOZ_ALWAYS_INLINE bool isTenured() const { return !IsInsideNursery(this); }
     MOZ_ALWAYS_INLINE const TenuredCell& asTenured() const;
     MOZ_ALWAYS_INLINE TenuredCell& asTenured();
@@ -77,6 +102,17 @@ struct alignas(gc::CellAlignBytes) Cell
 
     static MOZ_ALWAYS_INLINE bool needWriteBarrierPre(JS::Zone* zone);
 
+    inline bool isForwarded() const {
+        uintptr_t firstWord = *reinterpret_cast<const uintptr_t*>(this);
+        return firstWord & FORWARD_BIT;
+    }
+
+    inline bool nurseryCellIsString() const {
+        MOZ_ASSERT(!isTenured());
+        uintptr_t firstWord = *reinterpret_cast<const uintptr_t*>(this);
+        return firstWord & JSSTRING_BIT;
+    }
+
     template <class T>
     inline bool is() const {
         return getTraceKind() == JS::MapTypeToTraceKind<T>::kind;
@@ -255,7 +291,7 @@ Cell::getTraceKind() const
 {
     if (isTenured())
         return asTenured().getTraceKind();
-    if (JS::shadow::String::nurseryCellIsString(this))
+    if (nurseryCellIsString())
         return JS::TraceKind::String;
     return JS::TraceKind::Object;
 }
diff --git a/js/src/gc/GC.cpp b/js/src/gc/GC.cpp
index c0983d99ecad..d66ab0394781 100644
--- a/js/src/gc/GC.cpp
+++ b/js/src/gc/GC.cpp
@@ -224,6 +224,7 @@
 #include "jit/IonCode.h"
 #include "jit/JitcodeMap.h"
 #include "jit/JitRealm.h"
+#include "jit/MacroAssembler.h"
 #include "js/SliceBudget.h"
 #include "proxy/DeadObjectProxy.h"
 #include "util/Windows.h"
@@ -384,6 +385,17 @@ const AllocKind gc::slotsToThingKind[] = {
     /* 16 */ AllocKind::OBJECT16
 };
 
+// Check that reserved bits of a Cell are compatible with our typical allocators
+// since most derived classes will store a pointer in the first word.
+static_assert(js::detail::LIFO_ALLOC_ALIGN > JS_BITMASK(Cell::ReservedBits),
+              "Cell::ReservedBits should support LifoAlloc");
+static_assert(CellAlignBytes > JS_BITMASK(Cell::ReservedBits),
+              "Cell::ReservedBits should support gc::Cell");
+static_assert(sizeof(uintptr_t) > JS_BITMASK(Cell::ReservedBits),
+              "Cell::ReservedBits should support small malloc / aligned globals");
+static_assert(js::jit::CodeAlignment > JS_BITMASK(Cell::ReservedBits),
+              "Cell::ReservedBits should support JIT code");
+
 static_assert(mozilla::ArrayLength(slotsToThingKind) == SLOTS_TO_THING_KIND_LIMIT,
               "We have defined a slot count for each kind.");
 
@@ -2344,7 +2356,7 @@ RelocateArena(Arena* arena, SliceBudget& sliceBudget)
 #ifdef DEBUG
     for (ArenaCellIterUnderGC i(arena); !i.done(); i.next()) {
         TenuredCell* src = i.getCell();
-        MOZ_ASSERT(RelocationOverlay::isCellForwarded(src));
+        MOZ_ASSERT(src->isForwarded());
         TenuredCell* dest = Forwarded(src);
         MOZ_ASSERT(src->isMarkedBlack() == dest->isMarkedBlack());
         MOZ_ASSERT(src->isMarkedGray() == dest->isMarkedGray());
@@ -8472,8 +8484,8 @@ js::gc::AssertGCThingHasType(js::gc::Cell* cell, JS::TraceKind kind)
     MOZ_ASSERT(IsCellPointerValid(cell));
 
     if (IsInsideNursery(cell)) {
-        MOZ_ASSERT(kind == (JSString::nurseryCellIsString(cell) ? JS::TraceKind::String
-                                                                : JS::TraceKind::Object));
+        MOZ_ASSERT(kind == (cell->nurseryCellIsString() ? JS::TraceKind::String
+                                                        : JS::TraceKind::Object));
         return;
     }
 
diff --git a/js/src/gc/GCInternals.h b/js/src/gc/GCInternals.h
index ad8a57ee715a..d02153ec6c3f 100644
--- a/js/src/gc/GCInternals.h
+++ b/js/src/gc/GCInternals.h
@@ -177,7 +177,7 @@ struct MovingTracer : JS::CallbackTracer
     void onScopeEdge(Scope** basep) override;
     void onRegExpSharedEdge(RegExpShared** sharedp) override;
     void onChild(const JS::GCCellPtr& thing) override {
-        MOZ_ASSERT(!RelocationOverlay::isCellForwarded(thing.asCell()));
+        MOZ_ASSERT(!thing.asCell()->isForwarded());
     }
 
 #ifdef DEBUG
diff --git a/js/src/gc/Marking-inl.h b/js/src/gc/Marking-inl.h
index 548478f51292..b612384bd0fd 100644
--- a/js/src/gc/Marking-inl.h
+++ b/js/src/gc/Marking-inl.h
@@ -40,13 +40,12 @@ template <typename T>
 inline bool
 IsForwarded(const T* t)
 {
-    const RelocationOverlay* overlay = RelocationOverlay::fromCell(t);
     if (!MightBeForwarded<T>::value) {
-        MOZ_ASSERT(!overlay->isForwarded());
+        MOZ_ASSERT(!t->isForwarded());
         return false;
     }
 
-    return overlay->isForwarded();
+    return t->isForwarded();
 }
 
 struct IsForwardedFunctor : public BoolDefaultAdaptor<Value, false> {
@@ -93,16 +92,14 @@ inline void
 RelocationOverlay::forwardTo(Cell* cell)
 {
     MOZ_ASSERT(!isForwarded());
-    // The location of magic_ is important because it must never be valid to see
-    // the value Relocated there in a GC thing that has not been moved.
-    static_assert(offsetof(RelocationOverlay, magic_) == offsetof(JSObject, group_) + sizeof(uint32_t),
-                  "RelocationOverlay::magic_ is in the wrong location");
-    static_assert(offsetof(RelocationOverlay, magic_) == offsetof(js::Shape, base_) + sizeof(uint32_t),
-                  "RelocationOverlay::magic_ is in the wrong location");
-    static_assert(offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length),
-                  "RelocationOverlay::magic_ is in the wrong location");
-    magic_ = Relocated;
-    newLocation_ = cell;
+
+    // Preserve old flags because nursery may check them before checking
+    // if this is a forwarded Cell.
+    //
+    // This is pretty terrible and we should find a better way to implement
+    // Cell::getTrackKind() that doesn't rely on this behavior.
+    uintptr_t gcFlags = dataWithTag_ & Cell::RESERVED_MASK;
+    dataWithTag_ = uintptr_t(cell) | gcFlags | Cell::FORWARD_BIT;
 }
 
 #ifdef JSGC_HASH_TABLE_CHECKS
@@ -111,7 +108,7 @@ template <typename T>
 inline bool
 IsGCThingValidAfterMovingGC(T* t)
 {
-    return !IsInsideNursery(t) && !RelocationOverlay::isCellForwarded(t);
+    return !IsInsideNursery(t) && !t->isForwarded();
 }
 
 template <typename T>
diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp
index 573fb4a661be..ec8f9affe8d1 100644
--- a/js/src/gc/Marking.cpp
+++ b/js/src/gc/Marking.cpp
@@ -1237,37 +1237,37 @@ Scope::traceChildren(JSTracer* trc)
     TraceNullableEdge(trc, &environmentShape_, "scope env shape");
     switch (kind_) {
       case ScopeKind::Function:
-        reinterpret_cast<FunctionScope::Data*>(data_)->trace(trc);
+        static_cast<FunctionScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::FunctionBodyVar:
       case ScopeKind::ParameterExpressionVar:
-        reinterpret_cast<VarScope::Data*>(data_)->trace(trc);
+        static_cast<VarScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::Lexical:
       case ScopeKind::SimpleCatch:
       case ScopeKind::Catch:
       case ScopeKind::NamedLambda:
       case ScopeKind::StrictNamedLambda:
-        reinterpret_cast<LexicalScope::Data*>(data_)->trace(trc);
+        static_cast<LexicalScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::Global:
       case ScopeKind::NonSyntactic:
-        reinterpret_cast<GlobalScope::Data*>(data_)->trace(trc);
+        static_cast<GlobalScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::Eval:
       case ScopeKind::StrictEval:
-        reinterpret_cast<EvalScope::Data*>(data_)->trace(trc);
+        static_cast<EvalScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::Module:
-        reinterpret_cast<ModuleScope::Data*>(data_)->trace(trc);
+        static_cast<ModuleScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::With:
         break;
       case ScopeKind::WasmInstance:
-        reinterpret_cast<WasmInstanceScope::Data*>(data_)->trace(trc);
+        static_cast<WasmInstanceScope::Data*>(data_)->trace(trc);
         break;
       case ScopeKind::WasmFunction:
-        reinterpret_cast<WasmFunctionScope::Data*>(data_)->trace(trc);
+        static_cast<WasmFunctionScope::Data*>(data_)->trace(trc);
         break;
     }
 }
@@ -1282,7 +1282,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
     uint32_t length = 0;
     switch (scope->kind_) {
       case ScopeKind::Function: {
-        FunctionScope::Data* data = reinterpret_cast<FunctionScope::Data*>(scope->data_);
+        FunctionScope::Data* data = static_cast<FunctionScope::Data*>(scope->data_);
         traverseEdge(scope, static_cast<JSObject*>(data->canonicalFunction));
         names = &data->trailingNames;
         length = data->length;
@@ -1291,7 +1291,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
 
       case ScopeKind::FunctionBodyVar:
       case ScopeKind::ParameterExpressionVar: {
-        VarScope::Data* data = reinterpret_cast<VarScope::Data*>(scope->data_);
+        VarScope::Data* data = static_cast<VarScope::Data*>(scope->data_);
         names = &data->trailingNames;
         length = data->length;
         break;
@@ -1302,7 +1302,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
       case ScopeKind::Catch:
       case ScopeKind::NamedLambda:
       case ScopeKind::StrictNamedLambda: {
-        LexicalScope::Data* data = reinterpret_cast<LexicalScope::Data*>(scope->data_);
+        LexicalScope::Data* data = static_cast<LexicalScope::Data*>(scope->data_);
         names = &data->trailingNames;
         length = data->length;
         break;
@@ -1310,7 +1310,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
 
       case ScopeKind::Global:
       case ScopeKind::NonSyntactic: {
-        GlobalScope::Data* data = reinterpret_cast<GlobalScope::Data*>(scope->data_);
+        GlobalScope::Data* data = static_cast<GlobalScope::Data*>(scope->data_);
         names = &data->trailingNames;
         length = data->length;
         break;
@@ -1318,14 +1318,14 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
 
       case ScopeKind::Eval:
       case ScopeKind::StrictEval: {
-        EvalScope::Data* data = reinterpret_cast<EvalScope::Data*>(scope->data_);
+        EvalScope::Data* data = static_cast<EvalScope::Data*>(scope->data_);
         names = &data->trailingNames;
         length = data->length;
         break;
       }
 
       case ScopeKind::Module: {
-        ModuleScope::Data* data = reinterpret_cast<ModuleScope::Data*>(scope->data_);
+        ModuleScope::Data* data = static_cast<ModuleScope::Data*>(scope->data_);
         traverseEdge(scope, static_cast<JSObject*>(data->module));
         names = &data->trailingNames;
         length = data->length;
@@ -1336,7 +1336,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
         break;
 
       case ScopeKind::WasmInstance: {
-        WasmInstanceScope::Data* data = reinterpret_cast<WasmInstanceScope::Data*>(scope->data_);
+        WasmInstanceScope::Data* data = static_cast<WasmInstanceScope::Data*>(scope->data_);
         traverseEdge(scope, static_cast<JSObject*>(data->instance));
         names = &data->trailingNames;
         length = data->length;
@@ -1344,7 +1344,7 @@ js::GCMarker::eagerlyMarkChildren(Scope* scope)
       }
 
       case ScopeKind::WasmFunction: {
-        WasmFunctionScope::Data* data = reinterpret_cast<WasmFunctionScope::Data*>(scope->data_);
+        WasmFunctionScope::Data* data = static_cast<WasmFunctionScope::Data*>(scope->data_);
         names = &data->trailingNames;
         length = data->length;
         break;
@@ -2862,7 +2862,7 @@ js::gc::StoreBuffer::CellPtrEdge::trace(TenuringTracer& mover) const
     if (!IsInsideNursery(*edge))
         return;
 
-    if (JSString::nurseryCellIsString(*edge))
+    if ((*edge)->nurseryCellIsString())
         mover.traverse(reinterpret_cast<JSString**>(edge));
     else
         mover.traverse(reinterpret_cast<JSObject**>(edge));
diff --git a/js/src/gc/Nursery-inl.h b/js/src/gc/Nursery-inl.h
index 0b995d55ab63..f0d9f79bcf33 100644
--- a/js/src/gc/Nursery-inl.h
+++ b/js/src/gc/Nursery-inl.h
@@ -28,11 +28,11 @@ js::Nursery::isInside(const SharedMem<T>& p) const
 MOZ_ALWAYS_INLINE /* static */ bool
 js::Nursery::getForwardedPointer(js::gc::Cell** ref)
 {
-    MOZ_ASSERT(ref);
-    MOZ_ASSERT(IsInsideNursery(*ref));
-    const gc::RelocationOverlay* overlay = reinterpret_cast<const gc::RelocationOverlay*>(*ref);
-    if (!overlay->isForwarded())
+    js::gc::Cell* cell = (*ref);
+    MOZ_ASSERT(IsInsideNursery(cell));
+    if (!cell->isForwarded())
         return false;
+    const gc::RelocationOverlay* overlay = gc::RelocationOverlay::fromCell(cell);
     *ref = overlay->forwardingAddress();
     return true;
 }
diff --git a/js/src/gc/RelocationOverlay.h b/js/src/gc/RelocationOverlay.h
index c6339f6cd4a9..1565943f61d6 100644
--- a/js/src/gc/RelocationOverlay.h
+++ b/js/src/gc/RelocationOverlay.h
@@ -16,6 +16,7 @@
 
 #include <stdint.h>
 
+#include "gc/Cell.h"
 #include "js/HeapAPI.h"
 #include "vm/JSObject.h"
 #include "vm/Shape.h"
@@ -23,49 +24,36 @@
 namespace js {
 namespace gc {
 
-struct Cell;
-
 /*
  * This structure overlays a Cell that has been moved and provides a way to find
  * its new location. It's used during generational and compacting GC.
  */
-class RelocationOverlay
+class RelocationOverlay : public Cell
 {
-    /* See comment in js/public/HeapAPI.h. */
-    static const uint32_t Relocated = js::gc::Relocated;
-
-    /*
-     * Keep the low 32 bits untouched. Use them to distinguish strings from
-     * objects in the nursery.
-     */
-    uint32_t preserve_;
-
-    /* Set to Relocated when moved. */
-    uint32_t magic_;
-
-    /* The location |this| was moved to. */
-    Cell* newLocation_;
+    // First word of a Cell has additional requirements from GC. The GC flags
+    // determine if a Cell is a normal entry or is a RelocationOverlay.
+    //                3         0
+    //  -------------------------
+    //  | NewLocation | GCFlags |
+    //  -------------------------
+    uintptr_t dataWithTag_;
 
     /* A list entry to track all relocated things. */
     RelocationOverlay* next_;
 
   public:
     static const RelocationOverlay* fromCell(const Cell* cell) {
-        return reinterpret_cast<const RelocationOverlay*>(cell);
+        return static_cast<const RelocationOverlay*>(cell);
     }
 
     static RelocationOverlay* fromCell(Cell* cell) {
-        return reinterpret_cast<RelocationOverlay*>(cell);
-    }
-
-    bool isForwarded() const {
-        (void) preserve_; // Suppress warning
-        return magic_ == Relocated;
+        return static_cast<RelocationOverlay*>(cell);
     }
 
     Cell* forwardingAddress() const {
         MOZ_ASSERT(isForwarded());
-        return newLocation_;
+        uintptr_t newLocation = dataWithTag_ & ~Cell::RESERVED_MASK;
+        return reinterpret_cast<Cell*>(newLocation);
     }
 
     void forwardTo(Cell* cell);
@@ -79,10 +67,6 @@ class RelocationOverlay
         MOZ_ASSERT(isForwarded());
         return next_;
     }
-
-    static bool isCellForwarded(const Cell* cell) {
-        return fromCell(cell)->isForwarded();
-    }
 };
 
 } // namespace gc
diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp
index 29dc522ac122..07199adf0d78 100644
--- a/js/src/gc/Verifier.cpp
+++ b/js/src/gc/Verifier.cpp
@@ -643,8 +643,7 @@ CheckHeapTracer::checkCell(Cell* cell)
     // Moving
     if (!IsValidGCThingPointer(cell) ||
         ((gcType == GCType::Moving) && !IsGCThingValidAfterMovingGC(cell)) ||
-        ((gcType == GCType::NonMoving) &&
-            RelocationOverlay::isCellForwarded(cell)))
+        ((gcType == GCType::NonMoving) && cell->isForwarded()))
     {
         failures++;
         fprintf(stderr, "Bad pointer %p\n", cell);
diff --git a/js/src/jit-test/tests/auto-regress/bug1481032.js b/js/src/jit-test/tests/auto-regress/bug1481032.js
new file mode 100644
index 000000000000..f1384d6e967d
--- /dev/null
+++ b/js/src/jit-test/tests/auto-regress/bug1481032.js
@@ -0,0 +1,6 @@
+x = [];
+x[6] = 0;
+Object.preventExtensions(x);
+
+// Don't assert.
+x.length = 1;
diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index 96d82a3f995d..02855855dd09 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -5122,7 +5122,8 @@ BaselineCompiler::emit_JSOP_IMPORTMETA()
     RootedModuleObject module(cx, GetModuleObjectForScript(script));
     MOZ_ASSERT(module);
 
-    JSObject* metaObject = GetOrCreateModuleMetaObject(cx, module);
+    RootedScript moduleScript(cx, module->script());
+    JSObject* metaObject = GetOrCreateModuleMetaObject(cx, moduleScript);
     if (!metaObject)
         return false;
 
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
index a42ede61b9e1..8a0d83e44025 100644
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -13580,22 +13580,13 @@ CodeGenerator::visitIsPackedArray(LIsPackedArray* lir)
     Register output = ToRegister(lir->output());
     Register elementsTemp = ToRegister(lir->temp());
 
-    Label notPacked, done;
-
     // Load elements and length.
     masm.loadPtr(Address(array, NativeObject::offsetOfElements()), elementsTemp);
     masm.load32(Address(elementsTemp, ObjectElements::offsetOfLength()), output);
 
     // Test length == initializedLength.
     Address initLength(elementsTemp, ObjectElements::offsetOfInitializedLength());
-    masm.branch32(Assembler::NotEqual, initLength, output, &notPacked);
-
-    masm.move32(Imm32(1), output);
-    masm.jump(&done);
-    masm.bind(&notPacked);
-    masm.move32(Imm32(0), output);
-
-    masm.bind(&done);
+    masm.cmp32Set(Assembler::Equal, initLength, output, output);
 }
 
 typedef bool (*GetPrototypeOfFn)(JSContext*, HandleObject, MutableHandleValue);
diff --git a/js/src/jit/arm/MacroAssembler-arm.cpp b/js/src/jit/arm/MacroAssembler-arm.cpp
index 4fe6a22e0d81..11d8fd1f9278 100644
--- a/js/src/jit/arm/MacroAssembler-arm.cpp
+++ b/js/src/jit/arm/MacroAssembler-arm.cpp
@@ -2425,6 +2425,24 @@ MacroAssemblerARMCompat::cmp32(Register lhs, Register rhs)
     ma_cmp(lhs, rhs);
 }
 
+void
+MacroAssemblerARMCompat::cmp32(const Address& lhs, Imm32 rhs)
+{
+    ScratchRegisterScope scratch(asMasm());
+    SecondScratchRegisterScope scratch2(asMasm());
+    ma_ldr(lhs, scratch, scratch2);
+    ma_cmp(scratch, rhs, scratch2);
+}
+
+void
+MacroAssemblerARMCompat::cmp32(const Address& lhs, Register rhs)
+{
+    ScratchRegisterScope scratch(asMasm());
+    SecondScratchRegisterScope scratch2(asMasm());
+    ma_ldr(lhs, scratch, scratch2);
+    ma_cmp(scratch, rhs);
+}
+
 void
 MacroAssemblerARMCompat::cmpPtr(Register lhs, ImmWord rhs)
 {
diff --git a/js/src/jit/arm/MacroAssembler-arm.h b/js/src/jit/arm/MacroAssembler-arm.h
index 2c612ad37d44..63cd05c6264e 100644
--- a/js/src/jit/arm/MacroAssembler-arm.h
+++ b/js/src/jit/arm/MacroAssembler-arm.h
@@ -1116,12 +1116,8 @@ class MacroAssemblerARMCompat : public MacroAssemblerARM
 
     void cmp32(Register lhs, Imm32 rhs);
     void cmp32(Register lhs, Register rhs);
-    void cmp32(const Address& lhs, Imm32 rhs) {
-        MOZ_CRASH("NYI");
-    }
-    void cmp32(const Address& lhs, Register rhs) {
-        MOZ_CRASH("NYI");
-    }
+    void cmp32(const Address& lhs, Imm32 rhs);
+    void cmp32(const Address& lhs, Register rhs);
 
     void cmpPtr(Register lhs, Register rhs);
     void cmpPtr(Register lhs, ImmWord rhs);
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index d5fc751c5ee1..2c0f37427c2d 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1271,6 +1271,15 @@ JS::GetNonCCWObjectGlobal(JSObject* obj)
     return &obj->nonCCWGlobal();
 }
 
+JS_PUBLIC_API(JSObject*)
+JS::GetScriptGlobal(JSScript* script)
+{
+    AssertHeapIsIdleOrIterating();
+    JSObject* global = script->realm()->maybeGlobal();
+    MOZ_ASSERT(global);
+    return global;
+}
+
 JS_PUBLIC_API(bool)
 JS::detail::ComputeThis(JSContext* cx, Value* vp, MutableHandleObject thisObject)
 {
@@ -4247,7 +4256,7 @@ JS::CompileOffThreadModule(JSContext* cx, const ReadOnlyCompileOptions& options,
     return StartOffThreadParseModule(cx, options, srcBuf, callback, callbackData);
 }
 
-JS_PUBLIC_API(JSObject*)
+JS_PUBLIC_API(JSScript*)
 JS::FinishOffThreadModule(JSContext* cx, JS::OffThreadToken* token)
 {
     MOZ_ASSERT(cx);
@@ -4838,53 +4847,61 @@ JS::SetModuleMetadataHook(JSRuntime* rt, JS::ModuleMetadataHook func)
 
 JS_PUBLIC_API(bool)
 JS::CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
-                  SourceBufferHolder& srcBuf, JS::MutableHandleObject module)
+                  SourceBufferHolder& srcBuf, JS::MutableHandleScript script)
 {
     MOZ_ASSERT(!cx->zone()->isAtomsZone());
     AssertHeapIsIdle();
     CHECK_REQUEST(cx);
 
-    module.set(frontend::CompileModule(cx, options, srcBuf));
-    return !!module;
+    script.set(frontend::CompileModule(cx, options, srcBuf));
+    return !!script;
 }
 
 JS_PUBLIC_API(void)
-JS::SetModuleHostDefinedField(JSObject* module, const JS::Value& value)
+JS::SetModuleHostDefinedField(JSScript* script, const JS::Value& value)
 {
-    module->as<ModuleObject>().setHostDefinedField(value);
+    MOZ_ASSERT(script->module());
+    script->module()->setHostDefinedField(value);
 }
 
 JS_PUBLIC_API(JS::Value)
-JS::GetModuleHostDefinedField(JSObject* module)
+JS::GetModuleHostDefinedField(JSScript* script)
 {
-    return module->as<ModuleObject>().hostDefinedField();
+    MOZ_ASSERT(script->module());
+    return script->module()->hostDefinedField();
 }
 
 JS_PUBLIC_API(bool)
-JS::ModuleInstantiate(JSContext* cx, JS::HandleObject moduleArg)
+JS::ModuleInstantiate(JSContext* cx, JS::HandleScript script)
 {
     AssertHeapIsIdle();
     CHECK_REQUEST(cx);
-    assertSameCompartment(cx, moduleArg);
-    return ModuleObject::Instantiate(cx, moduleArg.as<ModuleObject>());
+    assertSameCompartment(cx, script);
+    RootedModuleObject module(cx, script->module());
+    MOZ_ASSERT(module);
+    return ModuleObject::Instantiate(cx, module);
 }
 
 JS_PUBLIC_API(bool)
-JS::ModuleEvaluate(JSContext* cx, JS::HandleObject moduleArg)
+JS::ModuleEvaluate(JSContext* cx, JS::HandleScript script)
 {
     AssertHeapIsIdle();
     CHECK_REQUEST(cx);
-    assertSameCompartment(cx, moduleArg);
-    return ModuleObject::Evaluate(cx, moduleArg.as<ModuleObject>());
+    assertSameCompartment(cx, script);
+    RootedModuleObject module(cx, script->module());
+    MOZ_ASSERT(module);
+    return ModuleObject::Evaluate(cx, module);
 }
 
 JS_PUBLIC_API(JSObject*)
-JS::GetRequestedModules(JSContext* cx, JS::HandleObject moduleArg)
+JS::GetRequestedModules(JSContext* cx, JS::HandleScript script)
 {
     AssertHeapIsIdle();
     CHECK_REQUEST(cx);
-    assertSameCompartment(cx, moduleArg);
-    return &moduleArg->as<ModuleObject>().requestedModules();
+    assertSameCompartment(cx, script);
+    RootedModuleObject module(cx, script->module());
+    MOZ_ASSERT(module);
+    return &module->requestedModules();
 }
 
 JS_PUBLIC_API(JSString*)
@@ -4911,13 +4928,6 @@ JS::GetRequestedModuleSourcePos(JSContext* cx, JS::HandleValue value,
     *columnNumber = requested.columnNumber();
 }
 
-JS_PUBLIC_API(JSScript*)
-JS::GetModuleScript(JS::HandleObject moduleRecord)
-{
-    AssertHeapIsIdle();
-    return moduleRecord->as<ModuleObject>().script();
-}
-
 JS_PUBLIC_API(JSObject*)
 JS_New(JSContext* cx, HandleObject ctor, const JS::HandleValueArray& inputArgs)
 {
@@ -7629,18 +7639,11 @@ JS::GetWasmModule(HandleObject obj)
     return &CheckedUnwrap(obj)->as<WasmModuleObject>().module();
 }
 
-JS_PUBLIC_API(bool)
-JS::CompiledWasmModuleAssumptionsMatch(PRFileDesc* compiled, JS::BuildIdCharVector&& buildId)
-{
-    return wasm::CompiledModuleAssumptionsMatch(compiled, std::move(buildId));
-}
-
 JS_PUBLIC_API(RefPtr<JS::WasmModule>)
-JS::DeserializeWasmModule(PRFileDesc* bytecode, PRFileDesc* maybeCompiled,
-                          JS::BuildIdCharVector&& buildId, UniqueChars file,
-                          unsigned line)
+JS::DeserializeWasmModule(PRFileDesc* bytecode, JS::BuildIdCharVector&& buildId,
+                          UniqueChars filename, unsigned line)
 {
-    return wasm::DeserializeModule(bytecode, maybeCompiled, std::move(buildId), std::move(file), line);
+    return wasm::DeserializeModule(bytecode, std::move(buildId), std::move(filename), line);
 }
 
 JS_PUBLIC_API(void)
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 99b24245bf71..5133fd13a79b 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -1234,6 +1234,12 @@ CurrentGlobalOrNull(JSContext* cx);
 extern JS_PUBLIC_API(JSObject*)
 GetNonCCWObjectGlobal(JSObject* obj);
 
+/**
+ * Get the global object associated with a script's realm.
+ */
+extern JS_PUBLIC_API(JSObject*)
+GetScriptGlobal(JSScript* script);
+
 } // namespace JS
 
 /**
@@ -3692,7 +3698,7 @@ CompileOffThreadModule(JSContext* cx, const ReadOnlyCompileOptions& options,
                        JS::SourceBufferHolder& srcBuf,
                        OffThreadCompileCallback callback, void* callbackData);
 
-extern JS_PUBLIC_API(JSObject*)
+extern JS_PUBLIC_API(JSScript*)
 FinishOffThreadModule(JSContext* cx, OffThreadToken* token);
 
 extern JS_PUBLIC_API(void)
@@ -3864,7 +3870,7 @@ extern JS_PUBLIC_API(bool)
 Evaluate(JSContext* cx, const ReadOnlyCompileOptions& options,
          const char* filename, JS::MutableHandleValue rval);
 
-using ModuleResolveHook = JSObject* (*)(JSContext*, HandleObject, HandleString);
+using ModuleResolveHook = JSScript* (*)(JSContext*, HandleScript, HandleString);
 
 /**
  * Get the HostResolveImportedModule hook for the runtime.
@@ -3878,7 +3884,7 @@ GetModuleResolveHook(JSRuntime* rt);
 extern JS_PUBLIC_API(void)
 SetModuleResolveHook(JSRuntime* rt, ModuleResolveHook func);
 
-using ModuleMetadataHook = bool (*)(JSContext*, HandleObject, HandleObject);
+using ModuleMetadataHook = bool (*)(JSContext*, HandleScript, HandleObject);
 
 /**
  * Get the hook for populating the import.meta metadata object.
@@ -3895,24 +3901,24 @@ SetModuleMetadataHook(JSRuntime* rt, ModuleMetadataHook func);
 
 /**
  * Parse the given source buffer as a module in the scope of the current global
- * of cx and return a source text module record.
+ * of cx.
  */
 extern JS_PUBLIC_API(bool)
 CompileModule(JSContext* cx, const ReadOnlyCompileOptions& options,
-              SourceBufferHolder& srcBuf, JS::MutableHandleObject moduleRecord);
+              SourceBufferHolder& srcBuf, JS::MutableHandleScript script);
 
 /**
  * Set the [[HostDefined]] field of a source text module record to the given
  * value.
  */
 extern JS_PUBLIC_API(void)
-SetModuleHostDefinedField(JSObject* module, const JS::Value& value);
+SetModuleHostDefinedField(JSScript* module, const JS::Value& value);
 
 /**
  * Get the [[HostDefined]] field of a source text module record.
  */
 extern JS_PUBLIC_API(JS::Value)
-GetModuleHostDefinedField(JSObject* module);
+GetModuleHostDefinedField(JSScript* script);
 
 /*
  * Perform the ModuleInstantiate operation on the given source text module
@@ -3923,7 +3929,7 @@ GetModuleHostDefinedField(JSObject* module);
  * the module.
  */
 extern JS_PUBLIC_API(bool)
-ModuleInstantiate(JSContext* cx, JS::HandleObject moduleRecord);
+ModuleInstantiate(JSContext* cx, JS::HandleScript script);
 
 /*
  * Perform the ModuleEvaluate operation on the given source text module record.
@@ -3935,7 +3941,7 @@ ModuleInstantiate(JSContext* cx, JS::HandleObject moduleRecord);
  * ModuleInstantiate must have completed prior to calling this.
  */
 extern JS_PUBLIC_API(bool)
-ModuleEvaluate(JSContext* cx, JS::HandleObject moduleRecord);
+ModuleEvaluate(JSContext* cx, JS::HandleScript script);
 
 /*
  * Get a list of the module specifiers used by a source text module
@@ -3954,7 +3960,7 @@ ModuleEvaluate(JSContext* cx, JS::HandleObject moduleRecord);
  * GetRequestedModuleSourcePos()
  */
 extern JS_PUBLIC_API(JSObject*)
-GetRequestedModules(JSContext* cx, JS::HandleObject moduleRecord);
+GetRequestedModules(JSContext* cx, JS::HandleScript script);
 
 extern JS_PUBLIC_API(JSString*)
 GetRequestedModuleSpecifier(JSContext* cx, JS::HandleValue requestedModuleObject);
@@ -3963,9 +3969,6 @@ extern JS_PUBLIC_API(void)
 GetRequestedModuleSourcePos(JSContext* cx, JS::HandleValue requestedModuleObject,
                             uint32_t* lineNumber, uint32_t* columnNumber);
 
-extern JS_PUBLIC_API(JSScript*)
-GetModuleScript(JS::HandleObject moduleRecord);
-
 } /* namespace JS */
 
 #if defined(JS_BUILD_BINAST)
@@ -5976,29 +5979,6 @@ SetBuildIdOp(JSContext* cx, BuildIdOp buildIdOp);
  * JS::WasmModule and thus the final reference of a JS::WasmModule may be
  * dropped from any thread and so the virtual destructor (and all internal
  * methods of the C++ module) must be thread-safe.
- *
- * For (de)serialization:
- *
- * - Serialization starts when WebAssembly.Module is passed to the
- * structured-clone algorithm. JS::GetWasmModule is called on the JSRuntime
- * thread that initiated the structured clone to get the JS::WasmModule.
- * This interface is then taken to a background thread where the bytecode and
- * compiled code are written into separate files: a bytecode file that always
- * allows successful deserialization and a compiled-code file keyed on cpu- and
- * build-id that may become invalid if either of these change between
- * serialization and deserialization. Due to tiering, the serialization must
- * asynchronously wait for compilation to complete before requesting the
- * module's compiled code. After serialization, a reference is dropped from a
- * separate thread so the virtual destructor must be thread-safe.
- *
- * - Deserialization starts when the structured clone algorithm encounters a
- * serialized WebAssembly.Module. On a background thread, the compiled-code file
- * is opened and CompiledWasmModuleAssumptionsMatch is called to see if it is
- * still valid (as described above). DeserializeWasmModule is then called to
- * construct a JS::WasmModule (also on the background thread), passing the
- * bytecode file descriptor and, if valid, the compiled-code file descriptor.
- * The JS::WasmObject is then transported to a JSContext thread and the wrapping
- * WebAssembly.Module object is created by calling createObject().
  */
 
 class WasmModuleListener
@@ -6020,19 +6000,6 @@ class WasmModuleListener
 struct WasmModule : js::AtomicRefCounted<WasmModule>
 {
     virtual ~WasmModule() {}
-
-    virtual size_t bytecodeSerializedSize() const = 0;
-    virtual void bytecodeSerialize(uint8_t* bytecodeBegin, size_t bytecodeSize) const = 0;
-
-    // Compilation must complete before the serialized code is requested. If
-    // compilation is not complete, the embedding must wait until notified by
-    // implementing WasmModuleListener. SpiderMonkey will hold a RefPtr to
-    // 'listener' until onCompilationComplete() is called.
-    virtual bool compilationComplete() const = 0;
-    virtual bool notifyWhenCompilationComplete(WasmModuleListener* listener) = 0;
-    virtual size_t compiledSerializedSize() const = 0;
-    virtual void compiledSerialize(uint8_t* compiledBegin, size_t compiledSize) const = 0;
-
     virtual JSObject* createObject(JSContext* cx) = 0;
 };
 
@@ -6042,11 +6009,8 @@ IsWasmModuleObject(HandleObject obj);
 extern JS_PUBLIC_API(RefPtr<WasmModule>)
 GetWasmModule(HandleObject obj);
 
-extern JS_PUBLIC_API(bool)
-CompiledWasmModuleAssumptionsMatch(PRFileDesc* compiled, BuildIdCharVector&& buildId);
-
 extern JS_PUBLIC_API(RefPtr<WasmModule>)
-DeserializeWasmModule(PRFileDesc* bytecode, PRFileDesc* maybeCompiled, BuildIdCharVector&& buildId,
+DeserializeWasmModule(PRFileDesc* bytecode, BuildIdCharVector&& buildId,
                       JS::UniqueChars filename, unsigned line);
 
 /**
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index 1078b43e0d42..b0e85b72487e 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -795,7 +795,7 @@ GetObjectSlot(JSObject* obj, size_t slot)
 MOZ_ALWAYS_INLINE size_t
 GetAtomLength(JSAtom* atom)
 {
-    return reinterpret_cast<JS::shadow::String*>(atom)->length;
+    return reinterpret_cast<JS::shadow::String*>(atom)->length();
 }
 
 static const uint32_t MaxStringLength = (1 << 28) - 1;
@@ -803,37 +803,37 @@ static const uint32_t MaxStringLength = (1 << 28) - 1;
 MOZ_ALWAYS_INLINE size_t
 GetStringLength(JSString* s)
 {
-    return reinterpret_cast<JS::shadow::String*>(s)->length;
+    return reinterpret_cast<JS::shadow::String*>(s)->length();
 }
 
 MOZ_ALWAYS_INLINE size_t
 GetFlatStringLength(JSFlatString* s)
 {
-    return reinterpret_cast<JS::shadow::String*>(s)->length;
+    return reinterpret_cast<JS::shadow::String*>(s)->length();
 }
 
 MOZ_ALWAYS_INLINE size_t
 GetLinearStringLength(JSLinearString* s)
 {
-    return reinterpret_cast<JS::shadow::String*>(s)->length;
+    return reinterpret_cast<JS::shadow::String*>(s)->length();
 }
 
 MOZ_ALWAYS_INLINE bool
 LinearStringHasLatin1Chars(JSLinearString* s)
 {
-    return reinterpret_cast<JS::shadow::String*>(s)->flags & JS::shadow::String::LATIN1_CHARS_BIT;
+    return reinterpret_cast<JS::shadow::String*>(s)->flags() & JS::shadow::String::LATIN1_CHARS_BIT;
 }
 
 MOZ_ALWAYS_INLINE bool
 AtomHasLatin1Chars(JSAtom* atom)
 {
-    return reinterpret_cast<JS::shadow::String*>(atom)->flags & JS::shadow::String::LATIN1_CHARS_BIT;
+    return reinterpret_cast<JS::shadow::String*>(atom)->flags() & JS::shadow::String::LATIN1_CHARS_BIT;
 }
 
 MOZ_ALWAYS_INLINE bool
 StringHasLatin1Chars(JSString* s)
 {
-    return reinterpret_cast<JS::shadow::String*>(s)->flags & JS::shadow::String::LATIN1_CHARS_BIT;
+    return reinterpret_cast<JS::shadow::String*>(s)->flags() & JS::shadow::String::LATIN1_CHARS_BIT;
 }
 
 MOZ_ALWAYS_INLINE const JS::Latin1Char*
@@ -843,7 +843,7 @@ GetLatin1LinearStringChars(const JS::AutoRequireNoGC& nogc, JSLinearString* line
 
     using JS::shadow::String;
     String* s = reinterpret_cast<String*>(linear);
-    if (s->flags & String::INLINE_CHARS_BIT)
+    if (s->flags() & String::INLINE_CHARS_BIT)
         return s->inlineStorageLatin1;
     return s->nonInlineCharsLatin1;
 }
@@ -855,7 +855,7 @@ GetTwoByteLinearStringChars(const JS::AutoRequireNoGC& nogc, JSLinearString* lin
 
     using JS::shadow::String;
     String* s = reinterpret_cast<String*>(linear);
-    if (s->flags & String::INLINE_CHARS_BIT)
+    if (s->flags() & String::INLINE_CHARS_BIT)
         return s->inlineStorageTwoByte;
     return s->nonInlineCharsTwoByte;
 }
@@ -896,7 +896,7 @@ IsExternalString(JSString* str, const JSStringFinalizer** fin, const char16_t**
     using JS::shadow::String;
     String* s = reinterpret_cast<String*>(str);
 
-    if ((s->flags & String::TYPE_FLAGS_MASK) != String::EXTERNAL_FLAGS)
+    if ((s->flags() & String::TYPE_FLAGS_MASK) != String::EXTERNAL_FLAGS)
         return false;
 
     MOZ_ASSERT(JS_IsExternalString(str));
@@ -913,7 +913,7 @@ StringToLinearString(JSContext* cx, JSString* str)
 {
     using JS::shadow::String;
     String* s = reinterpret_cast<String*>(str);
-    if (MOZ_UNLIKELY(!(s->flags & String::LINEAR_BIT)))
+    if (MOZ_UNLIKELY(!(s->flags() & String::LINEAR_BIT)))
         return StringToLinearStringSlow(cx, str);
     return reinterpret_cast<JSLinearString*>(str);
 }
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index d4b759913e7b..ede007073ff7 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -852,6 +852,12 @@ case "$target" in
         fi
         AC_DEFINE(_AMD64_)
         ;;
+    aarch64-*)
+        if test -n "$_WIN32_MSVC"; then
+            DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64"
+        fi
+        AC_DEFINE(_ARM64_)
+        ;;
     *)
     	AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
 	;;
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 7e4e6f478e40..bdb3d7daa7e3 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -4299,11 +4299,11 @@ ParseModule(JSContext* cx, unsigned argc, Value* vp)
     SourceBufferHolder srcBuf(chars, scriptContents->length(),
                               SourceBufferHolder::NoOwnership);
 
-    RootedObject module(cx, frontend::CompileModule(cx, options, srcBuf));
-    if (!module)
+    RootedScript script(cx, frontend::CompileModule(cx, options, srcBuf));
+    if (!script)
         return false;
 
-    args.rval().setObject(*module);
+    args.rval().setObject(*script->module());
     return true;
 }
 
@@ -4330,9 +4330,11 @@ SetModuleResolveHook(JSContext* cx, unsigned argc, Value* vp)
     return true;
 }
 
-static JSObject*
-CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier)
+static JSScript*
+CallModuleResolveHook(JSContext* cx, HandleScript script, HandleString specifier)
 {
+    MOZ_ASSERT(script->module());
+
     Handle<GlobalObject*> global = cx->global();
     RootedValue hookValue(cx, global->getReservedSlot(GlobalAppSlotModuleResolveHook));
     if (hookValue.isUndefined()) {
@@ -4342,7 +4344,7 @@ CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier
     MOZ_ASSERT(hookValue.toObject().is<JSFunction>());
 
     JS::AutoValueArray<2> args(cx);
-    args[0].setObject(*module);
+    args[0].setObject(*script->module());
     args[1].setString(specifier);
 
     RootedValue result(cx);
@@ -4354,14 +4356,13 @@ CallModuleResolveHook(JSContext* cx, HandleObject module, HandleString specifier
          return nullptr;
     }
 
-    return &result.toObject();
+    return result.toObject().as<ModuleObject>().script();
 }
 
 static bool
-ShellModuleMetadataHook(JSContext* cx, HandleObject module, HandleObject metaObject)
+ShellModuleMetadataHook(JSContext* cx, HandleScript script, HandleObject metaObject)
 {
     // For the shell, just use the script's filename as the base URL.
-    RootedScript script(cx, module->as<ModuleObject>().script());
     const char* filename = script->scriptSource()->filename();
     MOZ_ASSERT(filename);
 
@@ -4863,11 +4864,11 @@ FinishOffThreadModule(JSContext* cx, unsigned argc, Value* vp)
 
     DeleteOffThreadJob(cx, job);
 
-    RootedObject module(cx, JS::FinishOffThreadModule(cx, token));
-    if (!module)
+    RootedScript script(cx, JS::FinishOffThreadModule(cx, token));
+    if (!script)
         return false;
 
-    args.rval().setObject(*module);
+    args.rval().setObject(*script->module());
     return true;
 }
 
diff --git a/js/src/tests/non262/generators/yield-star-throw-htmldda.js b/js/src/tests/non262/generators/yield-star-throw-htmldda.js
new file mode 100644
index 000000000000..a903da02f732
--- /dev/null
+++ b/js/src/tests/non262/generators/yield-star-throw-htmldda.js
@@ -0,0 +1,28 @@
+function* g(iter) {
+    yield* iter;
+}
+
+var calledReturn = false;
+
+var it = g({
+    [Symbol.iterator]() {
+        return this;
+    },
+    next() {
+        return {done: false};
+    },
+    throw: createIsHTMLDDA(),
+    return() {
+        calledReturn = true;
+        return {done: false};
+    }
+});
+
+it.next();
+
+assertThrowsInstanceOf(() => it.throw(""), TypeError);
+
+assertEq(calledReturn, false);
+
+if (typeof reportCompare === "function")
+    reportCompare(0, 0);
diff --git a/js/src/vm/BigIntType.h b/js/src/vm/BigIntType.h
index 595c890bb919..6dfa42f4ad79 100644
--- a/js/src/vm/BigIntType.h
+++ b/js/src/vm/BigIntType.h
@@ -38,13 +38,16 @@ class BigInt final : public js::gc::TenuredCell
     friend bool js::StringToBigIntImpl(const mozilla::Range<const CharT>& chars,
                                        uint8_t radix, Handle<BigInt*> res);
 
+  protected:
+    // Reserved word for Cell GC invariants. This also ensures minimum
+    // structure size.
+    uintptr_t reserved_;
+
   private:
-    // The minimum allocation size is currently 16 bytes (see
-    // SortedArenaList in gc/ArenaList.h).
-    union {
-        mpz_t num_;
-        uint8_t unused_[js::gc::MinCellSize];
-    };
+    mpz_t num_;
+
+  protected:
+    BigInt() : reserved_(0) { }
 
   public:
     // Allocate and initialize a BigInt value
diff --git a/js/src/vm/HelperThreads.cpp b/js/src/vm/HelperThreads.cpp
index c25136b0fd89..e817db9908ab 100644
--- a/js/src/vm/HelperThreads.cpp
+++ b/js/src/vm/HelperThreads.cpp
@@ -525,9 +525,9 @@ ModuleParseTask::parse(JSContext* cx)
 {
     Rooted<ScriptSourceObject*> sourceObject(cx);
 
-    ModuleObject* module = frontend::CompileModule(cx, options, data, alloc, &sourceObject.get());
-    if (module) {
-        scripts.infallibleAppend(module->script());
+    JSScript* script = frontend::CompileModule(cx, options, data, alloc, &sourceObject.get());
+    if (script) {
+        scripts.infallibleAppend(script);
         if (sourceObject)
             sourceObjects.infallibleAppend(sourceObject);
     }
@@ -1806,10 +1806,10 @@ GlobalHelperThreadState::finishMultiScriptsDecodeTask(JSContext* cx, JS::OffThre
     return finishParseTask(cx, ParseTaskKind::MultiScriptsDecode, token, scripts);
 }
 
-JSObject*
+JSScript*
 GlobalHelperThreadState::finishModuleParseTask(JSContext* cx, JS::OffThreadToken* token)
 {
-    JSScript* script = finishParseTask(cx, ParseTaskKind::Module, token);
+    RootedScript script(cx, finishParseTask(cx, ParseTaskKind::Module, token));
     if (!script)
         return nullptr;
 
@@ -1820,7 +1820,7 @@ GlobalHelperThreadState::finishModuleParseTask(JSContext* cx, JS::OffThreadToken
     if (!ModuleObject::Freeze(cx, module))
         return nullptr;
 
-    return module;
+    return script;
 }
 
 void
diff --git a/js/src/vm/HelperThreads.h b/js/src/vm/HelperThreads.h
index c9733be16caf..f0bd0124945c 100644
--- a/js/src/vm/HelperThreads.h
+++ b/js/src/vm/HelperThreads.h
@@ -306,7 +306,7 @@ class GlobalHelperThreadState
     JSScript* finishScriptParseTask(JSContext* cx, JS::OffThreadToken* token);
     JSScript* finishScriptDecodeTask(JSContext* cx, JS::OffThreadToken* token);
     bool finishMultiScriptsDecodeTask(JSContext* cx, JS::OffThreadToken* token, MutableHandle<ScriptVector> scripts);
-    JSObject* finishModuleParseTask(JSContext* cx, JS::OffThreadToken* token);
+    JSScript* finishModuleParseTask(JSContext* cx, JS::OffThreadToken* token);
 
 #if defined(JS_BUILD_BINAST)
     JSScript* finishBinASTDecodeTask(JSContext* cx, JS::OffThreadToken* token);
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 6833d11736d1..e26e568b05e8 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -4396,7 +4396,8 @@ CASE(JSOP_IMPORTMETA)
     ReservedRooted<JSObject*> module(&rootObject0, GetModuleObjectForScript(script));
     MOZ_ASSERT(module);
 
-    JSObject* metaObject = GetOrCreateModuleMetaObject(cx, module);
+    ReservedRooted<JSScript*> script(&rootScript0, module->as<ModuleObject>().script());
+    JSObject* metaObject = GetOrCreateModuleMetaObject(cx, script);
     if (!metaObject)
         goto error;
 
diff --git a/js/src/vm/JSObject-inl.h b/js/src/vm/JSObject-inl.h
index 15fd921d4efb..530a79a954fe 100644
--- a/js/src/vm/JSObject-inl.h
+++ b/js/src/vm/JSObject-inl.h
@@ -211,6 +211,13 @@ js::IsExtensible(JSContext* cx, HandleObject obj, bool* extensible)
     }
 
     *extensible = obj->nonProxyIsExtensible();
+
+    // If the following assertion fails, there's somewhere else a missing
+    // call to shrinkCapacityToInitializedLength() which needs to be found and
+    // fixed.
+    MOZ_ASSERT_IF(obj->isNative() && !*extensible,
+                  obj->as<NativeObject>().getDenseInitializedLength() ==
+                  obj->as<NativeObject>().getDenseCapacity());
     return true;
 }
 
diff --git a/js/src/vm/JSObject.cpp b/js/src/vm/JSObject.cpp
index 0f710e7c73a5..060133275796 100644
--- a/js/src/vm/JSObject.cpp
+++ b/js/src/vm/JSObject.cpp
@@ -2737,8 +2737,16 @@ js::PreventExtensions(JSContext* cx, HandleObject obj, ObjectOpResult& result)
     if (obj->is<ProxyObject>())
         return js::Proxy::preventExtensions(cx, obj, result);
 
-    if (!obj->nonProxyIsExtensible())
+    if (!obj->nonProxyIsExtensible()) {
+        // If the following assertion fails, there's somewhere else a missing
+        // call to shrinkCapacityToInitializedLength() which needs to be found
+        // and fixed.
+        MOZ_ASSERT_IF(obj->isNative(),
+                      obj->as<NativeObject>().getDenseInitializedLength() ==
+                      obj->as<NativeObject>().getDenseCapacity());
+
         return result.succeed();
+    }
 
     if (!MaybeConvertUnboxedObjectToNative(cx, obj))
         return false;
diff --git a/js/src/vm/MutexIDs.h b/js/src/vm/MutexIDs.h
index 50bfd410cfcc..86140fff1619 100644
--- a/js/src/vm/MutexIDs.h
+++ b/js/src/vm/MutexIDs.h
@@ -50,7 +50,6 @@
   _(RuntimeScriptData,           500) \
   _(WasmFuncTypeIdSet,           500) \
   _(WasmCodeProfilingLabels,     500) \
-  _(WasmModuleTieringLock,       500) \
   _(WasmCompileTaskState,        500) \
   _(WasmCodeStreamEnd,           500) \
   _(WasmTailBytesPtr,            500) \
diff --git a/js/src/vm/NativeObject.cpp b/js/src/vm/NativeObject.cpp
index c2db4899684b..43f2130b5e40 100644
--- a/js/src/vm/NativeObject.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -969,7 +969,7 @@ void
 NativeObject::shrinkElements(JSContext* cx, uint32_t reqCapacity)
 {
     MOZ_ASSERT(canHaveNonEmptyElements());
-    MOZ_ASSERT(reqCapacity >= getDenseInitializedLengthUnchecked());
+    MOZ_ASSERT(reqCapacity >= getDenseInitializedLength());
 
     if (denseElementsAreCopyOnWrite())
         MOZ_CRASH();
diff --git a/js/src/vm/NativeObject.h b/js/src/vm/NativeObject.h
index b6db568847d1..271039fba358 100644
--- a/js/src/vm/NativeObject.h
+++ b/js/src/vm/NativeObject.h
@@ -530,20 +530,7 @@ class NativeObject : public ShapedObject
     bool containsDenseElement(uint32_t idx) {
         return idx < getDenseInitializedLength() && !elements_[idx].isMagic(JS_ELEMENTS_HOLE);
     }
-
-  private:
-    uint32_t getDenseInitializedLengthUnchecked() const {
-        return getElementsHeader()->initializedLength;
-    }
-
-  public:
     uint32_t getDenseInitializedLength() const {
-        // If the following assertion fails, there's somewhere else a missing
-        // call to shrinkCapacityToInitializedLength(). Good luck for the hunt
-        // and finding the offender!
-        MOZ_ASSERT_IF(!isExtensible(),
-                      getElementsHeader()->initializedLength == getElementsHeader()->capacity);
-
         return getElementsHeader()->initializedLength;
     }
     uint32_t getDenseCapacity() const {
diff --git a/js/src/vm/Realm.cpp b/js/src/vm/Realm.cpp
index 80272d78398d..98a795f831ca 100644
--- a/js/src/vm/Realm.cpp
+++ b/js/src/vm/Realm.cpp
@@ -1021,6 +1021,12 @@ JS::GetObjectRealmOrNull(JSObject* obj)
     return IsCrossCompartmentWrapper(obj) ? nullptr : obj->nonCCWRealm();
 }
 
+JS_PUBLIC_API(JS::Realm*)
+JS::GetScriptRealm(JSScript* script)
+{
+    return script->realm();
+}
+
 JS_PUBLIC_API(void*)
 JS::GetRealmPrivate(JS::Realm* realm)
 {
diff --git a/js/src/vm/Scope.cpp b/js/src/vm/Scope.cpp
index 0e33dcbfc3e4..fcfed461bfa9 100644
--- a/js/src/vm/Scope.cpp
+++ b/js/src/vm/Scope.cpp
@@ -435,8 +435,8 @@ Scope::finalize(FreeOp* fop)
     if (data_) {
         // We don't need to call the destructors for any GCPtrs in Data because
         // this only happens during a GC.
-        fop->free_(reinterpret_cast<void*>(data_));
-        data_ = 0;
+        fop->free_(data_);
+        data_ = nullptr;
     }
 }
 
@@ -444,7 +444,7 @@ size_t
 Scope::sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const
 {
     if (data_)
-        return mallocSizeOf(reinterpret_cast<void*>(data_));
+        return mallocSizeOf(data_);
     return 0;
 }
 
diff --git a/js/src/vm/Scope.h b/js/src/vm/Scope.h
index 4ab2e4ecb5ec..e437e93db548 100644
--- a/js/src/vm/Scope.h
+++ b/js/src/vm/Scope.h
@@ -26,6 +26,7 @@
 
 namespace js {
 
+class BaseScopeData;
 class ModuleObject;
 class Scope;
 
@@ -304,34 +305,24 @@ class Scope : public js::gc::TenuredCell
 {
     friend class GCMarker;
 
-    // The kind determines data_.
-    //
-    // The memory here must be fully initialized, since otherwise the magic_
-    // value for gc::RelocationOverlay will land in the padding and may be
-    // stale.
-    union {
-        ScopeKind kind_;
-        uintptr_t paddedKind_;
-    };
-
     // The enclosing scope or nullptr.
     GCPtrScope enclosing_;
 
+    // The kind determines data_.
+    ScopeKind kind_;
+
     // If there are any aliased bindings, the shape for the
     // EnvironmentObject. Otherwise nullptr.
     GCPtrShape environmentShape_;
 
   protected:
-    uintptr_t data_;
+    BaseScopeData* data_;
 
     Scope(ScopeKind kind, Scope* enclosing, Shape* environmentShape)
       : enclosing_(enclosing),
+        kind_(kind),
         environmentShape_(environmentShape),
-        data_(0)
-    {
-        paddedKind_ = 0;
-        kind_ = kind;
-    }
+        data_(nullptr) { }
 
     static Scope* create(JSContext* cx, ScopeKind kind, HandleScope enclosing,
                          HandleShape envShape);
@@ -349,7 +340,7 @@ class Scope : public js::gc::TenuredCell
     template <typename T, typename D>
     void initData(mozilla::UniquePtr<T, D> data) {
         MOZ_ASSERT(!data_);
-        data_ = reinterpret_cast<uintptr_t>(data.release());
+        data_ = data.release();
     }
 
   public:
@@ -469,7 +460,7 @@ class LexicalScope : public Scope
   public:
     // Data is public because it is created by the frontend. See
     // Parser<FullParseHandler>::newLexicalScopeData.
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         // Bindings are sorted by kind in both frames and environments.
         //
@@ -505,11 +496,11 @@ class LexicalScope : public Scope
                                         uint32_t firstFrameSlot, HandleScope enclosing);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     static uint32_t nextFrameSlot(Scope* start);
@@ -566,7 +557,7 @@ class FunctionScope : public Scope
   public:
     // Data is public because it is created by the
     // frontend. See Parser<FullParseHandler>::newFunctionScopeData.
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         // The canonical function of the scope, as during a scope walk we
         // often query properties of the JSFunction (e.g., is the function an
@@ -640,11 +631,11 @@ class FunctionScope : public Scope
                                          HandleFunction fun, HandleScope enclosing);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -699,7 +690,7 @@ class VarScope : public Scope
   public:
     // Data is public because it is created by the
     // frontend. See Parser<FullParseHandler>::newVarScopeData.
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         // All bindings are vars.
         uint32_t length = 0;
@@ -732,11 +723,11 @@ class VarScope : public Scope
                                     HandleScope enclosing);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -822,11 +813,11 @@ class GlobalScope : public Scope
                                        MutableHandle<UniquePtr<Data>> data);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -879,7 +870,7 @@ class EvalScope : public Scope
   public:
     // Data is public because it is created by the frontend. See
     // Parser<FullParseHandler>::newEvalScopeData.
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         // All bindings in an eval script are 'var' bindings. The implicit
         // lexical scope around the eval is present regardless of strictness
@@ -917,11 +908,11 @@ class EvalScope : public Scope
                                      HandleScope enclosing);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -1014,11 +1005,11 @@ class ModuleScope : public Scope
                                        Handle<ModuleObject*> module, HandleScope enclosing);
 
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -1042,7 +1033,7 @@ class WasmInstanceScope : public Scope
     static const ScopeKind classScopeKind_ = ScopeKind::WasmInstance;
 
   public:
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         uint32_t memoriesStart = 0;
         uint32_t globalsStart = 0;
@@ -1064,11 +1055,11 @@ class WasmInstanceScope : public Scope
 
   private:
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
@@ -1101,7 +1092,7 @@ class WasmFunctionScope : public Scope
     static const ScopeKind classScopeKind_ = ScopeKind::WasmFunction;
 
   public:
-    struct Data : BaseScopeData
+    struct Data : public BaseScopeData
     {
         uint32_t length = 0;
         uint32_t nextFrameSlot = 0;
@@ -1119,11 +1110,11 @@ class WasmFunctionScope : public Scope
 
   private:
     Data& data() {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
     const Data& data() const {
-        return *reinterpret_cast<Data*>(data_);
+        return *static_cast<Data*>(data_);
     }
 
   public:
diff --git a/js/src/vm/SelfHosting.cpp b/js/src/vm/SelfHosting.cpp
index e57e1885c38d..df4650e2c7f7 100644
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -2151,17 +2151,18 @@ intrinsic_HostResolveImportedModule(JSContext* cx, unsigned argc, Value* vp)
         return false;
     }
 
-    RootedObject result(cx);
-    result = moduleResolveHook(cx, module, specifier);
+    RootedScript script(cx, module->script());
+    RootedScript result(cx);
+    result = moduleResolveHook(cx, script, specifier);
     if (!result)
         return false;
 
-    if (!result->is<ModuleObject>()) {
-        JS_ReportErrorASCII(cx, "Module resolve hook did not return Module object");
+    if (!result->module()) {
+        JS_ReportErrorASCII(cx, "Module resolve hook did not return a module script");
         return false;
     }
 
-    args.rval().setObject(*result);
+    args.rval().setObject(*result->module());
     return true;
 }
 
diff --git a/js/src/vm/StringType-inl.h b/js/src/vm/StringType-inl.h
index a05f8f573793..dfa1bdd92130 100644
--- a/js/src/vm/StringType-inl.h
+++ b/js/src/vm/StringType-inl.h
@@ -97,13 +97,27 @@ JSString::validateLength(JSContext* maybecx, size_t length)
     return true;
 }
 
+template<>
+MOZ_ALWAYS_INLINE const char16_t*
+JSString::nonInlineCharsRaw() const
+{
+    return d.s.u2.nonInlineCharsTwoByte;
+}
+
+template<>
+MOZ_ALWAYS_INLINE const JS::Latin1Char*
+JSString::nonInlineCharsRaw() const
+{
+    return d.s.u2.nonInlineCharsLatin1;
+}
+
 MOZ_ALWAYS_INLINE void
 JSRope::init(JSContext* cx, JSString* left, JSString* right, size_t length)
 {
-    d.u1.length = length;
-    d.u1.flags = INIT_ROPE_FLAGS;
     if (left->hasLatin1Chars() && right->hasLatin1Chars())
-        d.u1.flags |= LATIN1_CHARS_BIT;
+        setLengthAndFlags(length, INIT_ROPE_FLAGS | LATIN1_CHARS_BIT);
+    else
+        setLengthAndFlags(length, INIT_ROPE_FLAGS);
     d.s.u2.left = left;
     d.s.u3.right = right;
 
@@ -139,13 +153,12 @@ JSDependentString::init(JSContext* cx, JSLinearString* base, size_t start,
                         size_t length)
 {
     MOZ_ASSERT(start + length <= base->length());
-    d.u1.length = length;
     JS::AutoCheckCannotGC nogc;
     if (base->hasLatin1Chars()) {
-        d.u1.flags = DEPENDENT_FLAGS | LATIN1_CHARS_BIT;
+        setLengthAndFlags(length, DEPENDENT_FLAGS | LATIN1_CHARS_BIT);
         d.s.u2.nonInlineCharsLatin1 = base->latin1Chars(nogc) + start;
     } else {
-        d.u1.flags = DEPENDENT_FLAGS;
+        setLengthAndFlags(length, DEPENDENT_FLAGS);
         d.s.u2.nonInlineCharsTwoByte = base->twoByteChars(nogc) + start;
     }
     d.s.u3.base = base;
@@ -206,16 +219,14 @@ JSDependentString::new_(JSContext* cx, JSLinearString* baseArg, size_t start,
 MOZ_ALWAYS_INLINE void
 JSFlatString::init(const char16_t* chars, size_t length)
 {
-    d.u1.length = length;
-    d.u1.flags = INIT_FLAT_FLAGS;
+    setLengthAndFlags(length, INIT_FLAT_FLAGS);
     d.s.u2.nonInlineCharsTwoByte = chars;
 }
 
 MOZ_ALWAYS_INLINE void
 JSFlatString::init(const JS::Latin1Char* chars, size_t length)
 {
-    d.u1.length = length;
-    d.u1.flags = INIT_FLAT_FLAGS | LATIN1_CHARS_BIT;
+    setLengthAndFlags(length, INIT_FLAT_FLAGS | LATIN1_CHARS_BIT);
     d.s.u2.nonInlineCharsLatin1 = chars;
 }
 
@@ -294,8 +305,7 @@ MOZ_ALWAYS_INLINE JS::Latin1Char*
 JSThinInlineString::init<JS::Latin1Char>(size_t length)
 {
     MOZ_ASSERT(lengthFits<JS::Latin1Char>(length));
-    d.u1.length = length;
-    d.u1.flags = INIT_THIN_INLINE_FLAGS | LATIN1_CHARS_BIT;
+    setLengthAndFlags(length, INIT_THIN_INLINE_FLAGS | LATIN1_CHARS_BIT);
     return d.inlineStorageLatin1;
 }
 
@@ -304,8 +314,7 @@ MOZ_ALWAYS_INLINE char16_t*
 JSThinInlineString::init<char16_t>(size_t length)
 {
     MOZ_ASSERT(lengthFits<char16_t>(length));
-    d.u1.length = length;
-    d.u1.flags = INIT_THIN_INLINE_FLAGS;
+    setLengthAndFlags(length, INIT_THIN_INLINE_FLAGS);
     return d.inlineStorageTwoByte;
 }
 
@@ -314,8 +323,7 @@ MOZ_ALWAYS_INLINE JS::Latin1Char*
 JSFatInlineString::init<JS::Latin1Char>(size_t length)
 {
     MOZ_ASSERT(lengthFits<JS::Latin1Char>(length));
-    d.u1.length = length;
-    d.u1.flags = INIT_FAT_INLINE_FLAGS | LATIN1_CHARS_BIT;
+    setLengthAndFlags(length, INIT_FAT_INLINE_FLAGS | LATIN1_CHARS_BIT);
     return d.inlineStorageLatin1;
 }
 
@@ -324,8 +332,7 @@ MOZ_ALWAYS_INLINE char16_t*
 JSFatInlineString::init<char16_t>(size_t length)
 {
     MOZ_ASSERT(lengthFits<char16_t>(length));
-    d.u1.length = length;
-    d.u1.flags = INIT_FAT_INLINE_FLAGS;
+    setLengthAndFlags(length, INIT_FAT_INLINE_FLAGS);
     return d.inlineStorageTwoByte;
 }
 
@@ -334,8 +341,7 @@ JSExternalString::init(const char16_t* chars, size_t length, const JSStringFinal
 {
     MOZ_ASSERT(fin);
     MOZ_ASSERT(fin->finalize);
-    d.u1.length = length;
-    d.u1.flags = EXTERNAL_FLAGS;
+    setLengthAndFlags(length, EXTERNAL_FLAGS);
     d.s.u2.nonInlineCharsTwoByte = chars;
     d.s.u3.externalFinalizer = fin;
 }
diff --git a/js/src/vm/StringType.cpp b/js/src/vm/StringType.cpp
index 0c743092910b..5fdbde5a6577 100644
--- a/js/src/vm/StringType.cpp
+++ b/js/src/vm/StringType.cpp
@@ -212,7 +212,7 @@ JSString::dumpRepresentation(js::GenericPrinter& out, int indent) const
 void
 JSString::dumpRepresentationHeader(js::GenericPrinter& out, const char* subclass) const
 {
-    uint32_t flags = d.u1.flags;
+    uint32_t flags = JSString::flags();
     // Print the string's address as an actual C++ expression, to facilitate
     // copy-and-paste into a debugger.
     out.printf("((%s*) %p) length: %zu  flags: 0x%x", subclass, this, length(), flags);
@@ -518,10 +518,8 @@ JSRope::flattenInternal(JSContext* maybecx)
     JSString* str = this;
     CharT* pos;
 
-    /*
-     * JSString::flattenData is a tagged pointer to the parent node.
-     * The tag indicates what to do when we return to the parent.
-     */
+    // JSString::setFlattenData() is used to store a tagged pointer to the
+    // parent node. The tag indicates what to do when we return to the parent.
     static const uintptr_t Tag_Mask = 0x3;
     static const uintptr_t Tag_FinishNode = 0x0;
     static const uintptr_t Tag_VisitRightChild = 0x1;
@@ -556,7 +554,7 @@ JSRope::flattenInternal(JSContext* maybecx)
                 // 'child' will be post-barriered during the later traversal.
                 MOZ_ASSERT(child->isRope());
                 str->setNonInlineChars(wholeChars);
-                child->d.u1.flattenData = uintptr_t(str) | Tag_VisitRightChild;
+                child->setFlattenData(uintptr_t(str) | Tag_VisitRightChild);
                 str = child;
             }
             if (b == WithIncrementalBarrier) {
@@ -564,11 +562,12 @@ JSRope::flattenInternal(JSContext* maybecx)
                 JSString::writeBarrierPre(str->d.s.u3.right);
             }
             str->setNonInlineChars(wholeChars);
-            pos = wholeChars + left.d.u1.length;
+            uint32_t left_len = left.length();
+            pos = wholeChars + left_len;
             if (IsSame<CharT, char16_t>::value)
-                left.d.u1.flags = DEPENDENT_FLAGS;
+                left.setLengthAndFlags(left_len, DEPENDENT_FLAGS);
             else
-                left.d.u1.flags = DEPENDENT_FLAGS | LATIN1_CHARS_BIT;
+                left.setLengthAndFlags(left_len, DEPENDENT_FLAGS | LATIN1_CHARS_BIT);
             left.d.s.u3.base = (JSLinearString*)this;  /* will be true on exit */
             Nursery& nursery = runtimeFromMainThread()->gc.nursery();
             bool inTenured = !bufferIfNursery;
@@ -614,7 +613,7 @@ JSRope::flattenInternal(JSContext* maybecx)
         str->setNonInlineChars(pos);
         if (left.isRope()) {
             /* Return to this node when 'left' done, then goto visit_right_child. */
-            left.d.u1.flattenData = uintptr_t(str) | Tag_VisitRightChild;
+            left.setFlattenData(uintptr_t(str) | Tag_VisitRightChild);
             str = &left;
             goto first_visit_node;
         }
@@ -625,7 +624,7 @@ JSRope::flattenInternal(JSContext* maybecx)
         JSString& right = *str->d.s.u3.right;
         if (right.isRope()) {
             /* Return to this node when 'right' done, then goto finish_node. */
-            right.d.u1.flattenData = uintptr_t(str) | Tag_FinishNode;
+            right.setFlattenData(uintptr_t(str) | Tag_FinishNode);
             str = &right;
             goto first_visit_node;
         }
@@ -637,21 +636,20 @@ JSRope::flattenInternal(JSContext* maybecx)
         if (str == this) {
             MOZ_ASSERT(pos == wholeChars + wholeLength);
             *pos = '\0';
-            str->d.u1.length = wholeLength;
             if (IsSame<CharT, char16_t>::value)
-                str->d.u1.flags = EXTENSIBLE_FLAGS;
+                str->setLengthAndFlags(wholeLength, EXTENSIBLE_FLAGS);
             else
-                str->d.u1.flags = EXTENSIBLE_FLAGS | LATIN1_CHARS_BIT;
+                str->setLengthAndFlags(wholeLength, EXTENSIBLE_FLAGS | LATIN1_CHARS_BIT);
             str->setNonInlineChars(wholeChars);
             str->d.s.u3.capacity = wholeCapacity;
             return &this->asFlat();
         }
-        uintptr_t flattenData = str->d.u1.flattenData;
+        uintptr_t flattenData;
+        uint32_t len = pos - str->nonInlineCharsRaw<CharT>();
         if (IsSame<CharT, char16_t>::value)
-            str->d.u1.flags = DEPENDENT_FLAGS;
+            flattenData = str->unsetFlattenData(len, DEPENDENT_FLAGS);
         else
-            str->d.u1.flags = DEPENDENT_FLAGS | LATIN1_CHARS_BIT;
-        str->d.u1.length = pos - str->asLinear().nonInlineChars<CharT>(nogc);
+            flattenData = str->unsetFlattenData(len, DEPENDENT_FLAGS | LATIN1_CHARS_BIT);
         str->d.s.u3.base = (JSLinearString*)this;       /* will be true on exit */
 
         // Every interior (rope) node in the rope's tree will be visited during
@@ -806,9 +804,9 @@ JSDependentString::undependInternal(JSContext* cx)
      * for the benefit of any other dependent string that depends on *this.
      */
     if (IsSame<CharT, Latin1Char>::value)
-        d.u1.flags = UNDEPENDED_FLAGS | LATIN1_CHARS_BIT;
+        setLengthAndFlags(n, UNDEPENDED_FLAGS | LATIN1_CHARS_BIT);
     else
-        d.u1.flags = UNDEPENDED_FLAGS;
+        setLengthAndFlags(n, UNDEPENDED_FLAGS);
 
     return &this->asFlat();
 }
@@ -1383,8 +1381,8 @@ JSExternalString::ensureFlat(JSContext* cx)
     // Transform the string into a non-external, flat string. Note that the
     // resulting string will still be in an AllocKind::EXTERNAL_STRING arena,
     // but will no longer be an external string.
+    setLengthAndFlags(n, INIT_FLAT_FLAGS);
     setNonInlineChars<char16_t>(s.release());
-    d.u1.flags = INIT_FLAT_FLAGS;
 
     return &this->asFlat();
 }
diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h
index 8f1b90ca577c..f90f44554a4e 100644
--- a/js/src/vm/StringType.h
+++ b/js/src/vm/StringType.h
@@ -165,13 +165,21 @@ class JSString : public js::gc::Cell
     /* Fields only apply to string types commented on the right. */
     struct Data
     {
-        union {
-            struct {
-                uint32_t           flags;               /* JSString */
-                uint32_t           length;              /* JSString */
-            };
-            uintptr_t              flattenData;         /* JSRope (temporary while flattening) */
-        } u1;
+        // First word of a Cell has additional requirements from GC and normally
+        // would store a pointer. If a single word isn't large enough, the length
+        // is stored separately.
+        //          32      16       0
+        //  --------------------------
+        //  | Length | Index | Flags |
+        //  --------------------------
+        //
+        // NOTE: This is also used for temporary storage while linearizing a Rope.
+        uintptr_t flags_;                               /* JSString */
+
+#if JS_BITS_PER_WORD == 32
+        // Additional storage for length if |flags_| is too small to fit both.
+        uint32_t                   length_;             /* JSString */
+#endif
         union {
             union {
                 /* JS(Fat)InlineString */
@@ -198,9 +206,11 @@ class JSString : public js::gc::Cell
     /* Flags exposed only for jits */
 
     /*
-     * The Flags Word
+     * Flag Encoding
      *
-     * The flags word stores both the string's type and its character encoding.
+     * The first word of a JSString stores flags, index, and (on some
+     * platforms) the length. The flags store both the string's type and its
+     * character encoding.
      *
      * If LATIN1_CHARS_BIT is set, the string's characters are stored as Latin1
      * instead of TwoByte. This flag can also be set for ropes, if both the
@@ -252,31 +262,30 @@ class JSString : public js::gc::Cell
      *  to be null-terminated.  In such cases, the string must keep marking its base since
      *  there may be any number of *other* JSDependentStrings transitively depending on it.
      *
-     * The atom bit (NON_ATOM_BIT) is inverted so that objects and strings can
-     * be differentiated in the nursery: atoms are never in the nursery, so
-     * this bit is always 1 for a nursery string. For an object on a
-     * little-endian architecture, this is the low-order bit of the ObjectGroup
-     * pointer in a JSObject, which will always be zero. A 64-bit big-endian
-     * architecture will need to do something else (the ObjectGroup* is in the
-     * same place as a string's struct { uint32_t flags; uint32_t length; }).
+     * The atom bit (NON_ATOM_BIT) is inverted and stored in a Cell
+     * ReservedBit. Atoms are never stored in nursery, so the nursery can use
+     * this bit to distinguish between JSString (1) and JSObject (0).
      *
-     * If the INDEX_VALUE_BIT is set the upper 16 bits of the flag word hold the integer
-     * index.
+     * If the INDEX_VALUE_BIT is set, flags will also hold an integer index.
      */
 
-    static const uint32_t NON_ATOM_BIT           = JS_BIT(0);
-    static const uint32_t LINEAR_BIT             = JS_BIT(1);
-    static const uint32_t HAS_BASE_BIT           = JS_BIT(2);
-    static const uint32_t INLINE_CHARS_BIT       = JS_BIT(3);
+    // The low bits of flag word are reserved by GC.
+    static_assert(js::gc::Cell::ReservedBits <= 3,
+                  "JSString::flags must reserve enough bits for Cell");
+
+    static const uint32_t NON_ATOM_BIT           = js::gc::Cell::JSSTRING_BIT;
+    static const uint32_t LINEAR_BIT             = JS_BIT(4);
+    static const uint32_t HAS_BASE_BIT           = JS_BIT(5);
+    static const uint32_t INLINE_CHARS_BIT       = JS_BIT(6);
 
     static const uint32_t DEPENDENT_FLAGS        = NON_ATOM_BIT | LINEAR_BIT | HAS_BASE_BIT;
-    static const uint32_t UNDEPENDED_FLAGS       = NON_ATOM_BIT | LINEAR_BIT | HAS_BASE_BIT | JS_BIT(4);
-    static const uint32_t EXTENSIBLE_FLAGS       = NON_ATOM_BIT | LINEAR_BIT | JS_BIT(4);
-    static const uint32_t EXTERNAL_FLAGS         = NON_ATOM_BIT | LINEAR_BIT | JS_BIT(5);
+    static const uint32_t UNDEPENDED_FLAGS       = NON_ATOM_BIT | LINEAR_BIT | HAS_BASE_BIT | JS_BIT(7);
+    static const uint32_t EXTENSIBLE_FLAGS       = NON_ATOM_BIT | LINEAR_BIT | JS_BIT(7);
+    static const uint32_t EXTERNAL_FLAGS         = NON_ATOM_BIT | LINEAR_BIT | JS_BIT(8);
 
-    static const uint32_t FAT_INLINE_MASK        = INLINE_CHARS_BIT | JS_BIT(4);
-    static const uint32_t PERMANENT_ATOM_MASK    = NON_ATOM_BIT | JS_BIT(5);
-    static const uint32_t PERMANENT_ATOM_FLAGS   = JS_BIT(5);
+    static const uint32_t FAT_INLINE_MASK        = INLINE_CHARS_BIT | JS_BIT(7);
+    static const uint32_t PERMANENT_ATOM_MASK    = NON_ATOM_BIT | JS_BIT(8);
+    static const uint32_t PERMANENT_ATOM_FLAGS   = JS_BIT(8);
 
     /* Initial flags for thin inline and fat inline strings. */
     static const uint32_t INIT_THIN_INLINE_FLAGS = NON_ATOM_BIT | LINEAR_BIT | INLINE_CHARS_BIT;
@@ -284,14 +293,14 @@ class JSString : public js::gc::Cell
     static const uint32_t INIT_ROPE_FLAGS        = NON_ATOM_BIT;
     static const uint32_t INIT_FLAT_FLAGS        = NON_ATOM_BIT | LINEAR_BIT;
 
-    static const uint32_t TYPE_FLAGS_MASK        = JS_BIT(6) - 1;
+    static const uint32_t TYPE_FLAGS_MASK        = JS_BITMASK(9) - JS_BITMASK(3) + js::gc::Cell::JSSTRING_BIT;
 
-    static const uint32_t LATIN1_CHARS_BIT       = JS_BIT(6);
+    static const uint32_t LATIN1_CHARS_BIT       = JS_BIT(9);
 
-    static const uint32_t INDEX_VALUE_BIT        = JS_BIT(7);
+    static const uint32_t INDEX_VALUE_BIT        = JS_BIT(10);
     static const uint32_t INDEX_VALUE_SHIFT      = 16;
 
-    static const uint32_t PINNED_ATOM_BIT        = JS_BIT(8);
+    static const uint32_t PINNED_ATOM_BIT        = JS_BIT(11);
 
     static const uint32_t MAX_LENGTH             = js::MaxStringLength;
 
@@ -317,10 +326,12 @@ class JSString : public js::gc::Cell
 
         /* Ensure js::shadow::String has the same layout. */
         using JS::shadow::String;
-        static_assert(offsetof(JSString, d.u1.length) == offsetof(String, length),
-                      "shadow::String length offset must match JSString");
-        static_assert(offsetof(JSString, d.u1.flags) == offsetof(String, flags),
+        static_assert(offsetof(JSString, d.flags_) == offsetof(String, flags_),
                       "shadow::String flags offset must match JSString");
+#if JS_BITS_PER_WORD == 32
+        static_assert(offsetof(JSString, d.length_) == offsetof(String, length_),
+                      "shadow::String length offset must match JSString");
+#endif
         static_assert(offsetof(JSString, d.s.u2.nonInlineCharsLatin1) == offsetof(String, nonInlineCharsLatin1),
                       "shadow::String nonInlineChars offset must match JSString");
         static_assert(offsetof(JSString, d.s.u2.nonInlineCharsTwoByte) == offsetof(String, nonInlineCharsTwoByte),
@@ -355,37 +366,87 @@ class JSString : public js::gc::Cell
     MOZ_ALWAYS_INLINE
     void setNonInlineChars(const CharT* chars);
 
-  public:
-    /* All strings have length. */
+    MOZ_ALWAYS_INLINE
+    uint32_t flags() const {
+        return uint32_t(d.flags_);
+    }
 
+  public:
     MOZ_ALWAYS_INLINE
     size_t length() const {
-        return d.u1.length;
+#if JS_BITS_PER_WORD == 32
+        return d.length_;
+#else
+        return uint32_t(d.flags_ >> 32);
+#endif
+    }
+
+  protected:
+    MOZ_ALWAYS_INLINE
+    void setFlagBit(uint32_t flags) {
+        d.flags_ |= uintptr_t(flags);
     }
 
+    MOZ_ALWAYS_INLINE
+    void clearFlagBit(uint32_t flags) {
+        d.flags_ &= ~uintptr_t(flags);
+    }
+
+    MOZ_ALWAYS_INLINE
+    void setLengthAndFlags(uint32_t len, uint32_t flags) {
+#if JS_BITS_PER_WORD == 32
+        d.flags_ = flags;
+        d.length_ = len;
+#else
+        d.flags_ = uint64_t(len) << 32 | uint64_t(flags);
+#endif
+    }
+
+    // Flatten algorithm stores a temporary word by clobbering flags. This is
+    // not GC-safe and user must ensure JSString::flags are never checked
+    // (including by asserts) while this data is stored.
+    MOZ_ALWAYS_INLINE
+    void setFlattenData(uintptr_t data) {
+        d.flags_ = data;
+    }
+
+    // To get back the data, values to safely re-initialize clobbered flags
+    // must be provided.
+    MOZ_ALWAYS_INLINE
+    uintptr_t unsetFlattenData(uint32_t len, uint32_t flags) {
+        uintptr_t data = d.flags_;
+        setLengthAndFlags(len, flags);
+        return data;
+    }
+
+    // Get correct non-inline chars enum arm for given type
+    template <typename CharT> MOZ_ALWAYS_INLINE const CharT* nonInlineCharsRaw() const;
+
+  public:
+
     MOZ_ALWAYS_INLINE
     bool empty() const {
-        return d.u1.length == 0;
+        return length() == 0;
     }
 
     inline bool getChar(JSContext* cx, size_t index, char16_t* code);
 
     /* Strings have either Latin1 or TwoByte chars. */
     bool hasLatin1Chars() const {
-        return d.u1.flags & LATIN1_CHARS_BIT;
+        return flags() & LATIN1_CHARS_BIT;
     }
     bool hasTwoByteChars() const {
-        return !(d.u1.flags & LATIN1_CHARS_BIT);
+        return !(flags() & LATIN1_CHARS_BIT);
     }
 
     /* Strings might contain cached indexes. */
     bool hasIndexValue() const {
-        return d.u1.flags & INDEX_VALUE_BIT;
+        return flags() & INDEX_VALUE_BIT;
     }
     uint32_t getIndexValue() const {
         MOZ_ASSERT(hasIndexValue());
         MOZ_ASSERT(isFlat());
-        return d.u1.flags >> INDEX_VALUE_SHIFT;
+        return flags() >> INDEX_VALUE_SHIFT;
     }
 
     /* Fallible conversions to more-derived string types. */
@@ -401,7 +462,7 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isRope() const {
-        return !(d.u1.flags & LINEAR_BIT);
+        return !(flags() & LINEAR_BIT);
     }
 
     MOZ_ALWAYS_INLINE
@@ -412,7 +473,7 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isLinear() const {
-        return d.u1.flags & LINEAR_BIT;
+        return flags() & LINEAR_BIT;
     }
 
     MOZ_ALWAYS_INLINE
@@ -423,7 +484,7 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isDependent() const {
-        return (d.u1.flags & TYPE_FLAGS_MASK) == DEPENDENT_FLAGS;
+        return (flags() & TYPE_FLAGS_MASK) == DEPENDENT_FLAGS;
     }
 
     MOZ_ALWAYS_INLINE
@@ -445,7 +506,7 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isExtensible() const {
-        return (d.u1.flags & TYPE_FLAGS_MASK) == EXTENSIBLE_FLAGS;
+        return (flags() & TYPE_FLAGS_MASK) == EXTENSIBLE_FLAGS;
     }
 
     MOZ_ALWAYS_INLINE
@@ -456,7 +517,7 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isInline() const {
-        return d.u1.flags & INLINE_CHARS_BIT;
+        return flags() & INLINE_CHARS_BIT;
     }
 
     MOZ_ALWAYS_INLINE
@@ -467,12 +528,12 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isFatInline() const {
-        return (d.u1.flags & FAT_INLINE_MASK) == FAT_INLINE_MASK;
+        return (flags() & FAT_INLINE_MASK) == FAT_INLINE_MASK;
     }
 
     /* For hot code, prefer other type queries. */
     bool isExternal() const {
-        return (d.u1.flags & TYPE_FLAGS_MASK) == EXTERNAL_FLAGS;
+        return (flags() & TYPE_FLAGS_MASK) == EXTERNAL_FLAGS;
     }
 
     MOZ_ALWAYS_INLINE
@@ -483,17 +544,17 @@ class JSString : public js::gc::Cell
 
     MOZ_ALWAYS_INLINE
     bool isUndepended() const {
-        return (d.u1.flags & TYPE_FLAGS_MASK) == UNDEPENDED_FLAGS;
+        return (flags() & TYPE_FLAGS_MASK) == UNDEPENDED_FLAGS;
     }
 
     MOZ_ALWAYS_INLINE
     bool isAtom() const {
-        return !(d.u1.flags & NON_ATOM_BIT);
+        return !(flags() & NON_ATOM_BIT);
     }
 
     MOZ_ALWAYS_INLINE
     bool isPermanentAtom() const {
-        return (d.u1.flags & PERMANENT_ATOM_MASK) == PERMANENT_ATOM_FLAGS;
+        return (flags() & PERMANENT_ATOM_MASK) == PERMANENT_ATOM_FLAGS;
     }
 
     MOZ_ALWAYS_INLINE
@@ -502,14 +563,6 @@ class JSString : public js::gc::Cell
         return *(JSAtom*)this;
     }
 
-    // Used for distinguishing strings from objects in the nursery. The caller
-    // must ensure that cell is in the nursery (and not forwarded).
-    MOZ_ALWAYS_INLINE
-    static bool nurseryCellIsString(js::gc::Cell* cell) {
-        MOZ_ASSERT(!cell->isTenured());
-        return !static_cast<JSString*>(cell)->isAtom();
-    }
-
     // Fills |array| with various strings that represent the different string
     // kinds and character encodings.
     static bool fillWithRepresentatives(JSContext* cx, js::HandleArrayObject array);
@@ -517,7 +570,7 @@ class JSString : public js::gc::Cell
     /* Only called by the GC for dependent or undepended strings. */
 
     inline bool hasBase() const {
-        return d.u1.flags & HAS_BASE_BIT;
+        return flags() & HAS_BASE_BIT;
     }
 
     inline JSLinearString* base() const;
@@ -532,14 +585,30 @@ class JSString : public js::gc::Cell
 
     size_t sizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf);
 
-    /* Offsets for direct field from jit code. */
-
-    static size_t offsetOfLength() {
-        return offsetof(JSString, d.u1.length);
+    // Offsets for direct field from jit code. A number of places directly
+    // access 32-bit length and flags fields so do endian trickery here.
+#if JS_BITS_PER_WORD == 32
+    static constexpr size_t offsetOfFlags() {
+        return offsetof(JSString, d.flags_);
     }
-    static size_t offsetOfFlags() {
-        return offsetof(JSString, d.u1.flags);
+    static constexpr size_t offsetOfLength() {
+        return offsetof(JSString, d.length_);
     }
+#elif defined(MOZ_LITTLE_ENDIAN)
+    static constexpr size_t offsetOfFlags() {
+        return offsetof(JSString, d.flags_);
+    }
+    static constexpr size_t offsetOfLength() {
+        return offsetof(JSString, d.flags_) + sizeof(uint32_t);
+    }
+#else
+    static constexpr size_t offsetOfFlags() {
+        return offsetof(JSString, d.flags_) + sizeof(uint32_t);
+    }
+    static constexpr size_t offsetOfLength() {
+        return offsetof(JSString, d.flags_);
+    }
+#endif
 
   private:
     // To help avoid writing Spectre-unsafe code, we only allow MacroAssembler
@@ -931,7 +1000,7 @@ class JSFlatString : public JSLinearString
         MOZ_ASSERT(isIndexSlow(&containedIndex));
         MOZ_ASSERT(index == containedIndex);
 
-        d.u1.flags |= (index << INDEX_VALUE_SHIFT) | INDEX_VALUE_BIT;
+        setFlagBit((index << INDEX_VALUE_SHIFT) | INDEX_VALUE_BIT);
     }
 
     /*
@@ -1167,19 +1236,19 @@ class JSAtom : public JSFlatString
     // initialization of the runtime. Permanent atoms are always pinned.
     MOZ_ALWAYS_INLINE void morphIntoPermanentAtom() {
         MOZ_ASSERT(static_cast<JSString*>(this)->isAtom());
-        d.u1.flags |= PERMANENT_ATOM_FLAGS | PINNED_ATOM_BIT;
+        setFlagBit(PERMANENT_ATOM_FLAGS | PINNED_ATOM_BIT);
     }
 
     MOZ_ALWAYS_INLINE
     bool isPinned() const {
-        return d.u1.flags & PINNED_ATOM_BIT;
+        return flags() & PINNED_ATOM_BIT;
     }
 
     // Mark the atom as pinned. For use by atomization only.
     MOZ_ALWAYS_INLINE void setPinned() {
         MOZ_ASSERT(static_cast<JSString*>(this)->isAtom());
         MOZ_ASSERT(!isPinned());
-        d.u1.flags |= PINNED_ATOM_BIT;
+        setFlagBit(PINNED_ATOM_BIT);
     }
 
     inline js::HashNumber hash() const;
@@ -1257,7 +1326,7 @@ MOZ_ALWAYS_INLINE JSAtom*
 JSFlatString::morphAtomizedStringIntoAtom(js::HashNumber hash)
 {
     MOZ_ASSERT(!isAtom());
-    d.u1.flags &= ~NON_ATOM_BIT;
+    clearFlagBit(NON_ATOM_BIT);
     JSAtom* atom = &asAtom();
     atom->initHash(hash);
     return atom;
@@ -1267,8 +1336,8 @@ MOZ_ALWAYS_INLINE JSAtom*
 JSFlatString::morphAtomizedStringIntoPermanentAtom(js::HashNumber hash)
 {
     MOZ_ASSERT(!isAtom());
-    d.u1.flags |= PERMANENT_ATOM_FLAGS | PINNED_ATOM_BIT;
-    d.u1.flags &= ~NON_ATOM_BIT;
+    setFlagBit(PERMANENT_ATOM_FLAGS | PINNED_ATOM_BIT);
+    clearFlagBit(NON_ATOM_BIT);
     JSAtom* atom = &asAtom();
     atom->initHash(hash);
     return atom;
diff --git a/js/src/vm/SymbolType.h b/js/src/vm/SymbolType.h
index 28b71f298ab2..ee950c322f29 100644
--- a/js/src/vm/SymbolType.h
+++ b/js/src/vm/SymbolType.h
@@ -32,6 +32,11 @@ namespace JS {
 
 class Symbol : public js::gc::TenuredCell
 {
+  protected:
+    // Reserved word for Cell GC invariants. This also ensures minimum
+    // structure size.
+    uintptr_t reserved_;
+
   private:
     SymbolCode code_;
 
@@ -41,19 +46,8 @@ class Symbol : public js::gc::TenuredCell
 
     JSAtom* description_;
 
-    // The minimum allocation size is sizeof(JSString): 16 bytes on 32-bit
-    // architectures and 24 bytes on 64-bit.  A size_t of padding makes Symbol
-    // the minimum size on both.
-    size_t unused_;
-
     Symbol(SymbolCode code, js::HashNumber hash, JSAtom* desc)
-        : code_(code), hash_(hash), description_(desc)
-    {
-        // Silence warnings about unused_ being... unused.
-        (void)unused_;
-        static_assert(uint32_t(SymbolCode::WellKnownAPILimit) == JS::shadow::Symbol::WellKnownAPILimit,
-                      "JS::shadow::Symbol::WellKnownAPILimit must match SymbolCode::WellKnownAPILimit");
-    }
+        : reserved_(0), code_(code), hash_(hash), description_(desc) { }
 
     Symbol(const Symbol&) = delete;
     void operator=(const Symbol&) = delete;
@@ -61,6 +55,15 @@ class Symbol : public js::gc::TenuredCell
     static Symbol*
     newInternal(JSContext* cx, SymbolCode code, js::HashNumber hash, JSAtom* description);
 
+    static void staticAsserts() {
+        static_assert(uint32_t(SymbolCode::WellKnownAPILimit) == JS::shadow::Symbol::WellKnownAPILimit,
+                      "JS::shadow::Symbol::WellKnownAPILimit must match SymbolCode::WellKnownAPILimit");
+        static_assert(offsetof(Symbol, reserved_) == offsetof(JS::shadow::Symbol, reserved_),
+                      "JS::shadow::Symbol::reserved_ offset must match SymbolCode::reserved_");
+        static_assert(offsetof(Symbol, code_) == offsetof(JS::shadow::Symbol, code_),
+                      "JS::shadow::Symbol::code_ offset must match SymbolCode::code_");
+    }
+
   public:
     static Symbol* new_(JSContext* cx, SymbolCode code, JSString* description);
     static Symbol* for_(JSContext* cx, js::HandleString description);
diff --git a/js/src/wasm/AsmJS.cpp b/js/src/wasm/AsmJS.cpp
index af2ae03ea817..5acfe3133e22 100644
--- a/js/src/wasm/AsmJS.cpp
+++ b/js/src/wasm/AsmJS.cpp
@@ -6491,8 +6491,7 @@ StoreAsmJSModuleInCache(AsmJSParser& parser, Module& module, JSContext* cx)
     if (!moduleChars.init(parser))
         return JS::AsmJSCache_InternalError;
 
-    size_t bytecodeSize = module.bytecodeSerializedSize();
-    MOZ_RELEASE_ASSERT(bytecodeSize == 0);
+    MOZ_RELEASE_ASSERT(module.bytecode().length() == 0);
 
     size_t compiledSize = module.compiledSerializedSize();
     MOZ_RELEASE_ASSERT(compiledSize <= UINT32_MAX);
diff --git a/js/src/wasm/WasmCompile.cpp b/js/src/wasm/WasmCompile.cpp
index 9422cf74ec28..cf267b854b1a 100644
--- a/js/src/wasm/WasmCompile.cpp
+++ b/js/src/wasm/WasmCompile.cpp
@@ -450,7 +450,7 @@ wasm::CompileBuffer(const CompileArgs& args, const ShareableBytes& bytecode, Uni
     return mg.finishModule(bytecode);
 }
 
-bool
+void
 wasm::CompileTier2(const CompileArgs& args, Module& module, Atomic<bool>* cancelled)
 {
     MOZ_RELEASE_ASSERT(wasm::HaveSignalHandlers());
@@ -463,19 +463,23 @@ wasm::CompileTier2(const CompileArgs& args, Module& module, Atomic<bool>* cancel
     ModuleEnvironment env(CompileMode::Tier2, Tier::Ion, DebugEnabled::False, HasGcTypes::False,
                           args.sharedMemoryEnabled ? Shareable::True : Shareable::False);
     if (!DecodeModuleEnvironment(d, &env))
-        return false;
+        return;
 
     ModuleGenerator mg(args, &env, cancelled, &error);
     if (!mg.init())
-        return false;
+        return;
 
     if (!DecodeCodeSection(env, d, mg))
-        return false;
+        return;
 
     if (!DecodeModuleTail(d, &env))
-        return false;
+        return;
 
-    return mg.finishTier2(module);
+    if (!mg.finishTier2(module))
+        return;
+
+    // The caller doesn't care about success or failure; only that compilation
+    // is inactive, so there is no success to return here.
 }
 
 class StreamingDecoder
diff --git a/js/src/wasm/WasmCompile.h b/js/src/wasm/WasmCompile.h
index 1c8b070dde87..c0cf0b24a3c1 100644
--- a/js/src/wasm/WasmCompile.h
+++ b/js/src/wasm/WasmCompile.h
@@ -87,10 +87,9 @@ CompileBuffer(const CompileArgs& args,
               UniqueChars* error,
               UniqueCharsVector* warnings);
 
-// Attempt to compile the second tier of the given wasm::Module, returning whether
-// tier-2 compilation succeeded and Module::finishTier2 was called.
+// Attempt to compile the second tier of the given wasm::Module.
 
-bool
+void
 CompileTier2(const CompileArgs& args, Module& module, Atomic<bool>* cancelled);
 
 // Compile the given WebAssembly module which has been broken into three
diff --git a/js/src/wasm/WasmModule.cpp b/js/src/wasm/WasmModule.cpp
index c1f9d0ce6907..d688edd9b96a 100644
--- a/js/src/wasm/WasmModule.cpp
+++ b/js/src/wasm/WasmModule.cpp
@@ -175,19 +175,16 @@ class Module::Tier2GeneratorTaskImpl : public Tier2GeneratorTask
     SharedModule            module_;
     SharedCompileArgs       compileArgs_;
     Atomic<bool>            cancelled_;
-    bool                    finished_;
 
   public:
     Tier2GeneratorTaskImpl(Module& module, const CompileArgs& compileArgs)
       : module_(&module),
         compileArgs_(&compileArgs),
-        cancelled_(false),
-        finished_(false)
+        cancelled_(false)
     {}
 
     ~Tier2GeneratorTaskImpl() override {
-        if (!finished_)
-            module_->notifyCompilationListeners();
+        module_->testingTier2Active_ = false;
     }
 
     void cancel() override {
@@ -195,53 +192,26 @@ class Module::Tier2GeneratorTaskImpl : public Tier2GeneratorTask
     }
 
     void execute() override {
-        MOZ_ASSERT(!finished_);
-        finished_ = CompileTier2(*compileArgs_, *module_, &cancelled_);
+        CompileTier2(*compileArgs_, *module_, &cancelled_);
     }
 };
 
 void
 Module::startTier2(const CompileArgs& args)
 {
-    MOZ_ASSERT(!tiering_.lock()->active);
-
-    // If a Module initiates tier-2 compilation, we must ensure that eventually
-    // notifyCompilationListeners() is called. Since we must ensure
-    // Tier2GeneratorTaskImpl objects are destroyed *anyway*, we use
-    // ~Tier2GeneratorTaskImpl() to call notifyCompilationListeners() if it
-    // hasn't been already.
+    MOZ_ASSERT(!testingTier2Active_);
 
     auto task = MakeUnique<Tier2GeneratorTaskImpl>(*this, args);
     if (!task)
         return;
 
-    tiering_.lock()->active = true;
+    // This flag will be cleared asynchronously by ~Tier2GeneratorTaskImpl()
+    // on success or failure.
+    testingTier2Active_ = true;
 
     StartOffThreadWasmTier2Generator(std::move(task));
 }
 
-void
-Module::notifyCompilationListeners()
-{
-    // Notify listeners without holding the lock to avoid deadlocks if the
-    // listener takes their own lock or reenters this Module.
-
-    Tiering::ListenerVector listeners;
-    {
-        auto tiering = tiering_.lock();
-
-        MOZ_ASSERT(tiering->active);
-        tiering->active = false;
-
-        Swap(listeners, tiering->listeners);
-
-        tiering.notify_all(/* inactive */);
-    }
-
-    for (RefPtr<JS::WasmModuleListener>& listener : listeners)
-        listener->onCompilationComplete();
-}
-
 bool
 Module::finishTier2(UniqueLinkDataTier linkData2, UniqueCodeTier tier2Arg, ModuleEnvironment* env2)
 {
@@ -296,14 +266,8 @@ Module::finishTier2(UniqueLinkDataTier linkData2, UniqueCodeTier tier2Arg, Modul
         MOZ_ASSERT(!code().hasTier2());
         code().commitTier2();
 
-        // Now tier2 is committed and we can update jump tables entries to
-        // start making tier2 live.  Because lazy stubs are protected by a lock
-        // and notifyCompilationListeners should be called without any lock
-        // held, do it before.
-
         stubs2->setJitEntries(stub2Index, code());
     }
-    notifyCompilationListeners();
 
     // And we update the jump vector.
 
@@ -323,65 +287,16 @@ Module::finishTier2(UniqueLinkDataTier linkData2, UniqueCodeTier tier2Arg, Modul
 }
 
 void
-Module::blockOnTier2Complete() const
+Module::testingBlockOnTier2Complete() const
 {
-    auto tiering = tiering_.lock();
-    while (tiering->active)
-        tiering.wait(/* inactive */);
-}
-
-/* virtual */ size_t
-Module::bytecodeSerializedSize() const
-{
-    return bytecode_->bytes.length();
-}
-
-/* virtual */ void
-Module::bytecodeSerialize(uint8_t* bytecodeBegin, size_t bytecodeSize) const
-{
-    MOZ_ASSERT(!!bytecodeBegin == !!bytecodeSize);
-
-    // Bytecode deserialization is not guarded by Assumptions and thus must not
-    // change incompatibly between builds. For simplicity, the format of the
-    // bytecode file is a .wasm file which ensures backwards compatibility.
-
-    const Bytes& bytes = bytecode_->bytes;
-    uint8_t* bytecodeEnd = WriteBytes(bytecodeBegin, bytes.begin(), bytes.length());
-    MOZ_RELEASE_ASSERT(bytecodeEnd == bytecodeBegin + bytecodeSize);
-}
-
-/* virtual */ bool
-Module::compilationComplete() const
-{
-    // For the purposes of serialization, if there is not an active tier-2
-    // compilation in progress, compilation is "complete" in that
-    // compiledSerialize() can be called. Now, tier-2 compilation may have
-    // failed or never started in the first place, but in such cases, a
-    // zero-byte compilation is serialized, triggering recompilation on upon
-    // deserialization. Basically, we only want serialization to wait if waiting
-    // would eventually produce tier-2 code.
-    return !tiering_.lock()->active;
-}
-
-/* virtual */ bool
-Module::notifyWhenCompilationComplete(JS::WasmModuleListener* listener)
-{
-    {
-        auto tiering = tiering_.lock();
-        if (tiering->active)
-            return tiering->listeners.append(listener);
-    }
-
-    // Notify the listener without holding the lock to avoid deadlocks if the
-    // listener takes their own lock or reenters this Module.
-    listener->onCompilationComplete();
-    return true;
+    while (testingTier2Active_)
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
 }
 
 /* virtual */ size_t
 Module::compiledSerializedSize() const
 {
-    MOZ_ASSERT(!tiering_.lock()->active);
+    MOZ_ASSERT(!testingTier2Active_);
 
     // The compiled debug code must not be saved, set compiled size to 0,
     // so Module::assumptionsMatch will return false during assumptions
@@ -405,7 +320,7 @@ Module::compiledSerializedSize() const
 /* virtual */ void
 Module::compiledSerialize(uint8_t* compiledBegin, size_t compiledSize) const
 {
-    MOZ_ASSERT(!tiering_.lock()->active);
+    MOZ_ASSERT(!testingTier2Active_);
 
     if (metadata().debugEnabled) {
         MOZ_RELEASE_ASSERT(compiledSize == 0);
@@ -551,38 +466,15 @@ MapFile(PRFileDesc* file, PRFileInfo* info)
     return UniqueMapping(memory, MemUnmap(info->size));
 }
 
-bool
-wasm::CompiledModuleAssumptionsMatch(PRFileDesc* compiled, JS::BuildIdCharVector&& buildId)
-{
-    PRFileInfo info;
-    UniqueMapping mapping = MapFile(compiled, &info);
-    if (!mapping)
-        return false;
-
-    Assumptions assumptions(std::move(buildId));
-    return Module::assumptionsMatch(assumptions, mapping.get(), info.size);
-}
-
 SharedModule
-wasm::DeserializeModule(PRFileDesc* bytecodeFile, PRFileDesc* maybeCompiledFile,
-                        JS::BuildIdCharVector&& buildId, UniqueChars filename,
-                        unsigned line)
+wasm::DeserializeModule(PRFileDesc* bytecodeFile, JS::BuildIdCharVector&& buildId,
+                        UniqueChars filename, unsigned line)
 {
     PRFileInfo bytecodeInfo;
     UniqueMapping bytecodeMapping = MapFile(bytecodeFile, &bytecodeInfo);
     if (!bytecodeMapping)
         return nullptr;
 
-    if (PRFileDesc* compiledFile = maybeCompiledFile) {
-        PRFileInfo compiledInfo;
-        UniqueMapping compiledMapping = MapFile(compiledFile, &compiledInfo);
-        if (!compiledMapping)
-            return nullptr;
-
-        return Module::deserialize(bytecodeMapping.get(), bytecodeInfo.size,
-                                   compiledMapping.get(), compiledInfo.size);
-    }
-
     // Since the compiled file's assumptions don't match, we must recompile from
     // bytecode. The bytecode file format is simply that of a .wasm (see
     // Module::bytecodeSerialize).
@@ -655,7 +547,7 @@ Module::extractCode(JSContext* cx, Tier tier, MutableHandleValue vp) const
 
     // This function is only used for testing purposes so we can simply
     // block on tiered compilation to complete.
-    blockOnTier2Complete();
+    testingBlockOnTier2Complete();
 
     if (!code_->hasTier(tier)) {
         vp.setNull();
@@ -1327,7 +1219,7 @@ Module::instantiate(JSContext* cx,
     cx->runtime()->setUseCounter(instance, useCounter);
 
     if (cx->options().testWasmAwaitTier2())
-        blockOnTier2Complete();
+        testingBlockOnTier2Complete();
 
     return true;
 }
diff --git a/js/src/wasm/WasmModule.h b/js/src/wasm/WasmModule.h
index 21a804b3a69c..522725c2b712 100644
--- a/js/src/wasm/WasmModule.h
+++ b/js/src/wasm/WasmModule.h
@@ -95,23 +95,6 @@ class LinkData
     WASM_DECLARE_SERIALIZABLE(LinkData)
 };
 
-// Contains the locked tiering state of a Module: whether there is an active
-// background tier-2 compilation in progress and, if so, the list of listeners
-// waiting for the tier-2 compilation to complete.
-
-struct Tiering
-{
-    typedef Vector<RefPtr<JS::WasmModuleListener>, 0, SystemAllocPolicy> ListenerVector;
-
-    Tiering() : active(false) {}
-    ~Tiering() { MOZ_ASSERT(listeners.empty()); MOZ_ASSERT(!active); }
-
-    ListenerVector listeners;
-    bool active;
-};
-
-typedef ExclusiveWaitableData<Tiering> ExclusiveTiering;
-
 // Module represents a compiled wasm module and primarily provides two
 // operations: instantiation and serialization. A Module can be instantiated any
 // number of times to produce new Instance objects. A Module can be serialized
@@ -137,7 +120,11 @@ class Module : public JS::WasmModule
     const ElemSegmentVector elemSegments_;
     const StructTypeVector  structTypes_;
     const SharedBytes       bytecode_;
-    ExclusiveTiering        tiering_;
+
+    // This flag is only used for testing purposes and is racily updated as soon
+    // as tier-2 compilation finishes (in success or failure).
+
+    mutable Atomic<bool>    testingTier2Active_;
 
     // `codeIsBusy_` is set to false initially and then to true when `code_` is
     // already being used for an instance and can't be shared because it may be
@@ -160,7 +147,6 @@ class Module : public JS::WasmModule
                       HandleValVector globalImportValues) const;
 
     class Tier2GeneratorTaskImpl;
-    void notifyCompilationListeners();
 
   public:
     Module(Assumptions&& assumptions,
@@ -183,7 +169,7 @@ class Module : public JS::WasmModule
         elemSegments_(std::move(elemSegments)),
         structTypes_(std::move(structTypes)),
         bytecode_(&bytecode),
-        tiering_(mutexid::WasmModuleTieringLock),
+        testingTier2Active_(false),
         codeIsBusy_(false)
     {
         MOZ_ASSERT_IF(metadata().debugEnabled, unlinkedCodeForDebugging_);
@@ -213,29 +199,30 @@ class Module : public JS::WasmModule
                      MutableHandleWasmInstanceObject instanceObj) const;
 
     // Tier-2 compilation may be initiated after the Module is constructed at
-    // most once, ideally before any client can attempt to serialize the Module.
-    // When tier-2 compilation completes, ModuleGenerator calls finishTier2()
-    // from a helper thread, passing tier-variant data which will be installed
-    // and made visible.
+    // most once. When tier-2 compilation completes, ModuleGenerator calls
+    // finishTier2() from a helper thread, passing tier-variant data which will
+    // be installed and made visible.
 
     void startTier2(const CompileArgs& args);
     bool finishTier2(UniqueLinkDataTier linkData2, UniqueCodeTier tier2, ModuleEnvironment* env2);
-    void blockOnTier2Complete() const;
 
-    // JS API and JS::WasmModule implementation:
+    void testingBlockOnTier2Complete() const;
+    bool testingTier2Active() const { return testingTier2Active_; }
 
-    size_t bytecodeSerializedSize() const override;
-    void bytecodeSerialize(uint8_t* bytecodeBegin, size_t bytecodeSize) const override;
-    bool compilationComplete() const override;
-    bool notifyWhenCompilationComplete(JS::WasmModuleListener* listener) override;
-    size_t compiledSerializedSize() const override;
-    void compiledSerialize(uint8_t* compiledBegin, size_t compiledSize) const override;
+    // Currently dead, but will be ressurrected with shell tests (bug 1330661)
+    // and HTTP cache integration.
+
+    size_t compiledSerializedSize() const;
+    void compiledSerialize(uint8_t* compiledBegin, size_t compiledSize) const;
 
     static bool assumptionsMatch(const Assumptions& current, const uint8_t* compiledBegin,
                                  size_t remain);
     static RefPtr<Module> deserialize(const uint8_t* bytecodeBegin, size_t bytecodeSize,
                                       const uint8_t* compiledBegin, size_t compiledSize,
                                       Metadata* maybeMetadata = nullptr);
+
+    // JS API and JS::WasmModule implementation:
+
     JSObject* createObject(JSContext* cx) override;
 
     // about:memory reporting:
@@ -255,12 +242,9 @@ typedef RefPtr<Module> SharedModule;
 
 // JS API implementations:
 
-bool
-CompiledModuleAssumptionsMatch(PRFileDesc* compiled, JS::BuildIdCharVector&& buildId);
-
 SharedModule
-DeserializeModule(PRFileDesc* bytecode, PRFileDesc* maybeCompiled, JS::BuildIdCharVector&& buildId,
-                  UniqueChars filename, unsigned line);
+DeserializeModule(PRFileDesc* bytecode, JS::BuildIdCharVector&& buildId, UniqueChars filename,
+                  unsigned line);
 
 } // namespace wasm
 } // namespace js
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp
index ffcce4e1702c..d6d0b7843e0f 100644
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -993,6 +993,8 @@ mozJSComponentLoader::ImportInto(const nsACString& registryLocation,
 
     RootedValue targetVal(cx, targetValArg);
     RootedObject targetObject(cx, nullptr);
+
+    Maybe<JSAutoRealm> ar;
     if (optionalArgc) {
         // The caller passed in the optional second argument. Get it.
         if (targetVal.isObject()) {
@@ -1016,12 +1018,12 @@ mozJSComponentLoader::ImportInto(const nsACString& registryLocation,
         }
     } else {
         FindTargetObject(cx, &targetObject);
+        if (targetObject) {
+            ar.emplace(cx, targetObject);
+        }
     }
 
-    Maybe<JSAutoRealmAllowCCW> ar;
-    if (targetObject) {
-        ar.emplace(cx, targetObject);
-    }
+    js::AssertSameCompartment(cx, targetObject);
 
     RootedObject global(cx);
     nsresult rv = ImportInto(registryLocation, targetObject, cx, &global);
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build
index 16d68399e6ca..c9f1137bdab5 100644
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@@ -53,6 +53,3 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 CFLAGS += CONFIG['TK_CFLAGS']
 CXXFLAGS += CONFIG['TK_CFLAGS']
 OS_LIBS += CONFIG['TK_LIBS']
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/js/xpconnect/src/XPCJSRuntime.cpp b/js/xpconnect/src/XPCJSRuntime.cpp
index ebef7a13e806..8fe40cecbfb1 100644
--- a/js/xpconnect/src/XPCJSRuntime.cpp
+++ b/js/xpconnect/src/XPCJSRuntime.cpp
@@ -129,7 +129,10 @@ public:
       AUTO_PROFILER_LABEL("AsyncFreeSnowWhite::Run", GCCC);
 
       TimeStamp start = TimeStamp::Now();
-      bool hadSnowWhiteObjects = nsCycleCollector_doDeferredDeletion();
+      // 2 ms budget, given that kICCSliceBudget is only 3 ms
+      js::SliceBudget budget = js::SliceBudget(js::TimeBudget(2));
+      bool hadSnowWhiteObjects =
+        nsCycleCollector_doDeferredDeletionWithBudget(budget);
       Telemetry::Accumulate(Telemetry::CYCLE_COLLECTOR_ASYNC_SNOW_WHITE_FREEING,
                             uint32_t((TimeStamp::Now() - start).ToMilliseconds()));
       if (hadSnowWhiteObjects && !mContinuation) {
@@ -146,7 +149,7 @@ public:
   nsresult Dispatch()
   {
       nsCOMPtr<nsIRunnable> self(this);
-      return NS_IdleDispatchToCurrentThread(self.forget(), 2500);
+      return NS_IdleDispatchToCurrentThread(self.forget(), 500);
   }
 
   void Start(bool aContinuation = false, bool aPurge = false)
@@ -438,6 +441,13 @@ Scriptability::Get(JSObject* aScope)
     return RealmPrivate::Get(aScope)->scriptability;
 }
 
+/* static */
+Scriptability&
+Scriptability::Get(JSScript* aScript)
+{
+    return RealmPrivate::Get(aScript)->scriptability;
+}
+
 bool
 IsContentXBLCompartment(JS::Compartment* compartment)
 {
diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h
index 582c9af50905..f25ffd6f4f2b 100644
--- a/js/xpconnect/src/xpcprivate.h
+++ b/js/xpconnect/src/xpcprivate.h
@@ -2991,6 +2991,13 @@ public:
         return Get(realm);
     }
 
+    // Get the RealmPrivate for a given script.
+    static RealmPrivate* Get(JSScript* script)
+    {
+        JS::Realm* realm = JS::GetScriptRealm(script);
+        return Get(realm);
+    }
+
     // The scriptability of this realm.
     Scriptability scriptability;
 
diff --git a/js/xpconnect/src/xpcpublic.h b/js/xpconnect/src/xpcpublic.h
index 08fdffed4bdf..effad1d417b5 100644
--- a/js/xpconnect/src/xpcpublic.h
+++ b/js/xpconnect/src/xpcpublic.h
@@ -54,6 +54,7 @@ public:
     void SetDocShellAllowsScript(bool aAllowed);
 
     static Scriptability& Get(JSObject* aScope);
+    static Scriptability& Get(JSScript* aScript);
 
 private:
     // Whenever a consumer wishes to prevent script from running on a global,
diff --git a/js/xpconnect/wrappers/XrayWrapper.cpp b/js/xpconnect/wrappers/XrayWrapper.cpp
index dc0fc75654b5..e08dc9cba267 100644
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -277,10 +277,11 @@ bool JSXrayTraits::getOwnPropertyFromWrapperIfSafe(JSContext* cx,
 {
     MOZ_ASSERT(js::IsObjectInContextCompartment(wrapper, cx));
     RootedObject target(cx, getTargetObject(wrapper));
+    RootedObject wrapperGlobal(cx, JS::CurrentGlobalOrNull(cx));
     {
         JSAutoRealm ar(cx, target);
         JS_MarkCrossZoneId(cx, id);
-        if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, id, outDesc))
+        if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, wrapperGlobal, id, outDesc))
             return false;
     }
     return JS_WrapPropertyDescriptor(cx, outDesc);
@@ -289,6 +290,7 @@ bool JSXrayTraits::getOwnPropertyFromWrapperIfSafe(JSContext* cx,
 bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
                                                   HandleObject target,
                                                   HandleObject wrapper,
+                                                  HandleObject wrapperGlobal,
                                                   HandleId id,
                                                   MutableHandle<PropertyDescriptor> outDesc)
 {
@@ -297,6 +299,8 @@ bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
     MOZ_ASSERT(getTargetObject(wrapper) == target);
     MOZ_ASSERT(js::IsObjectInContextCompartment(target, cx));
     MOZ_ASSERT(WrapperFactory::IsXrayWrapper(wrapper));
+    MOZ_ASSERT(JS_IsGlobalObject(wrapperGlobal));
+    js::AssertSameCompartment(wrapper, wrapperGlobal);
     MOZ_ASSERT(outDesc.object() == nullptr);
 
     Rooted<PropertyDescriptor> desc(cx);
@@ -309,7 +313,7 @@ bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
 
     // Disallow accessor properties.
     if (desc.hasGetterOrSetter()) {
-        JSAutoRealmAllowCCW ar(cx, wrapper);
+        JSAutoRealm ar(cx, wrapperGlobal);
         JS_MarkCrossZoneId(cx, id);
         return ReportWrapperDenial(cx, id, WrapperDenialForXray, "property has accessor");
     }
@@ -321,7 +325,7 @@ bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
 
         // Disallow non-subsumed objects.
         if (!AccessCheck::subsumes(target, propObj)) {
-            JSAutoRealmAllowCCW ar(cx, wrapper);
+            JSAutoRealm ar(cx, wrapperGlobal);
             JS_MarkCrossZoneId(cx, id);
             return ReportWrapperDenial(cx, id, WrapperDenialForXray, "value not same-origin with target");
         }
@@ -329,14 +333,14 @@ bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
         // Disallow non-Xrayable objects.
         XrayType xrayType = GetXrayType(propObj);
         if (xrayType == NotXray || xrayType == XrayForOpaqueObject) {
-            JSAutoRealmAllowCCW ar(cx, wrapper);
+            JSAutoRealm ar(cx, wrapperGlobal);
             JS_MarkCrossZoneId(cx, id);
             return ReportWrapperDenial(cx, id, WrapperDenialForXray, "value not Xrayable");
         }
 
         // Disallow callables.
         if (JS::IsCallable(propObj)) {
-            JSAutoRealmAllowCCW ar(cx, wrapper);
+            JSAutoRealm ar(cx, wrapperGlobal);
             JS_MarkCrossZoneId(cx, id);
             return ReportWrapperDenial(cx, id, WrapperDenialForXray, "value is callable");
         }
@@ -344,7 +348,7 @@ bool JSXrayTraits::getOwnPropertyFromTargetIfSafe(JSContext* cx,
 
     // Disallow any property that shadows something on its (Xrayed)
     // prototype chain.
-    JSAutoRealmAllowCCW ar2(cx, wrapper);
+    JSAutoRealm ar2(cx, wrapperGlobal);
     JS_MarkCrossZoneId(cx, id);
     RootedObject proto(cx);
     bool foundOnProto = false;
@@ -659,6 +663,8 @@ JSXrayTraits::resolveOwnProperty(JSContext* cx, HandleObject wrapper,
 bool
 JSXrayTraits::delete_(JSContext* cx, HandleObject wrapper, HandleId id, ObjectOpResult& result)
 {
+    MOZ_ASSERT(js::IsObjectInContextCompartment(wrapper, cx));
+
     RootedObject holder(cx, ensureHolder(cx, wrapper));
     if (!holder)
         return false;
@@ -670,11 +676,12 @@ JSXrayTraits::delete_(JSContext* cx, HandleObject wrapper, HandleId id, ObjectOp
     bool isObjectOrArrayInstance = (key == JSProto_Object || key == JSProto_Array) &&
                                    !isPrototype(holder);
     if (isObjectOrArrayInstance) {
+        RootedObject wrapperGlobal(cx, JS::CurrentGlobalOrNull(cx));
         RootedObject target(cx, getTargetObject(wrapper));
         JSAutoRealm ar(cx, target);
         JS_MarkCrossZoneId(cx, id);
         Rooted<PropertyDescriptor> desc(cx);
-        if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, id, &desc))
+        if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, wrapperGlobal, id, &desc))
             return false;
         if (desc.object())
             return JS_DeletePropertyById(cx, target, id, result);
@@ -799,6 +806,8 @@ bool
 JSXrayTraits::enumerateNames(JSContext* cx, HandleObject wrapper, unsigned flags,
                              AutoIdVector& props)
 {
+    MOZ_ASSERT(js::IsObjectInContextCompartment(wrapper, cx));
+
     RootedObject target(cx, getTargetObject(wrapper));
     RootedObject holder(cx, ensureHolder(cx, wrapper));
     if (!holder)
@@ -810,6 +819,7 @@ JSXrayTraits::enumerateNames(JSContext* cx, HandleObject wrapper, unsigned flags
         // object, but only after filtering them carefully.
         if (key == JSProto_Object || key == JSProto_Array) {
             MOZ_ASSERT(props.empty());
+            RootedObject wrapperGlobal(cx, JS::CurrentGlobalOrNull(cx));
             {
                 JSAutoRealm ar(cx, target);
                 AutoIdVector targetProps(cx);
@@ -822,8 +832,11 @@ JSXrayTraits::enumerateNames(JSContext* cx, HandleObject wrapper, unsigned flags
                 for (size_t i = 0; i < targetProps.length(); ++i) {
                     Rooted<PropertyDescriptor> desc(cx);
                     RootedId id(cx, targetProps[i]);
-                    if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, id, &desc))
+                    if (!getOwnPropertyFromTargetIfSafe(cx, target, wrapper, wrapperGlobal, id,
+                                                        &desc))
+                    {
                         return false;
+                    }
                     if (desc.object())
                         props.infallibleAppend(id);
                 }
@@ -1158,11 +1171,16 @@ static const size_t JSSLOT_WRAPPER_HOLDER_CONTENTS = 0;
 JSObject*
 XrayTraits::attachExpandoObject(JSContext* cx, HandleObject target,
                                 HandleObject exclusiveWrapper,
+                                HandleObject exclusiveWrapperGlobal,
                                 nsIPrincipal* origin)
 {
     // Make sure the compartments are sane.
     MOZ_ASSERT(js::IsObjectInContextCompartment(target, cx));
-    MOZ_ASSERT_IF(exclusiveWrapper, !js::IsObjectInContextCompartment(exclusiveWrapper, cx));
+    if (exclusiveWrapper) {
+        MOZ_ASSERT(!js::IsObjectInContextCompartment(exclusiveWrapper, cx));
+        MOZ_ASSERT(JS_IsGlobalObject(exclusiveWrapperGlobal));
+        js::AssertSameCompartment(exclusiveWrapper, exclusiveWrapperGlobal);
+    }
 
     // No duplicates allowed.
 #ifdef DEBUG
@@ -1193,7 +1211,7 @@ XrayTraits::attachExpandoObject(JSContext* cx, HandleObject target,
     // Note the exclusive wrapper, if there is one.
     RootedObject wrapperHolder(cx);
     if (exclusiveWrapper) {
-        JSAutoRealmAllowCCW ar(cx, exclusiveWrapper);
+        JSAutoRealm ar(cx, exclusiveWrapperGlobal);
         wrapperHolder = JS_NewObjectWithGivenProto(cx, &gWrapperHolderClass, nullptr);
         if (!wrapperHolder)
             return nullptr;
@@ -1207,7 +1225,7 @@ XrayTraits::attachExpandoObject(JSContext* cx, HandleObject target,
     // Store it on the exclusive wrapper, if there is one.
     if (exclusiveWrapper) {
         RootedObject cachedExpandoObject(cx, expandoObject);
-        JSAutoRealmAllowCCW ar(cx, exclusiveWrapper);
+        JSAutoRealm ar(cx, exclusiveWrapperGlobal);
         if (!JS_WrapObject(cx, &cachedExpandoObject))
             return nullptr;
         JSObject* holder = ensureHolder(cx, exclusiveWrapper);
@@ -1234,6 +1252,9 @@ JSObject*
 XrayTraits::ensureExpandoObject(JSContext* cx, HandleObject wrapper,
                                 HandleObject target)
 {
+    MOZ_ASSERT(js::IsObjectInContextCompartment(wrapper, cx));
+    RootedObject wrapperGlobal(cx, JS::CurrentGlobalOrNull(cx));
+
     // Expando objects live in the target compartment.
     JSAutoRealm ar(cx, target);
     RootedObject expandoObject(cx);
@@ -1242,6 +1263,7 @@ XrayTraits::ensureExpandoObject(JSContext* cx, HandleObject wrapper,
     if (!expandoObject) {
         bool isExclusive = CompartmentHasExclusiveExpandos(wrapper);
         expandoObject = attachExpandoObject(cx, target, isExclusive ? wrapper : nullptr,
+                                            wrapperGlobal,
                                             ObjectPrincipal(wrapper));
     }
     return expandoObject;
@@ -1262,6 +1284,7 @@ XrayTraits::cloneExpandoChain(JSContext* cx, HandleObject dst, HandleObject srcC
 
         // exclusiveWrapper is only used if movingIntoXrayCompartment ends up true.
         RootedObject exclusiveWrapper(cx);
+        RootedObject exclusiveWrapperGlobal(cx);
         RootedObject wrapperHolder(cx, JS_GetReservedSlot(oldHead,
                                                           JSSLOT_EXPANDO_EXCLUSIVE_WRAPPER_HOLDER)
                                                          .toObjectOrNull());
@@ -1281,6 +1304,7 @@ XrayTraits::cloneExpandoChain(JSContext* cx, HandleObject dst, HandleObject srcC
                 exclusiveWrapper = dst;
                 if (!JS_WrapObject(cx, &exclusiveWrapper))
                     return false;
+                exclusiveWrapperGlobal = JS::CurrentGlobalOrNull(cx);
             }
         } else {
             JSAutoRealm ar(cx, oldHead);
@@ -1296,6 +1320,7 @@ XrayTraits::cloneExpandoChain(JSContext* cx, HandleObject dst, HandleObject srcC
             // Create a new expando object in the compartment of dst to replace
             // oldHead.
             RootedObject newHead(cx, attachExpandoObject(cx, dst, exclusiveWrapper,
+                                                         exclusiveWrapperGlobal,
                                                          GetExpandoObjectPrincipal(oldHead)));
             if (!JS_CopyPropertiesFrom(cx, newHead, oldHead))
                 return false;
@@ -1926,18 +1951,18 @@ XrayWrapper<Base, Traits>::defineProperty(JSContext* cx, HandleObject wrapper,
     if (defined)
         return true;
 
-    // We're placing an expando. The expando objects live in the target
-    // compartment, so we need to enter it.
-    RootedObject target(cx, Traits::getTargetObject(wrapper));
-    JSAutoRealm ar(cx, target);
-    JS_MarkCrossZoneId(cx, id);
-
     // Grab the relevant expando object.
+    RootedObject target(cx, Traits::getTargetObject(wrapper));
     RootedObject expandoObject(cx, Traits::singleton.ensureExpandoObject(cx, wrapper,
                                                                          target));
     if (!expandoObject)
         return false;
 
+    // We're placing an expando. The expando objects live in the target
+    // compartment, so we need to enter it.
+    JSAutoRealm ar(cx, target);
+    JS_MarkCrossZoneId(cx, id);
+
     // Wrap the property descriptor for the target compartment.
     Rooted<PropertyDescriptor> wrappedDesc(cx, desc);
     if (!JS_WrapPropertyDescriptor(cx, &wrappedDesc))
diff --git a/js/xpconnect/wrappers/XrayWrapper.h b/js/xpconnect/wrappers/XrayWrapper.h
index 7b394990759c..27147b7899aa 100644
--- a/js/xpconnect/wrappers/XrayWrapper.h
+++ b/js/xpconnect/wrappers/XrayWrapper.h
@@ -126,9 +126,11 @@ private:
                                   JS::MutableHandleObject expandoObject);
 
     // |cx| is in the target's compartment, and |exclusiveWrapper| is any xray
-    // that has exclusive use of the expando.
+    // that has exclusive use of the expando. |exclusiveWrapperGlobal| is the
+    // caller's global and must be same-compartment with |exclusiveWrapper|.
     JSObject* attachExpandoObject(JSContext* cx, JS::HandleObject target,
                                   JS::HandleObject exclusiveWrapper,
+                                  JS::HandleObject exclusiveWrapperGlobal,
                                   nsIPrincipal* origin);
 
     XrayTraits(XrayTraits&) = delete;
@@ -267,10 +269,12 @@ public:
                                                 JS::HandleId id,
                                                 JS::MutableHandle<JS::PropertyDescriptor> desc);
 
-    // Like the above, but operates in the target compartment.
+    // Like the above, but operates in the target compartment. wrapperGlobal is
+    // the caller's global (must be in the wrapper compartment).
     static bool getOwnPropertyFromTargetIfSafe(JSContext* cx,
                                                JS::HandleObject target,
                                                JS::HandleObject wrapper,
+                                               JS::HandleObject wrapperGlobal,
                                                JS::HandleId id,
                                                JS::MutableHandle<JS::PropertyDescriptor> desc);
 
diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp
index 02e8f6b9cea2..882d02a39480 100644
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -4976,7 +4976,7 @@ PresShell::CreateRangePaintInfo(nsRange* aRange,
 already_AddRefed<SourceSurface>
 PresShell::PaintRangePaintInfo(const nsTArray<UniquePtr<RangePaintInfo>>& aItems,
                                Selection* aSelection,
-                               nsIntRegion* aRegion,
+                               const Maybe<CSSIntRegion>& aRegion,
                                nsRect aArea,
                                const LayoutDeviceIntPoint aPoint,
                                LayoutDeviceIntRect* aScreenRect,
@@ -5073,10 +5073,10 @@ PresShell::PaintRangePaintInfo(const nsTArray<UniquePtr<RangePaintInfo>>& aItems
 
     // Convert aRegion from CSS pixels to dev pixels
     nsIntRegion region =
-      aRegion->ToAppUnits(nsPresContext::AppUnitsPerCSSPixel())
-        .ToOutsidePixels(pc->AppUnitsPerDevPixel());
+        aRegion->ToAppUnits(nsPresContext::AppUnitsPerCSSPixel())
+          .ToOutsidePixels(pc->AppUnitsPerDevPixel());
     for (auto iter = region.RectIter(); !iter.Done(); iter.Next()) {
-      const nsIntRect& rect = iter.Get();
+      const IntRect& rect = iter.Get();
 
       builder->MoveTo(rect.TopLeft());
       builder->LineTo(rect.TopRight());
@@ -5136,7 +5136,7 @@ PresShell::PaintRangePaintInfo(const nsTArray<UniquePtr<RangePaintInfo>>& aItems
 
 already_AddRefed<SourceSurface>
 PresShell::RenderNode(nsINode* aNode,
-                      nsIntRegion* aRegion,
+                      const Maybe<CSSIntRegion>& aRegion,
                       const LayoutDeviceIntPoint aPoint,
                       LayoutDeviceIntRect* aScreenRect,
                       uint32_t aFlags)
@@ -5163,9 +5163,10 @@ PresShell::RenderNode(nsINode* aNode,
     return nullptr;
   }
 
-  if (aRegion) {
+  Maybe<CSSIntRegion> region = aRegion;
+  if (region) {
     // combine the area with the supplied region
-    nsIntRect rrectPixels = aRegion->GetBounds();
+    CSSIntRect rrectPixels = region->GetBounds();
 
     nsRect rrect = ToAppUnits(rrectPixels, nsPresContext::AppUnitsPerCSSPixel());
     area.IntersectRect(area, rrect);
@@ -5175,11 +5176,11 @@ PresShell::RenderNode(nsINode* aNode,
       return nullptr;
 
     // move the region so that it is offset from the topleft corner of the surface
-    aRegion->MoveBy(-nsPresContext::AppUnitsToIntCSSPixels(area.x),
-                    -nsPresContext::AppUnitsToIntCSSPixels(area.y));
+    region->MoveBy(-nsPresContext::AppUnitsToIntCSSPixels(area.x),
+                   -nsPresContext::AppUnitsToIntCSSPixels(area.y));
   }
 
-  return PaintRangePaintInfo(rangeItems, nullptr, aRegion, area, aPoint,
+  return PaintRangePaintInfo(rangeItems, nullptr, region, area, aPoint,
                              aScreenRect, aFlags);
 }
 
@@ -5210,7 +5211,7 @@ PresShell::RenderSelection(Selection* aSelection,
     }
   }
 
-  return PaintRangePaintInfo(rangeItems, aSelection, nullptr, area, aPoint,
+  return PaintRangePaintInfo(rangeItems, aSelection, Nothing(), area, aPoint,
                              aScreenRect, aFlags);
 }
 
diff --git a/layout/base/PresShell.h b/layout/base/PresShell.h
index 31ac35b13c50..ef34116040bf 100644
--- a/layout/base/PresShell.h
+++ b/layout/base/PresShell.h
@@ -191,7 +191,7 @@ public:
 
   already_AddRefed<SourceSurface>
   RenderNode(nsINode* aNode,
-             nsIntRegion* aRegion,
+             const Maybe<CSSIntRegion>& aRegion,
              const LayoutDeviceIntPoint aPoint,
              LayoutDeviceIntRect* aScreenRect,
              uint32_t aFlags) override;
@@ -543,7 +543,7 @@ private:
   already_AddRefed<SourceSurface>
   PaintRangePaintInfo(const nsTArray<UniquePtr<RangePaintInfo>>& aItems,
                       dom::Selection* aSelection,
-                      nsIntRegion* aRegion,
+                      const Maybe<CSSIntRegion>& aRegion,
                       nsRect aArea,
                       const LayoutDeviceIntPoint aPoint,
                       LayoutDeviceIntRect* aScreenRect,
diff --git a/layout/base/nsIPresShell.h b/layout/base/nsIPresShell.h
index aaa261c707fa..6d68305648e0 100644
--- a/layout/base/nsIPresShell.h
+++ b/layout/base/nsIPresShell.h
@@ -1162,7 +1162,7 @@ public:
    */
   virtual already_AddRefed<mozilla::gfx::SourceSurface>
   RenderNode(nsINode* aNode,
-             nsIntRegion* aRegion,
+             const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
              const mozilla::LayoutDeviceIntPoint aPoint,
              mozilla::LayoutDeviceIntRect* aScreenRect,
              uint32_t aFlags) = 0;
diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp
index dc2a11d2a699..8dbbe85cb447 100644
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -3043,7 +3043,7 @@ nsIFrame::BuildDisplayListForStackingContext(nsDisplayListBuilder* aBuilder,
     DisplayListClipState::AutoSaveRestore nestedClipState(aBuilder);
     nsDisplayListBuilder::AutoInTransformSetter
       inTransformSetter(aBuilder, inTransform);
-    nsDisplayListBuilder::AutoFilterASRSetter
+    nsDisplayListBuilder::AutoEnterFilter
       filterASRSetter(aBuilder, usingFilter);
 
     CheckForApzAwareEventHandlers(aBuilder, this);
diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp
index 00a7438cc64e..d466a6fc89f6 100644
--- a/layout/generic/nsSubDocumentFrame.cpp
+++ b/layout/generic/nsSubDocumentFrame.cpp
@@ -379,6 +379,16 @@ nsSubDocumentFrame::BuildDisplayList(nsDisplayListBuilder*   aBuilder,
     return;
   }
 
+  if (aBuilder->IsInFilter()) {
+    nsIDocument* outerDoc = PresShell()->GetDocument();
+    nsIDocument* innerDoc = presShell->GetDocument();
+    if (outerDoc && innerDoc) {
+      if (!outerDoc->NodePrincipal()->Equals(innerDoc->NodePrincipal())) {
+        outerDoc->SetDocumentAndPageUseCounter(eUseCounter_custom_FilteredCrossOriginIFrame);
+      }
+    }
+  }
+
   nsIFrame* subdocRootFrame = presShell->GetRootFrame();
 
   nsPresContext* presContext = presShell->GetPresContext();
diff --git a/layout/painting/nsDisplayList.cpp b/layout/painting/nsDisplayList.cpp
index af058cd9026f..1858d78f15f5 100644
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -1009,6 +1009,7 @@ nsDisplayListBuilder::nsDisplayListBuilder(nsIFrame* aReferenceFrame,
       mAllowMergingAndFlattening(true),
       mWillComputePluginGeometry(false),
       mInTransform(false),
+      mInFilter(false),
       mInPageSequence(false),
       mIsInChromePresContext(false),
       mSyncDecodeImages(false),
@@ -1058,6 +1059,7 @@ nsDisplayListBuilder::BeginFrame()
   mIsPaintingToWindow = false;
   mIgnoreSuppression = false;
   mInTransform = false;
+  mInFilter = false;
   mSyncDecodeImages = false;
 }
 
diff --git a/layout/painting/nsDisplayList.h b/layout/painting/nsDisplayList.h
index f868147d5a05..2ae44d4391be 100644
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -835,6 +835,12 @@ public:
    */
   void SetInTransform(bool aInTransform) { mInTransform = aInTransform; }
 
+  /**
+   * Returns true if we're currently building a display list that's
+   * under an nsDisplayFilter.
+   */
+  bool IsInFilter() const { return mInFilter; }
+
   bool IsInPageSequence() const { return mInPageSequence; }
   void SetInPageSequence(bool aInPage) { mInPageSequence = aInPage; }
 
@@ -1170,23 +1176,29 @@ public:
   };
 
   /**
-   * A helper class to temporarily set the value of mFilterASR.
+   * A helper class to temporarily set the value of mFilterASR and
+   * mInFilter.
    */
-  class AutoFilterASRSetter {
+  class AutoEnterFilter {
   public:
-    AutoFilterASRSetter(nsDisplayListBuilder* aBuilder, bool aUsingFilter)
-      : mBuilder(aBuilder), mOldValue(aBuilder->mFilterASR)
+    AutoEnterFilter(nsDisplayListBuilder* aBuilder, bool aUsingFilter)
+      : mBuilder(aBuilder)
+      , mOldValue(aBuilder->mFilterASR)
+      , mOldInFilter(aBuilder->mInFilter)
     {
       if (!aBuilder->mFilterASR && aUsingFilter) {
         aBuilder->mFilterASR = aBuilder->CurrentActiveScrolledRoot();
+        aBuilder->mInFilter = true;
       }
     }
-    ~AutoFilterASRSetter() {
+    ~AutoEnterFilter() {
       mBuilder->mFilterASR = mOldValue;
+      mBuilder->mInFilter = mOldInFilter;
     }
   private:
     nsDisplayListBuilder* mBuilder;
     const ActiveScrolledRoot* mOldValue;
+    bool mOldInFilter;
   };
 
   /**
@@ -1948,6 +1960,7 @@ private:
   // True when we're building a display list that's directly or indirectly
   // under an nsDisplayTransform
   bool                           mInTransform;
+  bool                           mInFilter;
   bool                           mInPageSequence;
   bool                           mIsInChromePresContext;
   bool                           mSyncDecodeImages;
diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp
index 022f97b3f243..bd4b31ef07f1 100644
--- a/layout/xul/nsXULPopupManager.cpp
+++ b/layout/xul/nsXULPopupManager.cpp
@@ -1953,12 +1953,10 @@ nsXULPopupManager::UpdateMenuItems(nsIContent* aPopup)
   }
 
   // When a menu is opened, make sure that command updating is unlocked first.
-  if (document->IsXULDocument()) {
-    nsCOMPtr<nsIDOMXULCommandDispatcher> xulCommandDispatcher =
-      document->AsXULDocument()->GetCommandDispatcher();
-    if (xulCommandDispatcher) {
-      xulCommandDispatcher->Unlock();
-    }
+  nsCOMPtr<nsIDOMXULCommandDispatcher> commandDispatcher =
+    document->GetCommandDispatcher();
+  if (commandDispatcher) {
+    commandDispatcher->Unlock();
   }
 
   for (nsCOMPtr<nsIContent> grandChild = aPopup->GetFirstChild();
diff --git a/layout/xul/tree/TreeBoxObject.cpp b/layout/xul/tree/TreeBoxObject.cpp
index 63226e95706d..29df26f41556 100644
--- a/layout/xul/tree/TreeBoxObject.cpp
+++ b/layout/xul/tree/TreeBoxObject.cpp
@@ -7,7 +7,6 @@
 #include "mozilla/dom/TreeBoxObject.h"
 #include "nsCOMPtr.h"
 #include "nsXULElement.h"
-#include "nsIScriptableRegion.h"
 #include "nsTreeContentView.h"
 #include "nsITreeSelection.h"
 #include "ChildIterator.h"
@@ -314,19 +313,6 @@ int32_t TreeBoxObject::GetPageLength()
   return 0;
 }
 
-already_AddRefed<nsIScriptableRegion>
-TreeBoxObject::SelectionRegion()
-{
-  nsTreeBodyFrame* body = GetTreeBodyFrame();
-  if (!body) {
-    return nullptr;
-  }
-
-  nsCOMPtr<nsIScriptableRegion> region;
-  body->GetSelectionRegion(getter_AddRefs(region));
-  return region.forget();
-}
-
 NS_IMETHODIMP
 TreeBoxObject::EnsureRowIsVisible(int32_t aRow)
 {
diff --git a/layout/xul/tree/TreeBoxObject.h b/layout/xul/tree/TreeBoxObject.h
index e025f2074bca..f0c8178f3050 100644
--- a/layout/xul/tree/TreeBoxObject.h
+++ b/layout/xul/tree/TreeBoxObject.h
@@ -59,8 +59,6 @@ public:
 
   int32_t HorizontalPosition();
 
-  already_AddRefed<nsIScriptableRegion> SelectionRegion();
-
   void EnsureCellIsVisible(int32_t row, nsTreeColumn* col, ErrorResult& aRv);
 
   void ScrollToRow(int32_t aRow);
diff --git a/layout/xul/tree/nsITreeBoxObject.idl b/layout/xul/tree/nsITreeBoxObject.idl
index 47490712f79c..8c4bb015cc73 100644
--- a/layout/xul/tree/nsITreeBoxObject.idl
+++ b/layout/xul/tree/nsITreeBoxObject.idl
@@ -6,8 +6,6 @@
 #include "nsISupports.idl"
 
 interface nsITreeView;
-interface nsITreeSelection;
-interface nsIScriptableRegion;
 
 webidl Element;
 webidl TreeColumn;
diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp
index e9166350c9f9..003df45b4495 100644
--- a/layout/xul/tree/nsTreeBodyFrame.cpp
+++ b/layout/xul/tree/nsTreeBodyFrame.cpp
@@ -63,7 +63,6 @@
 #include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/TreeBoxObject.h"
 #include "mozilla/dom/TreeColumnBinding.h"
-#include "nsIScriptableRegion.h"
 #include <algorithm>
 #include "ScrollbarActivity.h"
 
@@ -568,20 +567,15 @@ nsTreeBodyFrame::GetHorizontalPosition() const
   return nsPresContext::AppUnitsToIntCSSPixels(mHorzPosition);
 }
 
-nsresult
-nsTreeBodyFrame::GetSelectionRegion(nsIScriptableRegion **aRegion)
+Maybe<CSSIntRegion>
+nsTreeBodyFrame::GetSelectionRegion()
 {
-  *aRegion = nullptr;
-
   nsCOMPtr<nsITreeSelection> selection;
   mView->GetSelection(getter_AddRefs(selection));
-  NS_ENSURE_TRUE(selection, NS_OK);
+  if (!selection) {
+    return Nothing();
+  }
 
-  // XXXbz should we just construct as |new ScriptableRegion()|
-  // instead, and make this method return void?
-  nsCOMPtr<nsIScriptableRegion> region = do_CreateInstance("@mozilla.org/gfx/region;1");
-  NS_ENSURE_TRUE(region, NS_ERROR_FAILURE);
-  region->Init();
 
   RefPtr<nsPresContext> presContext = PresContext();
   nsIntRect rect = mRect.ToOutsidePixels(presContext->AppUnitsPerCSSPixel());
@@ -589,6 +583,8 @@ nsTreeBodyFrame::GetSelectionRegion(nsIScriptableRegion **aRegion)
   nsIFrame* rootFrame = presContext->PresShell()->GetRootFrame();
   nsPoint origin = GetOffsetTo(rootFrame);
 
+  CSSIntRegion region;
+
   // iterate through the visible rows and add the selected ones to the
   // drag region
   int32_t x = nsPresContext::AppUnitsToIntCSSPixels(origin.x);
@@ -599,16 +595,16 @@ nsTreeBodyFrame::GetSelectionRegion(nsIScriptableRegion **aRegion)
   for (int32_t i = mTopRowIndex; i <= end; i++) {
     bool isSelected;
     selection->IsSelected(i, &isSelected);
-    if (isSelected)
-      region->UnionRect(x, y, rect.width, rowHeight);
+    if (isSelected) {
+      region.OrWith(CSSIntRect(x, y, rect.width, rowHeight));
+    }
     y += rowHeight;
   }
 
   // clip to the tree boundary in case one row extends past it
-  region->IntersectRect(x, top, rect.width, rect.height);
+  region.AndWith(CSSIntRect(x, top, rect.width, rect.height));
 
-  region.forget(aRegion);
-  return NS_OK;
+  return Some(region);
 }
 
 nsresult
diff --git a/layout/xul/tree/nsTreeBodyFrame.h b/layout/xul/tree/nsTreeBodyFrame.h
index 4995bfce7c95..676386c3ad25 100644
--- a/layout/xul/tree/nsTreeBodyFrame.h
+++ b/layout/xul/tree/nsTreeBodyFrame.h
@@ -89,7 +89,7 @@ public:
   int32_t RowHeight() const;
   int32_t RowWidth();
   int32_t GetHorizontalPosition() const;
-  nsresult GetSelectionRegion(nsIScriptableRegion **aRegion);
+  mozilla::Maybe<mozilla::CSSIntRegion> GetSelectionRegion();
   int32_t FirstVisibleRow() const { return mTopRowIndex; }
   int32_t LastVisibleRow() const { return mTopRowIndex + mPageLength; }
   int32_t PageLength() const { return mPageLength; }
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index e39931b2c57d..c543f62e40a1 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -339,11 +339,17 @@ VARCACHE_PREF(
 )
 
 // Is the '-webkit-appearance' alias for '-moz-appearance' enabled?
+#ifdef EARLY_BETA_OR_EARLIER
+#define PREF_VALUE true
+#else
+#define PREF_VALUE false
+#endif
 VARCACHE_PREF(
   "layout.css.webkit-appearance.enabled",
    layout_css_webkit_appearance_enabled,
-  bool, false
+  bool, PREF_VALUE
 )
+#undef PREF_VALUE
 
 // Pref to control whether @-moz-document rules are enabled in content pages.
 VARCACHE_PREF(
diff --git a/mozglue/tests/gtest/InjectorDLL/moz.build b/mozglue/tests/gtest/InjectorDLL/moz.build
index 053221dd61b6..9f60e9443373 100644
--- a/mozglue/tests/gtest/InjectorDLL/moz.build
+++ b/mozglue/tests/gtest/InjectorDLL/moz.build
@@ -13,6 +13,3 @@ UNIFIED_SOURCES = [
 
 if CONFIG['COMPILE_ENVIRONMENT']:
     TEST_HARNESS_FILES.gtest += ['!InjectorDLL.dll']
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/old-configure.in b/old-configure.in
index 26e837297cfd..8fbc99b05e4a 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1102,6 +1102,12 @@ case "$target" in
         fi
         AC_DEFINE(_AMD64_)
         ;;
+    aarch64-*)
+        if test -n "$_WIN32_MSVC"; then
+            DSO_LDOPTS="$DSO_LDOPTS -MACHINE:ARM64"
+        fi
+        AC_DEFINE(_ARM64_)
+        ;;
     *)
         AC_DEFINE(_CPU_ARCH_NOT_DEFINED)
         ;;
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index f5577eaf5f99..d910f5d8b4ee 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1630,7 +1630,7 @@ class StaticAnalysis(MachCommandBase):
     """Utilities for running C++ static analysis checks and format."""
 
     # List of file extension to consider (should start with dot)
-    _format_include_extensions = ('.cpp', '.c', '.h')
+    _format_include_extensions = ('.cpp', '.c', '.h', '.java')
     # File contaning all paths to exclude from formatting
     _format_ignore_file = '.clang-format-ignore'
 
@@ -1712,7 +1712,141 @@ class StaticAnalysis(MachCommandBase):
             self.log(logging.WARNING, 'warning_summary',
                      {'count': len(monitor.warnings_db)},
                      '{count} warnings present.')
+        if rc != 0:
             return rc
+        # if we are building firefox for android it might be nice to
+        # also analyze the java code base
+        if self.substs['MOZ_BUILD_APP'] == 'mobile/android':
+            rc = self.check_java(source, jobs, strip, verbose, skip_export=True)
+        return rc
+
+    @StaticAnalysisSubCommand('static-analysis', 'check-java',
+                              'Run infer on the java codebase.')
+    @CommandArgument('source', nargs='*', default=['mobile'],
+                     help='Source files to be analyzed. '
+                          'Can be omitted, in which case the entire code base '
+                          'is analyzed.  The source argument is ignored if '
+                          'there is anything fed through stdin, in which case '
+                          'the analysis is only performed on the files changed '
+                          'in the patch streamed through stdin.  This is called '
+                          'the diff mode.')
+    @CommandArgument('--checks', '-c', default=[], metavar='checks', nargs='*',
+                     help='Static analysis checks to enable.')
+    @CommandArgument('--jobs', '-j', default='0', metavar='jobs', type=int,
+                     help='Number of concurrent jobs to run.'
+                     ' Default is the number of CPUs.')
+    @CommandArgument('--task', '-t', type=str,
+                     default='compileLocalWithGeckoBinariesNoMinApiDebugSources',
+                     help='Which gradle tasks to use to compile the java codebase.')
+    def check_java(self, source=['mobile'], jobs=2, strip=1, verbose=False, checks=[],
+                   task='compileLocalWithGeckoBinariesNoMinApiDebugSources',
+                   skip_export=False):
+        self._set_log_level(verbose)
+        self.log_manager.enable_all_structured_loggers()
+        if self.substs['MOZ_BUILD_APP'] != 'mobile/android':
+            self.log(logging.WARNING, 'static-analysis', {},
+                     'Cannot check java source code unless you are building for android!')
+            return 1
+        # if source contains the whole mobile folder, then we just have to
+        # analyze everything
+        check_all = any(i.rstrip(os.sep).split(os.sep)[-1] == 'mobile' for i in source)
+        # gather all java sources from the source variable
+        java_sources = []
+        if not check_all:
+            java_sources = self._get_java_files(source)
+            if not java_sources:
+                return 0
+        if not skip_export:
+            rc = self._build_export(jobs=jobs, verbose=verbose)
+            if rc != 0:
+                return rc
+        rc = self._get_infer(verbose=verbose)
+        if rc != 0:
+            self.log(logging.WARNING, 'static-analysis', {},
+                     'This command is only available for linux64!')
+            return rc
+        # which checkers to use, and which folders to exclude
+        all_checkers, third_party_path = self._get_infer_config()
+        checkers, excludes = self._get_infer_args(
+            checks=checks or all_checkers,
+            third_party_path=third_party_path
+        )
+        gradlew = mozpath.join(self.topsrcdir, 'gradlew')
+        # infer capture command
+        capture_cmd = [self._infer_path, 'capture'] + excludes + \
+            ['--', gradlew, task]
+        tmp_file, args = self._get_infer_source_args(java_sources)
+        # infer analyze command
+        analysis_cmd = [self._infer_path, 'analyze', '--keep-going'] +  \
+            checkers + args
+        # capture, then analyze the sources
+        for args in [[gradlew, 'clean'], capture_cmd, analysis_cmd]:
+            rc = self.run_process(args=args, cwd=self.topsrcdir,
+                                  pass_thru=True)
+            # if a command fails, break and close the tmp file before returning
+            if rc != 0:
+                break
+        if tmp_file:
+            tmp_file.close()
+        return rc
+
+    def _get_java_files(self, sources):
+        java_sources = []
+        for i in sources:
+            f = mozpath.join(self.topsrcdir, i)
+            if os.path.isdir(f):
+                for root, dirs, files in os.walk(f):
+                    dirs.sort()
+                    for file in sorted(files):
+                        if file.endswith('.java'):
+                            java_sources.append(mozpath.join(root, file))
+            elif f.endswith('.java'):
+                java_sources.append(f)
+        return java_sources
+
+    def _get_infer_source_args(self, sources):
+        '''Return the arguments to only analyze <sources>'''
+        if not sources:
+            return (None, [])
+        # create a temporary file in which we place all sources
+        # this is used by the analysis command to only analyze certain files
+        f = tempfile.NamedTemporaryFile()
+        for source in sources:
+            f.write(source+'\n')
+        f.flush()
+        return (f, ['--changed-files-index', f.name])
+
+    def _get_infer_config(self):
+        '''Load the infer config file.'''
+        import yaml
+        checkers = []
+        tp_path = ''
+        with open(mozpath.join(self.topsrcdir, 'tools',
+                               'infer', 'config.yaml')) as f:
+            try:
+                config = yaml.safe_load(f)
+                for item in config['infer_checkers']:
+                    if item['publish']:
+                        checkers.append(item['name'])
+                tp_path = mozpath.join(self.topsrcdir, config['third_party'])
+            except Exception as e:
+                print('Looks like config.yaml is not valid, so we are unable '
+                      'to determine default checkers, and which folder to '
+                      'exclude, using defaults provided by infer')
+        return checkers, tp_path
+
+    def _get_infer_args(self, checks, third_party_path):
+        '''Return the arguments which include the checkers <checks>, and
+        excludes all folder in <third_party_path>.'''
+        checkers = ['-a', 'checkers']
+        excludes = []
+        for checker in checks:
+            checkers.append('--' + checker)
+        with open(third_party_path) as f:
+            for line in f:
+                excludes.append('--skip-analysis-in-path')
+                excludes.append(line.strip('\n'))
+        return checkers, excludes
 
     def _get_clang_tidy_command(self, checks, header_filter, sources, jobs, fix):
 
@@ -1746,7 +1880,8 @@ class StaticAnalysis(MachCommandBase):
                      ' this baseline we will test future results.')
     @CommandArgument('--intree-tool', '-i', default=False, action='store_true',
                      help='Use a pre-aquired in-tree clang-tidy package.')
-    @CommandArgument('checker_names', nargs='*', default=[], help='Checkers that are going to be auto-tested.')
+    @CommandArgument('checker_names', nargs='*', default=[],
+                     help='Checkers that are going to be auto-tested.')
     def autotest(self, verbose=False, dump_results=False, intree_tool=False, checker_names=[]):
         # If 'dump_results' is True than we just want to generate the issues files for each
         # checker in particulat and thus 'force_download' becomes 'False' since we want to
@@ -1793,7 +1928,8 @@ class StaticAnalysis(MachCommandBase):
             rc = self._get_clang_tools(force=force_download, verbose=verbose)
 
         if rc != 0:
-            self.log(logging.ERROR, 'ERROR: static-analysis', {}, 'clang-tidy unable to locate package.')
+            self.log(logging.ERROR, 'ERROR: static-analysis', {},
+                     'clang-tidy unable to locate package.')
             return self.TOOLS_FAILED_DOWNLOAD
 
         self._clang_tidy_base_path = mozpath.join(self.topsrcdir, "tools", "clang-tidy")
@@ -1805,7 +1941,8 @@ class StaticAnalysis(MachCommandBase):
         platform, _ = self.platform
 
         if platform not in config['platforms']:
-            self.log(logging.ERROR, 'static-analysis', {},"RUNNING: clang-tidy autotest for platform {} not supported.".format(platform))
+            self.log(logging.ERROR, 'static-analysis', {},
+                     "RUNNING: clang-tidy autotest for platform {} not supported.".format(platform))
             return TOOLS_UNSUPORTED_PLATFORM
 
         import concurrent.futures
@@ -1875,11 +2012,11 @@ class StaticAnalysis(MachCommandBase):
     @StaticAnalysisSubCommand('static-analysis', 'install',
                               'Install the static analysis helper tool')
     @CommandArgument('source', nargs='?', type=str,
-                     help='Where to fetch a local archive containing the static-analysis and format helper tool.'
-                          'It will be installed in ~/.mozbuild/clang-tools/.'
-                          'Can be omitted, in which case the latest clang-tools '
-                          ' helper for the platform would be automatically '
-                          'detected and installed.')
+                     help='Where to fetch a local archive containing the static-analysis and '
+                     'format helper tool.'
+                          'It will be installed in ~/.mozbuild/clang-tools and ~/.mozbuild/infer.'
+                          'Can be omitted, in which case the latest clang-tools and infer '
+                          'helper for the platform would be automatically detected and installed.')
     @CommandArgument('--skip-cache', action='store_true',
                      help='Skip all local caches to force re-fetching the helper tool.',
                      default=False)
@@ -1887,6 +2024,10 @@ class StaticAnalysis(MachCommandBase):
         self._set_log_level(verbose)
         rc = self._get_clang_tools(force=True, skip_cache=skip_cache,
                                    source=source, verbose=verbose)
+        if rc == 0:
+            # XXX ignore the return code because if it fails or not, infer is
+            # not mandatory, but clang-tidy is
+            self._get_infer(force=True, skip_cache=skip_cache, verbose=verbose)
         return rc
 
     @StaticAnalysisSubCommand('static-analysis', 'clear-cache',
@@ -1895,20 +2036,31 @@ class StaticAnalysis(MachCommandBase):
         self._set_log_level(verbose)
         rc = self._get_clang_tools(force=True, download_if_needed=True, skip_cache=True,
                                    verbose=verbose)
+        if rc == 0:
+            self._get_infer(force=True, download_if_needed=True, skip_cache=True,
+                            verbose=verbose)
         if rc != 0:
             return rc
-
-        self._artifact_manager.artifact_clear_cache()
+        return self._artifact_manager.artifact_clear_cache()
 
     @StaticAnalysisSubCommand('static-analysis', 'print-checks',
                               'Print a list of the static analysis checks performed by default')
     def print_checks(self, verbose=False):
         self._set_log_level(verbose)
         rc = self._get_clang_tools(verbose=verbose)
+        if rc == 0:
+            rc = self._get_infer(verbose=verbose)
         if rc != 0:
             return rc
         args = [self._clang_tidy_path, '-list-checks', '-checks=%s' % self._get_checks()]
-        return self._run_command_in_objdir(args=args, pass_thru=True)
+        rc = self._run_command_in_objdir(args=args, pass_thru=True)
+        if rc != 0:
+            return rc
+        checkers, _ = self._get_infer_config()
+        print('Infer checks:')
+        for checker in checkers:
+            print(' '*4 + checker)
+        return 0
 
     @Command('clang-format',  category='misc', description='Run clang-format on current changes')
     @CommandArgument('--show', '-s', action='store_true', default=False,
@@ -1939,7 +2091,8 @@ class StaticAnalysis(MachCommandBase):
         test_file_path_cpp = test_file_path + '.cpp'
         test_file_path_json = test_file_path + '.json'
 
-        self.log(logging.INFO, 'static-analysis', {},"RUNNING: clang-tidy checker {}.".format(check))
+        self.log(logging.INFO, 'static-analysis', {},
+                 "RUNNING: clang-tidy checker {}.".format(check))
 
         # Verify if this checker actually exists
         if not check in self._clang_tidy_checks:
@@ -2231,6 +2384,47 @@ class StaticAnalysis(MachCommandBase):
                     args += [':({0}){1}'.format(','.join(magics), pattern)]
         return args
 
+    def _get_infer(self, force=False, skip_cache=False,
+                   download_if_needed=True, verbose=False):
+        rc, config, _ = self._get_config_environment()
+        if rc != 0:
+            return rc
+        infer_path = mozpath.join(self._mach_context.state_dir, 'infer')
+        self._infer_path = mozpath.join(infer_path, 'infer', 'bin',
+                                        'infer' +
+                                        config.substs.get('BIN_SUFFIX', ''))
+        if os.path.exists(self._infer_path) and not force:
+            return 0
+        else:
+            if os.path.isdir(infer_path) and download_if_needed:
+                # The directory exists, perhaps it's corrupted?  Delete it
+                # and start from scratch.
+                import shutil
+                shutil.rmtree(infer_path)
+                return self._get_infer(force=force, skip_cache=skip_cache,
+                                       verbose=verbose,
+                                       download_if_needed=download_if_needed)
+            os.mkdir(infer_path)
+            self._artifact_manager = PackageFrontend(self._mach_context)
+            if not download_if_needed:
+                return 0
+            job, _ = self.platform
+            if job != 'linux64':
+                return -1
+            else:
+                job += '-infer'
+            # We want to unpack data in the infer mozbuild folder
+            currentWorkingDir = os.getcwd()
+            os.chdir(infer_path)
+            rc = self._artifact_manager.artifact_toolchain(verbose=verbose,
+                                                           skip_cache=skip_cache,
+                                                           from_build=[job],
+                                                           no_unpack=False,
+                                                           retry=0)
+            # Change back the cwd
+            os.chdir(currentWorkingDir)
+            return rc
+
     def _run_clang_format_diff(self, clang_format_diff, clang_format, show):
         # Run clang-format on the diff
         # Note that this will potentially miss a lot things
@@ -2532,4 +2726,3 @@ class Analyze(MachCommandBase):
             res = 'Please make sure you have a local tup db *or* specify the location with --path.'
             print ('Could not find a valid tup db in ' + path, res, sep='\n')
             return 1
-
diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index ee37f25d89ac..b299a7c451ae 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -127,8 +127,9 @@ Tracker.prototype = {
 
   unignoreID(id) {
     let index = this._ignored.indexOf(id);
-    if (index != -1)
+    if (index != -1) {
       this._ignored.splice(index, 1);
+    }
   },
 
   async _saveChangedID(id, when) {
@@ -344,12 +345,13 @@ Store.prototype = {
    *        Record to apply
    */
   async applyIncoming(record) {
-    if (record.deleted)
+    if (record.deleted) {
       await this.remove(record);
-    else if (!(await this.itemExists(record.id)))
+    } else if (!(await this.itemExists(record.id))) {
       await this.create(record);
-    else
+    } else {
       await this.update(record);
+    }
   },
 
   // override these in derived objects
@@ -1225,8 +1227,9 @@ SyncEngine.prototype = {
       guidColl.sort  = "oldest";
 
       let guids = await guidColl.get();
-      if (!guids.success)
+      if (!guids.success) {
         throw guids;
+      }
 
       // Filtering out already downloaded IDs here isn't necessary. We only do
       // that in case the Sync server doesn't support `older` (bug 1316110).
@@ -1465,10 +1468,11 @@ SyncEngine.prototype = {
 
   // Marks an ID for deletion at the end of the sync.
   _noteDeletedId(id) {
-    if (this._delete.ids == null)
+    if (this._delete.ids == null) {
       this._delete.ids = [id];
-    else
+    } else {
       this._delete.ids.push(id);
+    }
   },
 
   async _switchItemToDupe(localDupeGUID, incomingItem) {
@@ -1740,8 +1744,9 @@ SyncEngine.prototype = {
           } else {
             out = await this._createRecord(id);
           }
-          if (this._log.level <= Log.Level.Trace)
+          if (this._log.level <= Log.Level.Trace) {
             this._log.trace("Outgoing: " + out);
+          }
           await out.encrypt(this.service.collectionKeys.keyForCollection(this.name));
           ok = true;
         } catch (ex) {
@@ -1801,9 +1806,9 @@ SyncEngine.prototype = {
 
       this._log.trace("doing post-sync deletions", {key, val});
       // Send a simple delete for the property
-      if (key != "ids" || val.length <= 100)
+      if (key != "ids" || val.length <= 100) {
         await doDelete(key, val);
-      else {
+      } else {
         // For many ids, split into chunks of at most 100
         while (val.length > 0) {
           await doDelete(key, val.slice(0, 100));
diff --git a/services/sync/modules/engines/bookmarks.js b/services/sync/modules/engines/bookmarks.js
index 1c37493b22f4..ad66736afbb7 100644
--- a/services/sync/modules/engines/bookmarks.js
+++ b/services/sync/modules/engines/bookmarks.js
@@ -97,8 +97,9 @@ PlacesItem.prototype = {
     let clear = await CryptoWrapper.prototype.decrypt.call(this, keyBundle);
 
     // Convert the abstract places item to the actual object type
-    if (!this.deleted)
+    if (!this.deleted) {
       this.__proto__ = this.getTypeObject(this.type).prototype;
+    }
 
     return clear;
   },
@@ -551,8 +552,9 @@ BookmarksEngine.prototype = {
       }
 
       let parentName = parent.title || "";
-      if (guidMap[parentName] == null)
+      if (guidMap[parentName] == null) {
         guidMap[parentName] = {};
+      }
 
       // If the entry already exists, remember that there are explicit dupes.
       let entry = {
@@ -991,20 +993,23 @@ BaseBookmarksStore.prototype = {
 
   async _calculateIndex(record) {
     // Ensure folders have a very high sort index so they're not synced last.
-    if (record.type == "folder")
+    if (record.type == "folder") {
       return FOLDER_SORTINDEX;
+    }
 
     // For anything directly under the toolbar, give it a boost of more than an
     // unvisited bookmark
     let index = 0;
-    if (record.parentid == "toolbar")
+    if (record.parentid == "toolbar") {
       index += 150;
+    }
 
     // Add in the bookmark's frecency if we have something.
     if (record.bmkUri != null) {
       let frecency = await PlacesSyncUtils.history.fetchURLFrecency(record.bmkUri);
-      if (frecency != -1)
+      if (frecency != -1) {
         index += frecency;
+      }
     }
 
     return index;
@@ -1390,13 +1395,15 @@ BookmarksTracker.prototype = {
       return;
     }
 
-    if (isAnno && (!ANNOS_TO_TRACK.includes(property)))
+    if (isAnno && (!ANNOS_TO_TRACK.includes(property))) {
       // Ignore annotations except for the ones that we sync.
       return;
+    }
 
     // Ignore favicon changes to avoid unnecessary churn.
-    if (property == "favicon")
+    if (property == "favicon") {
       return;
+    }
 
     this._log.trace("onItemChanged: " + itemId +
                     (", " + property + (isAnno ? " (anno)" : "")) +
diff --git a/services/sync/modules/engines/clients.js b/services/sync/modules/engines/clients.js
index 62ea1fcd1947..90a50504981a 100644
--- a/services/sync/modules/engines/clients.js
+++ b/services/sync/modules/engines/clients.js
@@ -640,8 +640,9 @@ ClientEngine.prototype = {
     this._log.debug("Handling HMAC mismatch for " + item.id);
 
     let base = await SyncEngine.prototype.handleHMACMismatch.call(this, item, mayRetry);
-    if (base != SyncEngine.kRecoveryStrategy.error)
+    if (base != SyncEngine.kRecoveryStrategy.error) {
       return base;
+    }
 
     // It's a bad client record. Save it to be deleted at the end of the sync.
     this._log.debug("Bad client record detected. Scheduling for deletion.");
@@ -1054,8 +1055,9 @@ ClientStore.prototype = {
   async getAllIDs() {
     let ids = {};
     ids[this.engine.localID] = true;
-    for (let id in this._remoteClients)
+    for (let id in this._remoteClients) {
       ids[id] = true;
+    }
     return ids;
   },
 
diff --git a/services/sync/modules/engines/prefs.js b/services/sync/modules/engines/prefs.js
index d8c807614212..fe598f5b8ea1 100644
--- a/services/sync/modules/engines/prefs.js
+++ b/services/sync/modules/engines/prefs.js
@@ -48,8 +48,9 @@ PrefsEngine.prototype = {
   async getChangedIDs() {
     // No need for a proper timestamp (no conflict resolution needed).
     let changedIDs = {};
-    if (this._tracker.modified)
+    if (this._tracker.modified) {
       changedIDs[PREFS_GUID] = 0;
+    }
     return changedIDs;
   },
 
@@ -217,8 +218,9 @@ PrefStore.prototype = {
 
   async update(record) {
     // Silently ignore pref updates that are for other apps.
-    if (record.id != PREFS_GUID)
+    if (record.id != PREFS_GUID) {
       return;
+    }
 
     this._log.trace("Received pref updates, applying...");
     this._setAllPrefs(record.value);
diff --git a/services/sync/modules/engines/tabs.js b/services/sync/modules/engines/tabs.js
index d66ac9afbea8..675554e65a70 100644
--- a/services/sync/modules/engines/tabs.js
+++ b/services/sync/modules/engines/tabs.js
@@ -62,8 +62,9 @@ TabEngine.prototype = {
   async getChangedIDs() {
     // No need for a proper timestamp (no conflict resolution needed).
     let changedIDs = {};
-    if (this._tracker.modified)
+    if (this._tracker.modified) {
       changedIDs[this.service.clientsEngine.localID] = 0;
+    }
     return changedIDs;
   },
 
diff --git a/services/sync/modules/policies.js b/services/sync/modules/policies.js
index 119cddc35d17..351e437bdac5 100644
--- a/services/sync/modules/policies.js
+++ b/services/sync/modules/policies.js
@@ -470,8 +470,9 @@ SyncScheduler.prototype = {
   updateClientMode: function updateClientMode() {
     // Nothing to do if it's the same amount
     let numClients = this.numClients;
-    if (numClients == this.numClientsLastSync)
+    if (numClients == this.numClientsLastSync) {
       return;
+    }
 
     this._log.debug(`Client count: ${this.numClientsLastSync} -> ${numClients}`);
     this.numClientsLastSync = numClients;
@@ -661,8 +662,9 @@ SyncScheduler.prototype = {
     this.globalScore = this.nextSync = 0;
 
     // Clear out any scheduled syncs
-    if (this.syncTimer)
+    if (this.syncTimer) {
       this.syncTimer.clear();
+    }
   },
 
 };
diff --git a/services/sync/modules/record.js b/services/sync/modules/record.js
index 5d6f9c049022..afb97fdec9db 100644
--- a/services/sync/modules/record.js
+++ b/services/sync/modules/record.js
@@ -32,8 +32,9 @@ WBORecord.prototype = {
   _logName: "Sync.Record.WBO",
 
   get sortindex() {
-    if (this.data.sortindex)
+    if (this.data.sortindex) {
       return this.data.sortindex;
+    }
     return 0;
   },
 
@@ -85,10 +86,12 @@ WBORecord.prototype = {
   toJSON: function toJSON() {
     // Copy fields from data to be stringified, making sure payload is a string
     let obj = {};
-    for (let [key, val] of Object.entries(this.data))
+    for (let [key, val] of Object.entries(this.data)) {
       obj[key] = key == "payload" ? JSON.stringify(val) : val;
-    if (this.ttl)
+    }
+    if (this.ttl) {
       obj.ttl = this.ttl;
+    }
     return obj;
   },
 
@@ -176,9 +179,10 @@ CryptoWrapper.prototype = {
     }
 
     // Verify that the encrypted id matches the requested record's id.
-    if (this.cleartext.id != this.id)
+    if (this.cleartext.id != this.id) {
       throw new Error(
           `Record id mismatch: ${this.cleartext.id} != ${this.id}`);
+    }
 
     return this.cleartext;
   },
@@ -236,8 +240,9 @@ RecordManager.prototype = {
       this.response = await this.service.resource(url).get();
 
       // Don't parse and save the record on failure
-      if (!this.response.success)
+      if (!this.response.success) {
         return null;
+      }
 
       let record = new this._recordType(url);
       record.deserialize(this.response.obj);
@@ -255,8 +260,9 @@ RecordManager.prototype = {
   get(url) {
     // Use a url string as the key to the hash
     let spec = url.spec ? url.spec : url;
-    if (spec in this._records)
+    if (spec in this._records) {
       return Promise.resolve(this._records[spec]);
+    }
     return this.import(url);
   },
 
@@ -266,8 +272,9 @@ RecordManager.prototype = {
   },
 
   contains: function RecordMgr_contains(url) {
-    if ((url.spec || url) in this._records)
+    if ((url.spec || url) in this._records) {
       return true;
+    }
     return false;
   },
 
@@ -321,8 +328,9 @@ CollectionKeyManager.prototype = {
       for (let k1 in m1) {
         let v1 = m1[k1];
         let v2 = m2[k1];
-        if (!(v1 && v2 && v1.equals(v2)))
+        if (!(v1 && v2 && v1.equals(v2))) {
           changed.push(k1);
+        }
       }
     }
 
@@ -350,8 +358,9 @@ CollectionKeyManager.prototype = {
   },
 
   keyForCollection(collection) {
-    if (collection && this._collections[collection])
+    if (collection && this._collections[collection]) {
       return this._collections[collection];
+    }
 
     return this._default;
   },
@@ -469,13 +478,15 @@ CollectionKeyManager.prototype = {
     this._log.info("Testing for updateNeeded. Last modified: " + this.lastModified);
 
     // No local record of modification time? Need an update.
-    if (!this.lastModified)
+    if (!this.lastModified) {
       return true;
+    }
 
     // No keys on the server? We need an update, though our
     // update handling will be a little more drastic...
-    if (!(CRYPTO_COLLECTION in info_collections))
+    if (!(CRYPTO_COLLECTION in info_collections)) {
       return true;
+    }
 
     // Otherwise, we need an update if our modification time is stale.
     return (info_collections[CRYPTO_COLLECTION] > this.lastModified);
@@ -497,8 +508,9 @@ CollectionKeyManager.prototype = {
     this._log.info("Setting collection keys contents. Our last modified: " +
                    this.lastModified + ", input modified: " + modified + ".");
 
-    if (!payload)
+    if (!payload) {
       throw new Error("No payload in CollectionKeyManager.setContents().");
+    }
 
     if (!payload.default) {
       this._log.warn("No downloaded default key: this should not occur.");
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 211dd2149e2a..d4ad520078ef 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -100,8 +100,9 @@ Sync11Service.prototype = {
 
   get locked() { return this._locked; },
   lock: function lock() {
-    if (this._locked)
+    if (this._locked) {
       return false;
+    }
     this._locked = true;
     return true;
   },
@@ -155,8 +156,9 @@ Sync11Service.prototype = {
 
     try {
       let iv = Weave.Crypto.generateRandomIV();
-      if (iv.length == 24)
+      if (iv.length == 24) {
         ok = true;
+      }
 
     } catch (e) {
       this._log.debug("Crypto check failed: " + e);
@@ -196,8 +198,9 @@ Sync11Service.prototype = {
 
     // Leave a sizable delay between HMAC recovery attempts. This gives us
     // time for another client to fix themselves if we touch the record.
-    if ((now - this.lastHMACEvent) < HMAC_EVENT_INTERVAL)
+    if ((now - this.lastHMACEvent) < HMAC_EVENT_INTERVAL) {
       return false;
+    }
 
     this._log.info("Bad HMAC event detected. Attempting recovery " +
                    "or signaling to other clients.");
@@ -549,8 +552,9 @@ Sync11Service.prototype = {
     }
 
     try {
-      if (!infoResponse)
+      if (!infoResponse) {
         infoResponse = await this._fetchInfo(); // Will throw an exception on failure.
+      }
 
       // This only applies when the server is already at version 4.
       if (infoResponse.status != 200) {
@@ -1001,20 +1005,22 @@ Sync11Service.prototype = {
         return false;
       }
 
-      if (!meta)
+      if (!meta) {
         this._log.info("No metadata record, server wipe needed");
-      if (meta && !meta.payload.syncID)
+      }
+      if (meta && !meta.payload.syncID) {
         this._log.warn("No sync id, server wipe needed");
+      }
 
       this._log.info("Wiping server data");
       await this._freshStart();
 
-      if (status == 404)
+      if (status == 404) {
         this._log.info("Metadata record not found, server was wiped to ensure " +
                        "consistency.");
-      else // 200
+      } else { // 200
         this._log.info("Wiped server; incompatible metadata: " + remoteVersion);
-
+      }
       return true;
     } else if (remoteVersion > STORAGE_VERSION) {
       this.status.sync = VERSION_OUT_OF_DATE;
@@ -1075,24 +1081,26 @@ Sync11Service.prototype = {
   _checkSync: function _checkSync(ignore) {
     let reason = "";
     // Ideally we'd call _checkSetup() here but that has too many side-effects.
-    if (Status.service == CLIENT_NOT_CONFIGURED)
+    if (Status.service == CLIENT_NOT_CONFIGURED) {
       reason = kSyncNotConfigured;
-    else if (Status.service == STATUS_DISABLED || !this.enabled)
+    } else if (Status.service == STATUS_DISABLED || !this.enabled) {
       reason = kSyncWeaveDisabled;
-    else if (this.scheduler.offline)
+    } else if (this.scheduler.offline) {
       reason = kSyncNetworkOffline;
-    else if (this.status.minimumNextSync > Date.now())
+    } else if (this.status.minimumNextSync > Date.now()) {
       reason = kSyncBackoffNotMet;
-    else if ((this.status.login == MASTER_PASSWORD_LOCKED) &&
-             Utils.mpLocked())
+    } else if ((this.status.login == MASTER_PASSWORD_LOCKED) &&
+             Utils.mpLocked()) {
       reason = kSyncMasterPasswordLocked;
-    else if (Svc.Prefs.get("firstSync") == "notReady")
+    } else if (Svc.Prefs.get("firstSync") == "notReady") {
       reason = kFirstSyncChoiceNotMade;
-    else if (!Async.isAppReady())
+    } else if (!Async.isAppReady()) {
       reason = kFirefoxShuttingDown;
+    }
 
-    if (ignore && ignore.includes(reason))
+    if (ignore && ignore.includes(reason)) {
       return "";
+    }
 
     return reason;
   },
diff --git a/services/sync/modules/util.js b/services/sync/modules/util.js
index ec3e52cba6f1..45d23343b289 100644
--- a/services/sync/modules/util.js
+++ b/services/sync/modules/util.js
@@ -212,8 +212,9 @@ var Utils = {
    *        Property name to defer (or an array of property names)
    */
   deferGetSet: function Utils_deferGetSet(obj, defer, prop) {
-    if (Array.isArray(prop))
+    if (Array.isArray(prop)) {
       return prop.map(prop => Utils.deferGetSet(obj, defer, prop));
+    }
 
     let prot = obj.prototype;
 
@@ -234,26 +235,33 @@ var Utils = {
 
   deepEquals: function eq(a, b) {
     // If they're triple equals, then it must be equals!
-    if (a === b)
+    if (a === b) {
       return true;
+    }
 
     // If they weren't equal, they must be objects to be different
-    if (typeof a != "object" || typeof b != "object")
+    if (typeof a != "object" || typeof b != "object") {
       return false;
+    }
 
     // But null objects won't have properties to compare
-    if (a === null || b === null)
+    if (a === null || b === null) {
       return false;
+    }
 
     // Make sure all of a's keys have a matching value in b
-    for (let k in a)
-      if (!eq(a[k], b[k]))
+    for (let k in a) {
+      if (!eq(a[k], b[k])) {
         return false;
+      }
+    }
 
     // Do the same for b's keys but skip those that we already checked
-    for (let k in b)
-      if (!(k in a) && !eq(a[k], b[k]))
+    for (let k in b) {
+      if (!(k in a) && !eq(a[k], b[k])) {
         return false;
+      }
+    }
 
     return true;
   },
@@ -505,8 +513,9 @@ var Utils = {
    * arrays if possible.
    */
   arraySub: function arraySub(minuend, subtrahend) {
-    if (!minuend.length || !subtrahend.length)
+    if (!minuend.length || !subtrahend.length) {
       return minuend;
+    }
     let setSubtrahend = new Set(subtrahend);
     return minuend.filter(i => !setSubtrahend.has(i));
   },
@@ -515,10 +524,12 @@ var Utils = {
    * Build the union of two arrays. Reuse arrays if possible.
    */
   arrayUnion: function arrayUnion(foo, bar) {
-    if (!foo.length)
+    if (!foo.length) {
       return bar;
-    if (!bar.length)
+    }
+    if (!bar.length) {
       return foo;
+    }
     return foo.concat(Utils.arraySub(bar, foo));
   },
 
@@ -764,6 +775,7 @@ Svc.Prefs = new Preferences(PREFS_BRANCH);
 Svc.Obs = Observers;
 
 Svc.Obs.add("xpcom-shutdown", function() {
-  for (let name in Svc)
+  for (let name in Svc) {
     delete Svc[name];
+  }
 });
diff --git a/services/sync/tests/unit/head_http_server.js b/services/sync/tests/unit/head_http_server.js
index bffc2e0fecb0..3da0a7926a6f 100644
--- a/services/sync/tests/unit/head_http_server.js
+++ b/services/sync/tests/unit/head_http_server.js
@@ -920,8 +920,9 @@ SyncServer.prototype = {
    */
   respond: function respond(req, resp, code, status, body, headers) {
     resp.setStatusLine(req.httpVersion, code, status);
-    if (!headers)
+    if (!headers) {
       headers = this.defaultHeaders;
+    }
     for (let header in headers) {
       let value = headers[header];
       resp.setHeader(header, value);
diff --git a/services/sync/tests/unit/test_bookmark_livemarks.js b/services/sync/tests/unit/test_bookmark_livemarks.js
index e4431cf0df00..e61916e4b7fd 100644
--- a/services/sync/tests/unit/test_bookmark_livemarks.js
+++ b/services/sync/tests/unit/test_bookmark_livemarks.js
@@ -51,8 +51,9 @@ function makeLivemark(p, mintGUID) {
   // Copy here, because tests mutate the contents.
   b.cleartext = Cu.cloneInto(p, {});
 
-  if (mintGUID)
+  if (mintGUID) {
     b.id = Utils.makeGUID();
+  }
 
   return b;
 }
diff --git a/services/sync/tests/unit/test_forms_store.js b/services/sync/tests/unit/test_forms_store.js
index 5170aad538ec..8339e8fe6264 100644
--- a/services/sync/tests/unit/test_forms_store.js
+++ b/services/sync/tests/unit/test_forms_store.js
@@ -32,10 +32,11 @@ add_task(async function run_test() {
   _("Should have 1 entry now");
   let id = "";
   for (let _id in (await store.getAllIDs())) {
-    if (id == "")
+    if (id == "") {
       id = _id;
-    else
+    } else {
       do_throw("Should have only gotten one!");
+    }
   }
   Assert.ok((store.itemExists(id)));
 
@@ -67,10 +68,11 @@ add_task(async function run_test() {
   }]);
   id = "";
   for (let _id in (await store.getAllIDs())) {
-    if (id == "")
+    if (id == "") {
       id = _id;
-    else
+    } else {
       do_throw("Should have only gotten one!");
+    }
   }
 
   _("Change the id of the new entry to something else");
@@ -104,10 +106,11 @@ add_task(async function run_test() {
   await applyEnsureNoFailures([toDelete]);
   id = "";
   for (let _id in (await store.getAllIDs())) {
-    if (id == "")
+    if (id == "") {
       id = _id;
-    else
+    } else {
       do_throw("Should have only gotten one!");
+    }
   }
   Assert.ok((store.itemExists(id)));
   // mark entry as deleted
diff --git a/services/sync/tests/unit/test_service_detect_upgrade.js b/services/sync/tests/unit/test_service_detect_upgrade.js
index 980bd8b18b48..4257178b07ab 100644
--- a/services/sync/tests/unit/test_service_detect_upgrade.js
+++ b/services/sync/tests/unit/test_service_detect_upgrade.js
@@ -115,10 +115,11 @@ add_task(async function v4_upgrade() {
       _("Retrieved keyBundle: " + JSON.stringify(serverDefault));
       _("Local keyBundle:     " + JSON.stringify(localDefault));
 
-      if (should_succeed)
+      if (should_succeed) {
         Assert.equal(JSON.stringify(serverDefault), JSON.stringify(localDefault));
-      else
+      } else {
         Assert.notEqual(JSON.stringify(serverDefault), JSON.stringify(localDefault));
+      }
     }
 
     // Uses the objects set above.
diff --git a/services/sync/tests/unit/test_syncengine_sync.js b/services/sync/tests/unit/test_syncengine_sync.js
index 1b728f5e2da9..5bf87b5dc304 100644
--- a/services/sync/tests/unit/test_syncengine_sync.js
+++ b/services/sync/tests/unit/test_syncengine_sync.js
@@ -1483,8 +1483,9 @@ add_task(async function test_sync_partialUpload() {
   var noOfUploads = 0;
   collection.post = (function(orig) {
     return function() {
-      if (noOfUploads == 2)
+      if (noOfUploads == 2) {
         throw new Error("FAIL!");
+      }
       noOfUploads++;
       return orig.apply(this, arguments);
     };
@@ -1526,10 +1527,11 @@ add_task(async function test_sync_partialUpload() {
       // * records no. 23 and 42 were rejected by the server,
       // * records after the third batch and higher couldn't be uploaded because
       //   we failed hard on the 3rd upload.
-      if ((i == 23) || (i == 42) || (i >= 200))
+      if ((i == 23) || (i == 42) || (i >= 200)) {
         Assert.equal(changes[id], i);
-      else
+      } else {
         Assert.equal(false, id in changes);
+      }
     }
 
   } finally {
diff --git a/services/sync/tests/unit/test_utils_lock.js b/services/sync/tests/unit/test_utils_lock.js
index 3f220c9f199c..febec5c269cf 100644
--- a/services/sync/tests/unit/test_utils_lock.js
+++ b/services/sync/tests/unit/test_utils_lock.js
@@ -4,8 +4,9 @@ ChromeUtils.import("resource://services-sync/util.js");
 // Utility that we only use here.
 
 function do_check_begins(thing, startsWith) {
-  if (!(thing && thing.indexOf && (thing.indexOf(startsWith) == 0)))
+  if (!(thing && thing.indexOf && (thing.indexOf(startsWith) == 0))) {
     do_throw(thing + " doesn't begin with " + startsWith);
+  }
 }
 
 add_task(async function run_test() {
diff --git a/services/sync/tps/extensions/tps/bootstrap.js b/services/sync/tps/extensions/tps/bootstrap.js
index 85fcadd54978..0a46bbab85cd 100644
--- a/services/sync/tps/extensions/tps/bootstrap.js
+++ b/services/sync/tps/extensions/tps/bootstrap.js
@@ -60,14 +60,17 @@ TPSCmdLine.prototype = {
     let options = {};
 
     let uristr = cmdLine.handleFlagWithParam("tps", false);
-    if (uristr == null)
+    if (uristr == null) {
         return;
+    }
     let phase = cmdLine.handleFlagWithParam("tpsphase", false);
-    if (phase == null)
+    if (phase == null) {
         throw Error("must specify --tpsphase with --tps");
+    }
     let logfile = cmdLine.handleFlagWithParam("tpslogfile", false);
-    if (logfile == null)
+    if (logfile == null) {
         logfile = "";
+    }
 
     options.ignoreUnusedEngines = cmdLine.handleFlag("ignore-unused-engines",
                                                      false);
diff --git a/services/sync/tps/extensions/tps/resource/logger.jsm b/services/sync/tps/extensions/tps/resource/logger.jsm
index 3412fd91180d..cae3ba645a84 100644
--- a/services/sync/tps/extensions/tps/resource/logger.jsm
+++ b/services/sync/tps/extensions/tps/resource/logger.jsm
@@ -79,9 +79,10 @@ var Logger = {
   },
 
   AssertEqual(val1, val2, msg) {
-    if (val1 != val2)
+    if (val1 != val2) {
       throw new Error("ASSERTION FAILED! " + msg + "; expected " +
             JSON.stringify(val2) + ", got " + JSON.stringify(val1));
+    }
   },
 
   log(msg, withoutPrefix) {
@@ -131,10 +132,11 @@ var Logger = {
   },
 
   logInfo(msg, withoutPrefix) {
-    if (withoutPrefix)
+    if (withoutPrefix) {
       this.log(msg, true);
-    else
+    } else {
       this.log("CROSSWEAVE INFO: " + msg);
+    }
   },
 
   logPass(msg) {
diff --git a/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm b/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
index 7987a2dcf4e1..067ce44bee1d 100644
--- a/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/bookmarks.jsm
@@ -27,7 +27,6 @@ async function DumpBookmarks() {
 function extend(child, supertype) {
    child.prototype.__proto__ = supertype.prototype;
 }
-
 /**
  * PlacesItemProps object, holds properties for places items
  */
@@ -49,8 +48,9 @@ function PlacesItemProps(props) {
   this.type = null;
 
   for (var prop in props) {
-    if (prop in this)
+    if (prop in this) {
       this[prop] = props[prop];
+    }
   }
 }
 
@@ -59,12 +59,13 @@ function PlacesItemProps(props) {
  */
 function PlacesItem(props) {
   this.props = new PlacesItemProps(props);
-  if (this.props.location == null)
+  if (this.props.location == null) {
     this.props.location = "menu";
-  if ("changes" in props)
+  } if ("changes" in props) {
     this.updateProps = new PlacesItemProps(props.changes);
-  else
+  } else {
     this.updateProps = null;
+  }
 }
 
 /**
@@ -127,13 +128,14 @@ PlacesItem.prototype = {
     for (let node of children) {
       if (node.title == title) {
         let nodeType = this._typeMap.get(node.type);
-        if (type == null || type == undefined || nodeType == type)
+        if (type == null || type == undefined || nodeType == type) {
           if (uri == undefined || uri == null || node.uri.spec == uri.spec) {
             // Note that this is suspect as we return the *last* matching
             // child, which some tests rely on (ie, an early-return here causes
             // at least 1 test to fail). But that's a yak for another day.
             guid = node.guid;
           }
+        }
       }
     }
     return guid;
@@ -177,8 +179,9 @@ PlacesItem.prototype = {
    * @return the item index, or -1 if there's an error
    */
   async GetItemIndex() {
-    if (this.props.guid == null)
+    if (this.props.guid == null) {
       return -1;
+    }
     return (await PlacesUtils.bookmarks.fetch(this.props.guid)).index;
   },
 
@@ -254,8 +257,9 @@ PlacesItem.prototype = {
    */
   async GetOrCreateFolder(location) {
     let parentGuid = await this.GetFolder(location);
-    if (parentGuid == null)
+    if (parentGuid == null) {
       parentGuid = await this.CreateFolder(location);
+    }
     return parentGuid;
   },
 
@@ -273,10 +277,16 @@ PlacesItem.prototype = {
    * @return true if this item is in the correct position, otherwise false
    */
   async CheckPosition(before, after, last_item_pos) {
-    if (after)
-      if (!(await this.IsAdjacentTo(after, 1))) return false;
-    if (before)
-      if (!(await this.IsAdjacentTo(before, -1))) return false;
+    if (after) {
+      if (!(await this.IsAdjacentTo(after, 1))) {
+         return false;
+       }
+    }
+    if (before) {
+      if (!(await this.IsAdjacentTo(before, -1))) {
+         return false;
+       }
+     }
     if (last_item_pos != null && last_item_pos > -1) {
       let index = await this.GetItemIndex();
       if (index != last_item_pos + 1) {
@@ -362,8 +372,9 @@ PlacesItem.prototype = {
  */
 function Bookmark(props) {
   PlacesItem.call(this, props);
-  if (this.props.title == null)
+  if (this.props.title == null) {
     this.props.title = this.props.uri;
+  }
   this.props.type = "bookmark";
 }
 
@@ -422,8 +433,9 @@ Bookmark.prototype = {
     if (tags != null) {
       let URI = Services.io.newURI(this.props.uri);
       PlacesUtils.tagging.untagURI(URI, null);
-      if (tags.length > 0)
+      if (tags.length > 0) {
         PlacesUtils.tagging.tagURI(URI, tags);
+      }
     }
   },
 
@@ -518,8 +530,9 @@ Bookmark.prototype = {
     }
     if (!(await this.CheckPosition(this.props.before,
                                  this.props.after,
-                                 this.props.last_item_pos)))
+                                 this.props.last_item_pos))) {
       return null;
+    }
     return this.props.guid;
   },
 
diff --git a/services/sync/tps/extensions/tps/resource/modules/forms.jsm b/services/sync/tps/extensions/tps/resource/modules/forms.jsm
index 4ed985a689ed..c3a3935739a8 100644
--- a/services/sync/tps/extensions/tps/resource/modules/forms.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/forms.jsm
@@ -126,8 +126,9 @@ function FormData(props, msSinceEpoch) {
   this.usSinceEpoch = msSinceEpoch * 1000;
 
   for (var prop in props) {
-    if (prop in this)
+    if (prop in this) {
       this[prop] = props[prop];
+    }
   }
 }
 
diff --git a/services/sync/tps/extensions/tps/resource/modules/passwords.jsm b/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
index c7a37f43c1ba..f79ce3aedd12 100644
--- a/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/passwords.jsm
@@ -43,8 +43,9 @@ function PasswordProps(props) {
   this.delete = false;
 
   for (var prop in props) {
-    if (prop in this)
+    if (prop in this) {
       this[prop] = props[prop];
+    }
   }
 }
 
@@ -55,9 +56,11 @@ function Password(props) {
   this.props = new PasswordProps(props);
   if ("changes" in props) {
     this.updateProps = new PasswordProps(props);
-    for (var prop in props.changes)
-      if (prop in this.updateProps)
+    for (var prop in props.changes) {
+      if (prop in this.updateProps) {
         this.updateProps[prop] = props.changes[prop];
+      }
+    }
   } else {
     this.updateProps = null;
   }
diff --git a/services/sync/tps/extensions/tps/resource/modules/prefs.jsm b/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
index 7ea028dfcb55..8f49f0922c83 100644
--- a/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/prefs.jsm
@@ -44,8 +44,9 @@ Preference.prototype = {
     let weavepref = WEAVE_PREF_PREFIX + this.name;
     try {
       let syncPref = Services.prefs.getBoolPref(weavepref);
-      if (!syncPref)
+      if (!syncPref) {
         Services.prefs.setBoolPref(weavepref, true);
+      }
     } catch (e) {
       Logger.AssertTrue(false, "Weave doesn't sync pref " + this.name);
     }
diff --git a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
index 386b13aacc77..6ed3ed2ca3f9 100644
--- a/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
+++ b/services/sync/tps/extensions/tps/resource/modules/tabs.jsm
@@ -79,9 +79,11 @@ var BrowserTabs = {
       for (let key in tabClient.tabs) {
         let tab = tabClient.tabs[key];
         let weaveTabUrl = tab.urlHistory[0];
-        if (uri == weaveTabUrl && profile == client.name)
-          if (title == undefined || title == tab.title)
+        if (uri == weaveTabUrl && profile == client.name) {
+          if (title == undefined || title == tab.title) {
             return true;
+          }
+        }
         }
         Logger.logInfo(`Dumping tabs for ${client.clientName}...\n` + JSON.stringify(client.tabs));
       }
diff --git a/services/sync/tps/extensions/tps/resource/tps.jsm b/services/sync/tps/extensions/tps/resource/tps.jsm
index 7cf9d7c1d1d2..2d73d02577c4 100644
--- a/services/sync/tps/extensions/tps/resource/tps.jsm
+++ b/services/sync/tps/extensions/tps/resource/tps.jsm
@@ -510,22 +510,25 @@ var TPS = {
           let placesItem;
           bookmark.location = folder;
 
-          if (last_item_pos != -1)
+          if (last_item_pos != -1) {
             bookmark.last_item_pos = last_item_pos;
+          }
           let itemGuid = null;
 
-          if (action != ACTION_MODIFY && action != ACTION_DELETE)
+          if (action != ACTION_MODIFY && action != ACTION_DELETE) {
             Logger.logInfo("executing action " + action.toUpperCase() +
                            " on bookmark " + JSON.stringify(bookmark));
+          }
 
-          if ("uri" in bookmark)
+          if ("uri" in bookmark) {
             placesItem = new Bookmark(bookmark);
-          else if ("folder" in bookmark)
+          } else if ("folder" in bookmark) {
             placesItem = new BookmarkFolder(bookmark);
-          else if ("livemark" in bookmark)
+          } else if ("livemark" in bookmark) {
             placesItem = new Livemark(bookmark);
-          else if ("separator" in bookmark)
+          } else if ("separator" in bookmark) {
             placesItem = new Separator(bookmark);
+          }
 
           if (action == ACTION_ADD) {
             itemGuid = await placesItem.Create();
@@ -553,8 +556,9 @@ var TPS = {
               await item.Remove();
               break;
             case ACTION_MODIFY:
-              if (item.updateProps != null)
+              if (item.updateProps != null) {
                 await item.Update();
+              }
               break;
           }
         }
@@ -823,8 +827,9 @@ var TPS = {
       await action[0].apply(this, action.slice(1));
 
       // if we're in an async operation, don't continue on to the next action
-      if (this._operations_pending)
+      if (this._operations_pending) {
         return;
+      }
 
       this._currentAction++;
     } catch (e) {
diff --git a/testing/talos/talos/config.py b/testing/talos/talos/config.py
index 14c0c8a768d9..0a5ee634869c 100644
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -19,7 +19,7 @@ class ConfigurationError(Exception):
 
 DEFAULTS = dict(
     # args to pass to browser
-    extra_args='',
+    extra_args=[],
     buildid='testbuildid',
     init_url='getInfo.html',
     env={'NO_EM_RESTART': '1'},
@@ -332,7 +332,10 @@ def get_config(argv=None):
         except KeyError:
             raise ConfigurationError('No such suite: %r' % cli_opts.suite)
         argv += ['-a', ':'.join(suite_conf['tests'])]
-        argv += suite_conf.get('talos_options', [])
+        # talos_options in the suite config should not override command line
+        # options, so we prepend argv with talos_options so that, when parsed,
+        # the command line options will clobber the suite config options.
+        argv = suite_conf.get('talos_options', []) + argv
         # args needs to be reparsed now
     elif not cli_opts.activeTests:
         raise ConfigurationError('--activeTests or --suite required!')
diff --git a/testing/talos/talos/ffsetup.py b/testing/talos/talos/ffsetup.py
index 299630e7702d..03e4f67507e0 100644
--- a/testing/talos/talos/ffsetup.py
+++ b/testing/talos/talos/ffsetup.py
@@ -174,7 +174,10 @@ class FFSetup(object):
                 'appname',
                 'firefox'),
             mozrunner.Runner)
-        args = [self.browser_config["extra_args"], self.browser_config["init_url"]]
+
+        args = list(self.browser_config["extra_args"])
+        args.append(self.browser_config["init_url"])
+
         runner = runner_cls(profile=self.profile_dir,
                             binary=self.browser_config["browser_path"],
                             cmdargs=args,
diff --git a/testing/talos/talos/run_tests.py b/testing/talos/talos/run_tests.py
index c0ce9901b7e8..b327df510a8f 100755
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -122,11 +122,13 @@ def run_tests(config, browser_config):
         if not test.get('profile', False):
             test['profile'] = config.get('profile')
 
+    browser_config['extra_args'] = []
+
     # pass --no-remote to firefox launch, if --develop is specified
     # we do that to allow locally the user to have another running firefox
     # instance
     if browser_config['develop']:
-        browser_config['extra_args'] = '--no-remote'
+        browser_config['extra_args'].append('--no-remote')
 
     # Pass subtests filter argument via a preference
     if browser_config['subtests']:
diff --git a/testing/talos/talos/tests/tabswitch/api.js b/testing/talos/talos/tests/tabswitch/api.js
index 9be17e4b8618..07bef6078792 100644
--- a/testing/talos/talos/tests/tabswitch/api.js
+++ b/testing/talos/talos/tests/tabswitch/api.js
@@ -238,7 +238,14 @@ async function test(window) {
   }
 
   for (let tab of tabs) {
+    // Moving a tab causes expensive style/layout computations on the tab bar
+    // that are delayed using requestAnimationFrame, so wait for an animation
+    // frame callback + one tick to ensure we aren't measuring the time it
+    // takes to move a tab.
     gBrowser.moveTabTo(tab, 1);
+    await new Promise(resolve => win.requestAnimationFrame(resolve));
+    await new Promise(resolve => Services.tm.dispatchToMainThread(resolve));
+
     await forceGC(win, tab.linkedBrowser);
     TalosParentProfiler.resume("start: " + tab.linkedBrowser.currentURI.spec);
     let time = await switchToTab(tab);
diff --git a/testing/talos/talos/xtalos/etlparser.py b/testing/talos/talos/xtalos/etlparser.py
index 482769ec6752..46368fca6e3d 100644
--- a/testing/talos/talos/xtalos/etlparser.py
+++ b/testing/talos/talos/xtalos/etlparser.py
@@ -25,6 +25,7 @@ IMAGEFUNC_COL = "Image!Function"
 EVENTGUID_COL = "EventGuid"
 ACTIVITY_ID_COL = "etw:ActivityId"
 NUMBYTES_COL = "NumBytes"
+BYTESSENT_COL = "BytesSent"
 
 CEVT_WINDOWS_RESTORED = "{917b96b1-ecad-4dab-a760-8d49027748ae}"
 CEVT_XPCOM_SHUTDOWN = "{26d1e091-0ae7-4f49-a554-4214445c505c}"
@@ -94,10 +95,16 @@ def filterOutHeader(data):
             yield row
 
 
-def getIndex(eventType, colName):
-    if colName not in gHeaders[eventType]:
-        return None
-    return gHeaders[eventType].index(colName)
+def getIndex(eventName, *colNames):
+    eventHeader = gHeaders[eventName]
+
+    for colName in colNames:
+        try:
+            return eventHeader.index(colName)
+        except ValueError:
+            pass
+
+    return None
 
 
 def readFile(filename):
@@ -227,7 +234,9 @@ def trackThreadNetIO(row, io, stage):
         if netEvt in net_events:
             opType = net_events[netEvt]
             th, stg = gThreads[origThread], stages[stage]
-            lenIdx = getIndex(event, NUMBYTES_COL)
+            # On newer versions of Windows, some net I/O events have switched to
+            # using BYTESSENT_COL, so we try both
+            lenIdx = getIndex(event, NUMBYTES_COL, BYTESSENT_COL)
             bytes = int(row[lenIdx])
             io[(th, stg, "net_%s_bytes" % opType)] = \
                 io.get((th, stg, "net_%s_bytes" % opType), 0) + bytes
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 67976490a5ff..75e155fcaa32 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -14053,6 +14053,30 @@
      {}
     ]
    ],
+   "speech-api/SpeechRecognition-abort-manual.https.html": [
+    [
+     "/speech-api/SpeechRecognition-abort-manual.https.html",
+     {}
+    ]
+   ],
+   "speech-api/SpeechRecognition-onerror-manual.https.html": [
+    [
+     "/speech-api/SpeechRecognition-onerror-manual.https.html",
+     {}
+    ]
+   ],
+   "speech-api/SpeechRecognition-onresult-manual.https.html": [
+    [
+     "/speech-api/SpeechRecognition-onresult-manual.https.html",
+     {}
+    ]
+   ],
+   "speech-api/SpeechRecognition-stop-manual.https.html": [
+    [
+     "/speech-api/SpeechRecognition-stop-manual.https.html",
+     {}
+    ]
+   ],
    "storage/persist-permission-manual.https.html": [
     [
      "/storage/persist-permission-manual.https.html",
@@ -17203,9 +17227,15 @@
      {}
     ]
    ],
-   "uievents/auxclick/auxclick_event-manual.html": [
+   "uievents/click/auxclick_event-manual.html": [
     [
-     "/uievents/auxclick/auxclick_event-manual.html",
+     "/uievents/click/auxclick_event-manual.html",
+     {}
+    ]
+   ],
+   "uievents/click/click_event_target-manual.html": [
+    [
+     "/uievents/click/click_event_target-manual.html",
      {}
     ]
    ],
@@ -109141,6 +109171,30 @@
      {}
     ]
    ],
+   "css/css-contain/contain-layout-016.html": [
+    [
+     "/css/css-contain/contain-layout-016.html",
+     [
+      [
+       "/css/reference/pass_if_pass_below.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-017.html": [
+    [
+     "/css/css-contain/contain-layout-017.html",
+     [
+      [
+       "/css/reference/nothing.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-layout-breaks-001.html": [
     [
      "/css/css-contain/contain-layout-breaks-001.html",
@@ -109165,6 +109219,150 @@
      {}
     ]
    ],
+   "css/css-contain/contain-layout-cell-001.html": [
+    [
+     "/css/css-contain/contain-layout-cell-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-cell-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-cell-002.html": [
+    [
+     "/css/css-contain/contain-layout-cell-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-cell-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ifc-022.html": [
+    [
+     "/css/css-contain/contain-layout-ifc-022.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ifc-022-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-013.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-013.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-014.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-014.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-015.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-015.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-016.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-016.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-017.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-017.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-018.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-018.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-019.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-019.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-ink-overflow-020.html": [
+    [
+     "/css/css-contain/contain-layout-ink-overflow-020.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-size-003.html": [
+    [
+     "/css/css-contain/contain-layout-size-003.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-size-003-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-paint-001.html": [
     [
      "/css/css-contain/contain-paint-001.html",
@@ -109189,18 +109387,6 @@
      {}
     ]
    ],
-   "css/css-contain/contain-paint-003.html": [
-    [
-     "/css/css-contain/contain-paint-003.html",
-     [
-      [
-       "/css/reference/pass_if_pass_below.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-contain/contain-paint-004.html": [
     [
      "/css/css-contain/contain-paint-004.html",
@@ -109393,6 +109579,258 @@
      {}
     ]
    ],
+   "css/css-contain/contain-paint-020.html": [
+    [
+     "/css/css-contain/contain-paint-020.html",
+     [
+      [
+       "/css/reference/pass_if_pass_below.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-021.html": [
+    [
+     "/css/css-contain/contain-paint-021.html",
+     [
+      [
+       "/css/reference/nothing.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-022.html": [
+    [
+     "/css/css-contain/contain-paint-022.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-022-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-023.html": [
+    [
+     "/css/css-contain/contain-paint-023.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-024.html": [
+    [
+     "/css/css-contain/contain-paint-024.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-047.html": [
+    [
+     "/css/css-contain/contain-paint-047.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-047-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-048.html": [
+    [
+     "/css/css-contain/contain-paint-048.html",
+     [
+      [
+       "/css/css-contain/reference/ref-if-there-is-no-red.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-cell-001.html": [
+    [
+     "/css/css-contain/contain-paint-cell-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-047-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-cell-002.html": [
+    [
+     "/css/css-contain/contain-paint-cell-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-047-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-011.html": [
+    [
+     "/css/css-contain/contain-paint-clip-011.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-012.html": [
+    [
+     "/css/css-contain/contain-paint-clip-012.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-013.html": [
+    [
+     "/css/css-contain/contain-paint-clip-013.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-014.html": [
+    [
+     "/css/css-contain/contain-paint-clip-014.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-015.html": [
+    [
+     "/css/css-contain/contain-paint-clip-015.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-clip-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-016.html": [
+    [
+     "/css/css-contain/contain-paint-clip-016.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-clip-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-017.html": [
+    [
+     "/css/css-contain/contain-paint-clip-017.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-clip-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-clip-018.html": [
+    [
+     "/css/css-contain/contain-paint-clip-018.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-clip-015-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-ifc-011.html": [
+    [
+     "/css/css-contain/contain-paint-ifc-011.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-ifc-011-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-size-001.html": [
+    [
+     "/css/css-contain/contain-paint-size-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-size-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-size-002.html": [
+    [
+     "/css/css-contain/contain-paint-size-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-size-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-size-003.html": [
+    [
+     "/css/css-contain/contain-paint-size-003.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-size-003-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-size-001.html": [
     [
      "/css/css-contain/contain-size-001.html",
@@ -109549,6 +109987,138 @@
      {}
     ]
    ],
+   "css/css-contain/contain-size-021.html": [
+    [
+     "/css/css-contain/contain-size-021.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-021-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-023.html": [
+    [
+     "/css/css-contain/contain-size-023.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-021-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-025.html": [
+    [
+     "/css/css-contain/contain-size-025.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-021-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-027.html": [
+    [
+     "/css/css-contain/contain-size-027.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-021-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-041.html": [
+    [
+     "/css/css-contain/contain-size-041.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-021-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-042.html": [
+    [
+     "/css/css-contain/contain-size-042.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-022-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-051.html": [
+    [
+     "/css/css-contain/contain-size-051.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-051-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-052.html": [
+    [
+     "/css/css-contain/contain-size-052.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-051-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-056.html": [
+    [
+     "/css/css-contain/contain-size-056.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-056-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-061.html": [
+    [
+     "/css/css-contain/contain-size-061.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-061-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-size-062.html": [
+    [
+     "/css/css-contain/contain-size-062.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-062-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-size-borders.html": [
     [
      "/css/css-contain/contain-size-borders.html",
@@ -109609,6 +110179,54 @@
      {}
     ]
    ],
+   "css/css-contain/contain-size-monolithic-001.html": [
+    [
+     "/css/css-contain/contain-size-monolithic-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-size-monolithic-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-strict-001.html": [
+    [
+     "/css/css-contain/contain-strict-001.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-size-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-strict-002.html": [
+    [
+     "/css/css-contain/contain-strict-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-paint-size-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-strict-003.html": [
+    [
+     "/css/css-contain/contain-strict-003.html",
+     [
+      [
+       "/css/css-contain/reference/contain-layout-size-003-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-style-breaks-001.html": [
     [
      "/css/css-contain/contain-style-breaks-001.html",
@@ -109669,12 +110287,48 @@
      {}
     ]
    ],
-   "css/css-contain/contain-style-counters.html": [
+   "css/css-contain/contain-style-counters-001.html": [
     [
-     "/css/css-contain/contain-style-counters.html",
+     "/css/css-contain/contain-style-counters-001.html",
      [
       [
-       "/css/css-contain/contain-style-counters-ref.html",
+       "/css/css-contain/reference/contain-style-counters-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-style-counters-002.html": [
+    [
+     "/css/css-contain/contain-style-counters-002.html",
+     [
+      [
+       "/css/css-contain/reference/contain-style-counters-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-style-counters-003.html": [
+    [
+     "/css/css-contain/contain-style-counters-003.html",
+     [
+      [
+       "/css/css-contain/reference/contain-style-counters-003-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-style-counters-004.html": [
+    [
+     "/css/css-contain/contain-style-counters-004.html",
+     [
+      [
+       "/css/css-contain/reference/contain-style-counters-003-ref.html",
        "=="
       ]
      ],
@@ -242288,6 +242942,41 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-layout-cell-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-ifc-022-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-ink-overflow-013-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-ink-overflow-015-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-ink-overflow-019-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-ink-overflow-020-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-layout-size-003-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/contain-paint-001-ref.html": [
     [
      {}
@@ -242308,6 +242997,36 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-paint-022-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-paint-047-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-paint-clip-015-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-paint-ifc-011-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-paint-size-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-paint-size-003-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/contain-size-004-ref.html": [
     [
      {}
@@ -242318,6 +243037,36 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-size-021-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-size-022-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-size-051-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-size-056-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-size-061-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-size-062-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/contain-size-breaks-001-ref.html": [
     [
      {}
@@ -242338,6 +243087,11 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-size-monolithic-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/contain-style-breaks-001-ref.html": [
     [
      {}
@@ -242348,6 +243102,16 @@
      {}
     ]
    ],
+   "css/css-contain/reference/contain-style-counters-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/reference/contain-style-counters-003-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-contain/reference/counter-scoping-001-ref.html": [
     [
      {}
@@ -242373,6 +243137,51 @@
      {}
     ]
    ],
+   "css/css-contain/reference/ref-if-there-is-no-red.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/blue-100x100.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/blue50wBy23h.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/blue50wBy46h.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/pattern-gg-gr-100x100.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/swatch-blue.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/swatch-orange.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/swatch-red.png": [
+    [
+     {}
+    ]
+   ],
+   "css/css-contain/support/swatch-yellow.png": [
+    [
+     {}
+    ]
+   ],
    "css/css-content/META.yml": [
     [
      {}
@@ -288208,6 +289017,11 @@
      {}
     ]
    ],
+   "interfaces/html-media-capture.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/html.idl": [
     [
      {}
@@ -288223,6 +289037,11 @@
      {}
     ]
    ],
+   "interfaces/intersection-observer.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/keyboard-lock.idl": [
     [
      {}
@@ -288288,6 +289107,11 @@
      {}
     ]
    ],
+   "interfaces/notifications.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/orientation-event.idl": [
     [
      {}
@@ -288433,11 +289257,6 @@
      {}
     ]
    ],
-   "interfaces/touchevents.idl": [
-    [
-     {}
-    ]
-   ],
    "interfaces/uievents.idl": [
     [
      {}
@@ -288513,7 +289332,7 @@
      {}
     ]
    ],
-   "interfaces/webrtc-pc.idl": [
+   "interfaces/webmidi.idl": [
     [
      {}
     ]
@@ -288523,6 +289342,11 @@
      {}
     ]
    ],
+   "interfaces/webrtc.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/webusb.idl": [
     [
      {}
@@ -290233,62 +291057,7 @@
      {}
     ]
    ],
-   "old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/collapseToEnd.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/collapseToStart.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/deleteFromDocument.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/getRangeAt.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/removeAllRanges.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/removeRange.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/select.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/selectAllChildren.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/selectionStartEnd.htm": [
-    [
-     {}
-    ]
-   ],
-   "old-tests/submission/Microsoft/selection/setSelectionRange.htm": [
+   "old-tests/submission/Microsoft/selection/common.js": [
     [
      {}
     ]
@@ -298808,6 +299577,11 @@
      {}
     ]
    ],
+   "speech-api/webspeech.js": [
+    [
+     {}
+    ]
+   ],
    "storage/META.yml": [
     [
      {}
@@ -307043,16 +307817,6 @@
      {}
     ]
    ],
-   "wasm/wasm_idb_worker.js": [
-    [
-     {}
-    ]
-   ],
-   "wasm/wasm_indexeddb_test.js": [
-    [
-     {}
-    ]
-   ],
    "wasm/wasm_serialization_tests.js": [
     [
      {}
@@ -307943,6 +308707,11 @@
      {}
     ]
    ],
+   "webmidi/META.yml": [
+    [
+     {}
+    ]
+   ],
    "webrtc-stats/META.yml": [
     [
      {}
@@ -318943,14 +319712,6 @@
      {}
     ]
    ],
-   "IndexedDB/wasm-module-value.html": [
-    [
-     "/IndexedDB/wasm-module-value.html",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
    "IndexedDB/writer-starvation.htm": [
     [
      "/IndexedDB/writer-starvation.htm",
@@ -328853,9 +329614,9 @@
      {}
     ]
    ],
-   "css/css-pseudo/interfaces.html": [
+   "css/css-pseudo/idlharness.html": [
     [
-     "/css/css-pseudo/interfaces.html",
+     "/css/css-pseudo/idlharness.html",
      {}
     ]
    ],
@@ -349345,9 +350106,21 @@
      {}
     ]
    ],
-   "hr-time/idlharness.html": [
+   "hr-time/idlharness.any.js": [
     [
-     "/hr-time/idlharness.html",
+     "/hr-time/idlharness.any.html",
+     {}
+    ],
+    [
+     "/hr-time/idlharness.any.sharedworker.html",
+     {}
+    ],
+    [
+     "/hr-time/idlharness.any.worker.html",
+     {}
+    ],
+    [
+     "/hr-time/idlharness.https.any.serviceworker.html",
      {}
     ]
    ],
@@ -349397,9 +350170,9 @@
      {}
     ]
    ],
-   "html-media-capture/idlharness.html": [
+   "html-media-capture/idlharness.window.js": [
     [
-     "/html-media-capture/idlharness.html",
+     "/html-media-capture/idlharness.window.html",
      {}
     ]
    ],
@@ -351026,19 +351799,27 @@
    "html/browsers/the-window-object/window-open-noopener.html": [
     [
      "/html/browsers/the-window-object/window-open-noopener.html?_parent",
-     {}
+     {
+      "timeout": "long"
+     }
     ],
     [
      "/html/browsers/the-window-object/window-open-noopener.html?_self",
-     {}
+     {
+      "timeout": "long"
+     }
     ],
     [
      "/html/browsers/the-window-object/window-open-noopener.html?_top",
-     {}
+     {
+      "timeout": "long"
+     }
     ],
     [
      "/html/browsers/the-window-object/window-open-noopener.html?indexed",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "html/browsers/the-window-object/window-properties.https.html": [
@@ -362477,6 +363258,12 @@
      {}
     ]
    ],
+   "intersection-observer/idlharness.window.js": [
+    [
+     "/intersection-observer/idlharness.window.html",
+     {}
+    ]
+   ],
    "intersection-observer/iframe-no-root.html": [
     [
      "/intersection-observer/iframe-no-root.html",
@@ -365479,15 +366266,27 @@
      {}
     ]
    ],
-   "notifications/instance.html": [
+   "notifications/idlharness.any.js": [
     [
-     "/notifications/instance.html",
+     "/notifications/idlharness.any.html",
+     {}
+    ],
+    [
+     "/notifications/idlharness.any.sharedworker.html",
+     {}
+    ],
+    [
+     "/notifications/idlharness.any.worker.html",
+     {}
+    ],
+    [
+     "/notifications/idlharness.https.any.serviceworker.html",
      {}
     ]
    ],
-   "notifications/interfaces.html": [
+   "notifications/instance.html": [
     [
-     "/notifications/interfaces.html",
+     "/notifications/instance.html",
      {}
     ]
    ],
@@ -374839,6 +375638,78 @@
      {}
     ]
    ],
+   "old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/collapseToEnd.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/collapseToEnd.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/collapseToStart.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/collapseToStart.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/deleteFromDocument.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/deleteFromDocument.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/getRangeAt.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/getRangeAt.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/removeAllRanges.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/removeAllRanges.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/removeRange.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/removeRange.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/select.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/select.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/selectAllChildren.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/selectAllChildren.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/selectionStartEnd.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/selectionStartEnd.htm",
+     {}
+    ]
+   ],
+   "old-tests/submission/Microsoft/selection/setSelectionRange.htm": [
+    [
+     "/old-tests/submission/Microsoft/selection/setSelectionRange.htm",
+     {}
+    ]
+   ],
    "orientation-event/devicemotionevent-init.html": [
     [
      "/orientation-event/devicemotionevent-init.html",
@@ -375121,17 +375992,15 @@
      {}
     ],
     [
-     "/payment-handler/idlharness.https.any.worker.html",
-     {}
-    ]
-   ],
-   "payment-handler/interfaces.https.any.js": [
-    [
-     "/payment-handler/interfaces.https.any.html",
+     "/payment-handler/idlharness.https.any.serviceworker.html",
      {}
     ],
     [
-     "/payment-handler/interfaces.https.any.worker.html",
+     "/payment-handler/idlharness.https.any.sharedworker.html",
+     {}
+    ],
+    [
+     "/payment-handler/idlharness.https.any.worker.html",
      {}
     ]
    ],
@@ -375939,22 +376808,22 @@
      {}
     ]
    ],
-   "push-api/idlharness.https.any.js": [
+   "push-api/idlharness.any.js": [
     [
-     "/push-api/idlharness.https.any.html",
+     "/push-api/idlharness.any.html",
+     {}
+    ],
+    [
+     "/push-api/idlharness.any.sharedworker.html",
+     {}
+    ],
+    [
+     "/push-api/idlharness.any.worker.html",
      {}
     ],
     [
      "/push-api/idlharness.https.any.serviceworker.html",
      {}
-    ],
-    [
-     "/push-api/idlharness.https.any.sharedworker.html",
-     {}
-    ],
-    [
-     "/push-api/idlharness.https.any.worker.html",
-     {}
     ]
    ],
    "quirks/blocks-ignore-line-height.html": [
@@ -387533,6 +388402,12 @@
      {}
     ]
    ],
+   "speech-api/SpeechRecognition-basics.https.html": [
+    [
+     "/speech-api/SpeechRecognition-basics.https.html",
+     {}
+    ]
+   ],
    "speech-api/SpeechSynthesis-speak-ownership.html": [
     [
      "/speech-api/SpeechSynthesis-speak-ownership.html",
@@ -387545,6 +388420,12 @@
      {}
     ]
    ],
+   "speech-api/SpeechSynthesisUtterance-basics.https.html": [
+    [
+     "/speech-api/SpeechSynthesisUtterance-basics.https.html",
+     {}
+    ]
+   ],
    "speech-api/historical.html": [
     [
      "/speech-api/historical.html",
@@ -390001,81 +390882,139 @@
      {}
     ]
    ],
+   "url/url-searchparams.any.js": [
+    [
+     "/url/url-searchparams.any.html",
+     {}
+    ],
+    [
+     "/url/url-searchparams.any.worker.html",
+     {}
+    ]
+   ],
    "url/url-setters.html": [
     [
      "/url/url-setters.html",
      {}
     ]
    ],
-   "url/url-tojson.html": [
+   "url/url-tojson.any.js": [
     [
-     "/url/url-tojson.html",
+     "/url/url-tojson.any.html",
+     {}
+    ],
+    [
+     "/url/url-tojson.any.worker.html",
      {}
     ]
    ],
-   "url/urlencoded-parser.html": [
+   "url/urlencoded-parser.any.js": [
     [
-     "/url/urlencoded-parser.html",
+     "/url/urlencoded-parser.any.html",
+     {}
+    ],
+    [
+     "/url/urlencoded-parser.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-append.html": [
+   "url/urlsearchparams-append.any.js": [
     [
-     "/url/urlsearchparams-append.html",
+     "/url/urlsearchparams-append.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-append.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-constructor.html": [
+   "url/urlsearchparams-constructor.any.js": [
     [
-     "/url/urlsearchparams-constructor.html",
+     "/url/urlsearchparams-constructor.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-constructor.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-delete.html": [
+   "url/urlsearchparams-delete.any.js": [
     [
-     "/url/urlsearchparams-delete.html",
+     "/url/urlsearchparams-delete.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-delete.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-foreach.html": [
+   "url/urlsearchparams-foreach.any.js": [
     [
-     "/url/urlsearchparams-foreach.html",
+     "/url/urlsearchparams-foreach.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-foreach.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-get.html": [
+   "url/urlsearchparams-get.any.js": [
     [
-     "/url/urlsearchparams-get.html",
+     "/url/urlsearchparams-get.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-get.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-getall.html": [
+   "url/urlsearchparams-getall.any.js": [
     [
-     "/url/urlsearchparams-getall.html",
+     "/url/urlsearchparams-getall.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-getall.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-has.html": [
+   "url/urlsearchparams-has.any.js": [
     [
-     "/url/urlsearchparams-has.html",
+     "/url/urlsearchparams-has.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-has.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-set.html": [
+   "url/urlsearchparams-set.any.js": [
     [
-     "/url/urlsearchparams-set.html",
+     "/url/urlsearchparams-set.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-set.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-sort.html": [
+   "url/urlsearchparams-sort.any.js": [
     [
-     "/url/urlsearchparams-sort.html",
+     "/url/urlsearchparams-sort.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-sort.any.worker.html",
      {}
     ]
    ],
-   "url/urlsearchparams-stringifier.html": [
+   "url/urlsearchparams-stringifier.any.js": [
     [
-     "/url/urlsearchparams-stringifier.html",
+     "/url/urlsearchparams-stringifier.any.html",
+     {}
+    ],
+    [
+     "/url/urlsearchparams-stringifier.any.worker.html",
      {}
     ]
    ],
@@ -390643,12 +391582,6 @@
      {}
     ]
    ],
-   "wasm/wasm_indexeddb_test.https.html": [
-    [
-     "/wasm/wasm_indexeddb_test.https.html",
-     {}
-    ]
-   ],
    "wasm/wasm_local_iframe_test.html": [
     [
      "/wasm/wasm_local_iframe_test.html",
@@ -393067,6 +394000,12 @@
      {}
     ]
    ],
+   "webmidi/idlharness.window.js": [
+    [
+     "/webmidi/idlharness.window.html",
+     {}
+    ]
+   ],
    "webrtc-stats/idlharness.window.js": [
     [
      "/webrtc-stats/idlharness.window.html",
@@ -393549,9 +394488,9 @@
      {}
     ]
    ],
-   "webrtc/interfaces.https.html": [
+   "webrtc/idlharness.https.window.js": [
     [
-     "/webrtc/interfaces.https.html",
+     "/webrtc/idlharness.https.window.html",
      {}
     ]
    ],
@@ -396533,9 +397472,9 @@
      {}
     ]
    ],
-   "webxr/interfaces.https.html": [
+   "webxr/idlharness.https.window.js": [
     [
-     "/webxr/interfaces.https.html",
+     "/webxr/idlharness.https.window.html",
      {}
     ]
    ],
@@ -425190,10 +426129,6 @@
    "f49a1ccbc59ae14eb5ba74e37dccf8d6e56aa8b5",
    "testharness"
   ],
-  "IndexedDB/wasm-module-value.html": [
-   "9fcfd780b8e59ff49e54406fbc4106e683c76025",
-   "testharness"
-  ],
   "IndexedDB/writer-starvation.htm": [
    "412308387fcea53499ca7c57d0c38cfeebc1007e",
    "testharness"
@@ -448079,7 +449014,7 @@
    "testharness"
   ],
   "content-security-policy/META.yml": [
-   "99c5a782cffcaa8cfe5a66aed5ad392701181e64",
+   "ee8f1ea7e07b94711ddc65e43a6c32dbc5983612",
    "support"
   ],
   "content-security-policy/README.css": [
@@ -448355,7 +449290,7 @@
    "support"
   ],
   "content-security-policy/embedded-enforcement/support/testharness-helper.sub.js": [
-   "6d2e64f8f7e9026719e84c8fd1c09dd27c8d03b5",
+   "c1b2e673eced75db5bb3b47abcfef56bff62e465",
    "support"
   ],
   "content-security-policy/font-src/font-match-allowed.sub.html": [
@@ -450627,7 +451562,7 @@
    "testharness"
   ],
   "cookie-store/httponly_cookies.https.window.js": [
-   "01239aec58fbd81967a0e7ac47723423fd42b0a8",
+   "8a10e358ef6de72d5476ae8dc8a571482881d7ef",
    "testharness"
   ],
   "cookie-store/idlharness.tentative.https.html": [
@@ -516443,7 +517378,7 @@
    "support"
   ],
   "css/css-contain/contain-layout-001.html": [
-   "c8895b9a6670852accf54ae6ac4f8581d4c031d5",
+   "85b959da2b9a151c13be3dc83485646341752915",
    "reftest"
   ],
   "css/css-contain/contain-layout-002.html": [
@@ -516502,26 +517437,78 @@
    "9c5f6757b0e607b2269a7aac163e6df678c24935",
    "reftest"
   ],
+  "css/css-contain/contain-layout-016.html": [
+   "e8fdede2774447062fee4200ae698ba5d2706635",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-017.html": [
+   "c8118ad974844cd807e0dfbcc07a9a06469a308c",
+   "reftest"
+  ],
   "css/css-contain/contain-layout-breaks-001.html": [
    "a85cf2c6c8e00f1d21fa5a63da81eff8148f3d71",
    "reftest"
   ],
   "css/css-contain/contain-layout-breaks-002.html": [
-   "4398387f26ca16a7527167ec71e802aa48228da7",
+   "fadb3c41c5363742eb88bdf803eac7cdbf5e7a8f",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-cell-001.html": [
+   "d0a2f2844b96516d7f41f7843f4d860e9b7e7598",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-cell-002.html": [
+   "5d4eff0c2bf5450579236f3899c205b35f6ab206",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ifc-022.html": [
+   "3e4f3dafbf213c18a09cfd2a7512dd485c13f839",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-013.html": [
+   "d1431737352ef766f333e160888334b9efa0f66b",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-014.html": [
+   "ad1c94e1610584c3f83f43354e830cce137739c9",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-015.html": [
+   "0eaaf9ab436ee4cf18c451ca429683cbbe09d76b",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-016.html": [
+   "e4ade9d7a46ff8d4c3944792024b34c3634e0d29",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-017.html": [
+   "ebdcd04fcdbcd1ae78eb065c3dca5d3b76d339b6",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-018.html": [
+   "bf00128bbb1728d46e29c4a756f8663def956cac",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-019.html": [
+   "d4909aa70f597b31ca0c13a7c63ce3a810d44ccc",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-ink-overflow-020.html": [
+   "2ed9062eb462e5abe26b203171fbe38b59fb87cf",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-size-003.html": [
+   "1abbe267bd9f45f9ff2d7468bd03fae34227d375",
    "reftest"
   ],
   "css/css-contain/contain-paint-001.html": [
-   "37609e616dec256155b3c569d4474058631989bf",
+   "ca2eb6e6f98fd8aec3fbd3b252658e7e966f03a2",
    "reftest"
   ],
   "css/css-contain/contain-paint-002.html": [
    "6f495f56173078d323fd2f6ba47bc92ea32e1aab",
    "reftest"
   ],
-  "css/css-contain/contain-paint-003.html": [
-   "ae9238d35bff745220ccca8244fe28afde00fee9",
-   "reftest"
-  ],
   "css/css-contain/contain-paint-004.html": [
    "d37676dda9c4910d9e22b9553ea93616ca617d1a",
    "reftest"
@@ -516551,11 +517538,11 @@
    "reftest"
   ],
   "css/css-contain/contain-paint-011.html": [
-   "fdb2d2d2c8c9898e7469d69b007e910ff69f7e8c",
+   "d18a667025f43803a3285431fc07315d61a37265",
    "reftest"
   ],
   "css/css-contain/contain-paint-012.html": [
-   "f3c635191467986a5d66c1cc1c33ac65d64924f3",
+   "471726a99c659ab0d6a7870ee2519994051b425f",
    "reftest"
   ],
   "css/css-contain/contain-paint-013.html": [
@@ -516586,6 +517573,90 @@
    "90c5a8f0540964ae829d586854e2695d1722a1da",
    "reftest"
   ],
+  "css/css-contain/contain-paint-020.html": [
+   "44a62172ed64b5e027639f39b8cf73522ddfa680",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-021.html": [
+   "a8ea1c8bfc2d9686d5fa1659a77e187ea8bbc28e",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-022.html": [
+   "6f7fecda8e836f494bb1830afc21eb7cc5145ed4",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-023.html": [
+   "368f75f024973cc659af2ede69e42c00ffaaa51f",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-024.html": [
+   "79ef8a7cc0841ab96b1650cb2e78d210a9432180",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-047.html": [
+   "e4a0b28457c752232f4314175ffdf1840f7e336a",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-048.html": [
+   "e48fcb64a4acbb8683730c58577ba530487a5ad9",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-cell-001.html": [
+   "964f33a21969d954ffb44fb85b7eda70ceefc554",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-cell-002.html": [
+   "e486aa2c576a4412ba0ac553dc074f6151ec217b",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-011.html": [
+   "643133a4f42f09dd587639b3b57e0bc8682380a8",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-012.html": [
+   "7040d6452aa71708089f86d1533229236a93ed9c",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-013.html": [
+   "e6311303f4173fbcd4f98ce218198dbe5bc72dae",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-014.html": [
+   "8fe1071764b4e321e4ad0acabdb6e94f255af039",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-015.html": [
+   "b78f0d8b40b640d7b21a80f55de908479f32d694",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-016.html": [
+   "8203eea8691d6d175f1a9c60fa7d88bbfa786aa9",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-017.html": [
+   "d8213a5a33cfc06942a42397513f207a7bbfc620",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-clip-018.html": [
+   "17bcccdeff538ea869a51d703acb80e9acc4b0ca",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-ifc-011.html": [
+   "b8a03936cbcc3ddcc88dc1237fab0af56f4bd72b",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-size-001.html": [
+   "930429b7ecc5af860fa6782cff30a8803393d3cd",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-size-002.html": [
+   "5af0d54cec3af30d3377d43e0738f518c9e42d40",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-size-003.html": [
+   "51459a53feb6b626b7e9dc07061024eca722209b",
+   "reftest"
+  ],
   "css/css-contain/contain-size-001.html": [
    "85bc4f49de1d1d8c58a3677286acfa9a5242512e",
    "reftest"
@@ -516638,12 +517709,56 @@
    "4d1cbc403bd48b21f8d657d4adc7a50bffbb618c",
    "reftest"
   ],
+  "css/css-contain/contain-size-021.html": [
+   "14bd8119a0e4bd0bc98ffacc87628616d0891a4a",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-023.html": [
+   "ce795c6402dab0f7e8c5482eb8a670d0afdd7456",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-025.html": [
+   "700a681e8c05aba1dece887925b3a65fcc744183",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-027.html": [
+   "266402cb31406fc3f44831e5536a074e6afa5918",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-041.html": [
+   "44069a0c69b43a7588a89bf127ac9de436710a10",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-042.html": [
+   "e1d6b3ddfcb1da6b86955d04eacbfc68522b0273",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-051.html": [
+   "d529df9ff7e7ed6d56819a035e8b40327a5d8617",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-052.html": [
+   "d32d154e7528e723aeec2737874ee8ea47d34afb",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-056.html": [
+   "fa0f98b6b02cfc37e3d308bb012a2a3a8ba69c94",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-061.html": [
+   "2af24fc24be02525b2082cd87e4f07d8be995a5b",
+   "reftest"
+  ],
+  "css/css-contain/contain-size-062.html": [
+   "60cb194242894b540aaa50c6990e7cbcb491e27e",
+   "reftest"
+  ],
   "css/css-contain/contain-size-borders.html": [
    "16b5b06295fcc0b44944b1b92afa3ee42271b68f",
    "reftest"
   ],
   "css/css-contain/contain-size-breaks-001.html": [
-   "d8538f65d876438ae0851d296f5a086367905e51",
+   "453d56073ca12f8be339dbd5511225c5a29f9f6f",
    "reftest"
   ],
   "css/css-contain/contain-size-button-001.html": [
@@ -516658,6 +517773,22 @@
    "f67f0e118e00b3426986b39226310c59b14a3755",
    "reftest"
   ],
+  "css/css-contain/contain-size-monolithic-001.html": [
+   "30f19b6cbbd6f6737d5175b1946c17805e0568d6",
+   "reftest"
+  ],
+  "css/css-contain/contain-strict-001.html": [
+   "142730c5cd3a0048027e5bf41cca397e3facad60",
+   "reftest"
+  ],
+  "css/css-contain/contain-strict-002.html": [
+   "369275e1d91a4638975f1241ca624a7dc88754d9",
+   "reftest"
+  ],
+  "css/css-contain/contain-strict-003.html": [
+   "792710cd87d8ee0813838dd39847f9dd2db2e2a9",
+   "reftest"
+  ],
   "css/css-contain/contain-style-breaks-001.html": [
    "9e5c27a075eddb80dfd9305abcba50aeefec5088",
    "reftest"
@@ -516678,14 +517809,26 @@
    "bfcd1fbd91695530992ba7614e43cebf606d8be5",
    "reftest"
   ],
+  "css/css-contain/contain-style-counters-001.html": [
+   "30a29d7c25a1fe30df7bcc52691cb2fc2070d20e",
+   "reftest"
+  ],
+  "css/css-contain/contain-style-counters-002.html": [
+   "eeaac6ace6940b691af0aadac1be53258b057f3c",
+   "reftest"
+  ],
+  "css/css-contain/contain-style-counters-003.html": [
+   "d99f139c500eaa273b0137d5b3fd9a0a472c414b",
+   "reftest"
+  ],
+  "css/css-contain/contain-style-counters-004.html": [
+   "1e751d1552040a99bb121fb645d2b4e388891411",
+   "reftest"
+  ],
   "css/css-contain/contain-style-counters-ref.html": [
    "feef9209f5c19f51233a2025108b66c63b58f34c",
    "support"
   ],
-  "css/css-contain/contain-style-counters.html": [
-   "55bf97f9f2a2081f3b3c847748bc3e46bd16cc9c",
-   "reftest"
-  ],
   "css/css-contain/counter-scoping-001.html": [
    "f7d40dc5a0850919f1b86ca31e9ebd44ec96b72d",
    "reftest"
@@ -516715,11 +517858,39 @@
    "reftest"
   ],
   "css/css-contain/reference/contain-layout-breaks-002-ref.html": [
-   "9ecc3d2fd4b3be5e205ede1b6632d8ad7fe90cf9",
+   "c68bee1d0aa4f9201fb6e48cc25199f373128ca8",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-cell-001-ref.html": [
+   "093dd363392d37b0f67f8409c6acc0c06e00d7cd",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-ifc-022-ref.html": [
+   "682af7d4f44b22f987c069dbbee370520612bc10",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-ink-overflow-013-ref.html": [
+   "a2b75db3147cec8ff474d126b641df8188859d6e",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-ink-overflow-015-ref.html": [
+   "8dbbbbd3ec37d365a028b2bdb5ce9542cbe8cfb2",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-ink-overflow-019-ref.html": [
+   "7ec1d1bf8e9994adf92bc92fa91bd986b42cdfe1",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-ink-overflow-020-ref.html": [
+   "57a4e9c361d4a099c3c35d8e87e00d38f902c91e",
+   "support"
+  ],
+  "css/css-contain/reference/contain-layout-size-003-ref.html": [
+   "e3932a9b05f277a9b9d24082bc042646821da36d",
    "support"
   ],
   "css/css-contain/reference/contain-paint-001-ref.html": [
-   "1ed4eca63a97c90fc0c574daa2602ce0d3105d0d",
+   "639fbb2248afa3dfe1ad78c4070c5483d822ceee",
    "support"
   ],
   "css/css-contain/reference/contain-paint-007-ref.html": [
@@ -516734,6 +517905,30 @@
    "af758703a3b75b45223491a4fe97eb1da20d5320",
    "support"
   ],
+  "css/css-contain/reference/contain-paint-022-ref.html": [
+   "b3bb7576f2944f6ef51c16024767b93e8f30c329",
+   "support"
+  ],
+  "css/css-contain/reference/contain-paint-047-ref.html": [
+   "f13649977fced91be39359e59ea4c80fc347cfea",
+   "support"
+  ],
+  "css/css-contain/reference/contain-paint-clip-015-ref.html": [
+   "781a6d2f2f4e8810690ab321f7ff7bf3539044f3",
+   "support"
+  ],
+  "css/css-contain/reference/contain-paint-ifc-011-ref.html": [
+   "229c8c2d74ba3f2b5cede6824091575835807092",
+   "support"
+  ],
+  "css/css-contain/reference/contain-paint-size-001-ref.html": [
+   "9aad8a490b4b740991c968a17f1c74571e758d36",
+   "support"
+  ],
+  "css/css-contain/reference/contain-paint-size-003-ref.html": [
+   "27820fae761614e745b58ac16fe0992c516698c8",
+   "support"
+  ],
   "css/css-contain/reference/contain-size-004-ref.html": [
    "3048d55f11a058ed951dea5bf2f940d27045ffed",
    "support"
@@ -516742,6 +517937,30 @@
    "001fc900613b81f6ece82548b045a5af79dfadaf",
    "support"
   ],
+  "css/css-contain/reference/contain-size-021-ref.html": [
+   "de9cea10501b0014169e8260737f11e387270394",
+   "support"
+  ],
+  "css/css-contain/reference/contain-size-022-ref.html": [
+   "3ca9ac9ee4d4edd11249af01607c450b88ee8998",
+   "support"
+  ],
+  "css/css-contain/reference/contain-size-051-ref.html": [
+   "07455aaed22aef0b4e6d303185a33929053b6c15",
+   "support"
+  ],
+  "css/css-contain/reference/contain-size-056-ref.html": [
+   "2e73f0e42b770cc1b486ba6d54a848a71ce6086d",
+   "support"
+  ],
+  "css/css-contain/reference/contain-size-061-ref.html": [
+   "756c20d40eb8a27a179095f79d5e714fa73f992c",
+   "support"
+  ],
+  "css/css-contain/reference/contain-size-062-ref.html": [
+   "dbfa77f6ac0dfdc03d2f8a8b0407a704617c73a7",
+   "support"
+  ],
   "css/css-contain/reference/contain-size-breaks-001-ref.html": [
    "6fa1e47a1fc25442b06227524412bb1933abbac7",
    "support"
@@ -516758,6 +517977,10 @@
    "d71636bd5f4a344352249b50563eb03d249484c6",
    "support"
   ],
+  "css/css-contain/reference/contain-size-monolithic-001-ref.html": [
+   "2e8f1ba70aae799b64d0917b1a5e3b70c595ac69",
+   "support"
+  ],
   "css/css-contain/reference/contain-style-breaks-001-ref.html": [
    "2c0b758e6bf83ab83444422d39535e14af8c1ab1",
    "support"
@@ -516766,6 +517989,14 @@
    "eaf4d566a24d8d6a8793b8925b3f5e35ad6363b2",
    "support"
   ],
+  "css/css-contain/reference/contain-style-counters-001-ref.html": [
+   "c0c652b3351930655b713d3e6907ee70ec42bd69",
+   "support"
+  ],
+  "css/css-contain/reference/contain-style-counters-003-ref.html": [
+   "8eb67b5943fa41db2320d51e92277dced3029f6e",
+   "support"
+  ],
   "css/css-contain/reference/counter-scoping-001-ref.html": [
    "2ebbb9a93c31d0c53b396f9a118951b85c16650c",
    "support"
@@ -516786,6 +518017,42 @@
    "2bc8d6730e756b6f1569d619b0accf5ce15d4e39",
    "support"
   ],
+  "css/css-contain/reference/ref-if-there-is-no-red.xht": [
+   "a5b4e9f47a8e60ad0bede1ac81e02b3542c80f3b",
+   "support"
+  ],
+  "css/css-contain/support/blue-100x100.png": [
+   "3b72d5ce53c07b68fe508bb57aa61a933dbda768",
+   "support"
+  ],
+  "css/css-contain/support/blue50wBy23h.png": [
+   "d20129cc215de774edbaf5ecebd302131a2dd971",
+   "support"
+  ],
+  "css/css-contain/support/blue50wBy46h.png": [
+   "303d0404548724666f12860b8c37350244753a7d",
+   "support"
+  ],
+  "css/css-contain/support/pattern-gg-gr-100x100.png": [
+   "fd9b7e1ef20c952088dad95eafc74609b066774d",
+   "support"
+  ],
+  "css/css-contain/support/swatch-blue.png": [
+   "bf2759634d45dbe3df13868341eddb7e4bf24172",
+   "support"
+  ],
+  "css/css-contain/support/swatch-orange.png": [
+   "d3cd498b52bd88ea6c991f050f1ecb1cfdd136bb",
+   "support"
+  ],
+  "css/css-contain/support/swatch-red.png": [
+   "1caf25c992aa8e23483cddb3334b5f51ec967f4a",
+   "support"
+  ],
+  "css/css-contain/support/swatch-yellow.png": [
+   "1591aa0e2e274854ed836cf582235ea0202f9c8e",
+   "support"
+  ],
   "css/css-content/META.yml": [
    "848b42b9559ebfbb1f7f2173d90f492acf643794",
    "support"
@@ -536162,8 +537429,8 @@
    "2db3480feb5928c6a39fbf6084cf07bec0ba4767",
    "reftest"
   ],
-  "css/css-pseudo/interfaces.html": [
-   "572f87f62910cd2b4f25c3c5975e7bfed29f91d6",
+  "css/css-pseudo/idlharness.html": [
+   "4c113fc9091fb773cabd77f1419fac9a2e99650b",
    "testharness"
   ],
   "css/css-pseudo/marker-and-other-pseudo-elements-ref.html": [
@@ -551443,7 +552710,7 @@
    "testharness"
   ],
   "css/css-typed-om/interfaces.html": [
-   "e5a3638b8e6a654a0c1832a2dab970dd84a6d9e3",
+   "d21f3f469840034a603093f3e7892d6c92f3d238",
    "testharness"
   ],
   "css/css-typed-om/resources/testhelper.js": [
@@ -552019,7 +553286,7 @@
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/color-rendering.html": [
-   "3c47e3e47a9af67800c9add4d7fd398ccb010a72",
+   "e6abf50f16a19d576b69950a4dc689121af8e20d",
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/color.html": [
@@ -552519,7 +553786,7 @@
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html": [
-   "28ecdabf4026c648efe7d6ff43f4f5fe45d1bc0e",
+   "f7cb4199a5b68cdaf8556019d833e5b5471d1a26",
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/speak.html": [
@@ -552639,7 +553906,7 @@
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/text-rendering.html": [
-   "13d2e3bc755d02f2b572c722cfa89f715a2be1ba",
+   "88ef17da0e36dbcab52777c05e6b856cfd3e334a",
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/text-shadow.html": [
@@ -561235,7 +562502,7 @@
    "support"
   ],
   "css/css-writing-modes/support/pattern-gg-gr-100x100.png": [
-   "b14c75ea2c0d40b1fed8b5502722275bb3ca205a",
+   "fd9b7e1ef20c952088dad95eafc74609b066774d",
    "support"
   ],
   "css/css-writing-modes/support/pattern-gg-rg-100x100.png": [
@@ -576079,7 +577346,7 @@
    "support"
   ],
   "docs/_writing-tests/testdriver-tutorial.md": [
-   "2318e0e2e03f952d83bc9e0f5eb6767c6fcd6aeb",
+   "7bf9e9aa9e6c6c7a8c057c9dbe4151194ca3edd0",
    "support"
   ],
   "docs/_writing-tests/testdriver.md": [
@@ -577835,7 +579102,7 @@
    "support"
   ],
   "domparsing/interfaces.any.js": [
-   "4eaeabea85dd350cdc0f128051dae917e4ada55b",
+   "f01aff013e80428e1689fb80cec2fc19697ab7ff",
    "testharness"
   ],
   "domparsing/outerhtml-01.html": [
@@ -583518,8 +584785,8 @@
    "364dd81a3448188bd76f6ff410807bfcca93177d",
    "testharness"
   ],
-  "hr-time/idlharness.html": [
-   "d28cee3a70014bf5cc1c02b3cc211ae75c2a37c4",
+  "hr-time/idlharness.any.js": [
+   "4e266c09e3358034e6fac6fb282bbeb138e4278a",
    "testharness"
   ],
   "hr-time/monotonic-clock.any.js": [
@@ -583738,8 +585005,8 @@
    "47a6732ecf5fbf52a1b325001711df6b65bb33fa",
    "manual"
   ],
-  "html-media-capture/idlharness.html": [
-   "93014f36f53c68ac90b150e9a58c35f362ecf4a3",
+  "html-media-capture/idlharness.window.js": [
+   "5382f53b48805b3f13a5ede2c32ea42f3480d48e",
    "testharness"
   ],
   "html-media-capture/support/upload.txt": [
@@ -585899,7 +587166,7 @@
    "testharness"
   ],
   "html/browsers/the-window-object/window-open-noopener.html": [
-   "7d1d430c0def3729827ef3da7c283431fd29d9aa",
+   "5256053753747a99c68dd9c6a89aa4e33bd22c57",
    "testharness"
   ],
   "html/browsers/the-window-object/window-properties.https.html": [
@@ -587299,7 +588566,7 @@
    "testharness"
   ],
   "html/dom/interfaces.worker.js": [
-   "9fc3dccc66bdb72199cf819c8e1174958696f67c",
+   "8bf24b51b083a73e3ec79efc43269552f507db4a",
    "testharness"
   ],
   "html/dom/new-harness.js": [
@@ -602103,7 +603370,7 @@
    "support"
   ],
   "interfaces/META.yml": [
-   "e9ce8729d7170cad23d1f47e15eea918b3ca61b8",
+   "6895a5fc5674a099909a481a46726c990804fc61",
    "support"
   ],
   "interfaces/ResizeObserver.idl": [
@@ -602175,7 +603442,7 @@
    "support"
   ],
   "interfaces/cookie-store.idl": [
-   "4f53dbf0a47c3fe09ff7424408a42711af2ad4c7",
+   "454da38b18240e6e5e98a92cd2c9d129ee71d4a0",
    "support"
   ],
   "interfaces/cors-rfc1918.idl": [
@@ -602195,7 +603462,7 @@
    "support"
   ],
   "interfaces/css-conditional.idl": [
-   "6671de2960aadffbc11123d946c2437e33455444",
+   "bfc384db3e682ccb03361bc954f3cbb138ef63bb",
    "support"
   ],
   "interfaces/css-counter-styles.idl": [
@@ -602239,7 +603506,7 @@
    "support"
   ],
   "interfaces/css-typed-om.idl": [
-   "45df5205d9a0a98b4e05f76d70c050ce5b97fbd8",
+   "fa20d2d9bb800ab3d5c4d415d9c41e5db6898f99",
    "support"
   ],
   "interfaces/cssom-view.idl": [
@@ -602279,7 +603546,7 @@
    "support"
   ],
   "interfaces/filter-effects.idl": [
-   "d2d7b3538b4518684069045db4258a6fb7d74cc0",
+   "8ea9a86ba279fd7c6c844942f4ce88d558a37e92",
    "support"
   ],
   "interfaces/fullscreen.idl": [
@@ -602311,7 +603578,11 @@
    "support"
   ],
   "interfaces/hr-time.idl": [
-   "3c793c328c6129edc37a83eddaa128a1dd023dcd",
+   "ca15cf8c44371fae17dc8fd162ebfbc9a0500e7c",
+   "support"
+  ],
+  "interfaces/html-media-capture.idl": [
+   "a398330775cfcf85640fdad39646fbbc77d3fffa",
    "support"
   ],
   "interfaces/html.idl": [
@@ -602326,6 +603597,10 @@
    "be276361738c7ba55f06bc608fa506e79ca366b8",
    "support"
   ],
+  "interfaces/intersection-observer.idl": [
+   "83c5d90d6e2c23c355bbc25a8e220b61bcc45fe6",
+   "support"
+  ],
   "interfaces/keyboard-lock.idl": [
    "4ffffd43717933ceee5c3c8f47b3e3a5276b9952",
    "support"
@@ -602378,6 +603653,10 @@
    "3e6212c3712fcbf525d1c9bbcd15b732cc4b2762",
    "support"
   ],
+  "interfaces/notifications.idl": [
+   "2524933dfd497aaff1d7f1c82d2e3f2c44c867ef",
+   "support"
+  ],
   "interfaces/orientation-event.idl": [
    "5f874186ade0e13a0190c0c423c0b72b5c1eab8d",
    "support"
@@ -602395,7 +603674,7 @@
    "support"
   ],
   "interfaces/payment-handler.idl": [
-   "e14a54bb031759fee663d9a3b3353b1bbb89be3b",
+   "a9e3525ba4ae7b2031281f1607f14da1ba476cd4",
    "support"
   ],
   "interfaces/payment-method-basic-card.idl": [
@@ -602439,7 +603718,7 @@
    "support"
   ],
   "interfaces/push-api.idl": [
-   "9047d9785ed3c5e60d6f016ea698094aab6a5927",
+   "fe7331d68e471d6b4d3678a165d0c9789193cf95",
    "support"
   ],
   "interfaces/referrer-policy.idl": [
@@ -602494,10 +603773,6 @@
    "097b0e9ac9ea30ef9536d390b4f54d22472b0dee",
    "support"
   ],
-  "interfaces/touchevents.idl": [
-   "81eec0185c25b51746bda6ed6704fe4b44f49a14",
-   "support"
-  ],
   "interfaces/uievents.idl": [
    "5e2a1871653e49ddab9c2f2ea14b778bfd203bbd",
    "support"
@@ -602558,14 +603833,18 @@
    "b8f5b23bf65b68c4e93ae3a64a2c0661345cc3e0",
    "support"
   ],
-  "interfaces/webrtc-pc.idl": [
-   "fde2ba02f801f59987d2b50fc980a97b6a3df227",
+  "interfaces/webmidi.idl": [
+   "eb7ed6befcc4d172254fc38357cb9c002db589d3",
    "support"
   ],
   "interfaces/webrtc-stats.idl": [
    "0b2474a5385c281de0bea591381652b968135454",
    "support"
   ],
+  "interfaces/webrtc.idl": [
+   "8d949cabbdd3435729249dd45675ed1782b50d8b",
+   "support"
+  ],
   "interfaces/webusb.idl": [
    "edbbf03f07f1dbbcdcc4717f374ab49f6f564fd9",
    "support"
@@ -602575,7 +603854,7 @@
    "support"
   ],
   "interfaces/webxr.idl": [
-   "ca6d3fc7843b5bc9e4f029f5e96c8a84872c55bf",
+   "2b90859ee6595ec128340a506a1344a35d3c2499",
    "support"
   ],
   "interfaces/worklets.idl": [
@@ -602618,6 +603897,10 @@
    "b9fa24b87808abc158307e8c69afeeb5ce3c1907",
    "testharness"
   ],
+  "intersection-observer/idlharness.window.js": [
+   "2059e1ce638b5f2cac4e4f013c567a56894599a0",
+   "testharness"
+  ],
   "intersection-observer/iframe-no-root.html": [
    "e37aeac5530f348328274f9f8a2eeae9f08609ff",
    "testharness"
@@ -603471,7 +604754,7 @@
    "testharness"
   ],
   "media-capabilities/idlharness.any.js": [
-   "41ede3d06f9673eacc482bd18a58593b820bf258",
+   "0be4674f597350c22f31c440b8de7b19bee1fc29",
    "testharness"
   ],
   "media-source/META.yml": [
@@ -604179,7 +605462,7 @@
    "testharness"
   ],
   "mediacapture-streams/MediaStream-removetrack.https.html": [
-   "787af0bbe52ff70ccde4e2424fa5989f84e8ca26",
+   "b934397914f39cee6bb9a52915959233c0ca84ca",
    "testharness"
   ],
   "mediacapture-streams/MediaStream-video-only.https.html": [
@@ -606058,12 +607341,12 @@
    "a4b288fa5976d035f40a673c7c7da465454ecfe6",
    "manual"
   ],
-  "notifications/instance.html": [
-   "c0ebe7e6998e96673599600367424f8aa3e8c652",
+  "notifications/idlharness.any.js": [
+   "e2907f318373cb7a975bd8be3167701b74550416",
    "testharness"
   ],
-  "notifications/interfaces.html": [
-   "a348450e5fe456e38209a5be0a6367ea4c428e1e",
+  "notifications/instance.html": [
+   "c0ebe7e6998e96673599600367424f8aa3e8c652",
    "testharness"
   ],
   "notifications/lang.html": [
@@ -612435,52 +613718,56 @@
    "testharness"
   ],
   "old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm": [
-   "69150236ec7635cab2e1d9a2a5655068506c4a69",
-   "support"
+   "1286493a3e0a295cbf027693e7f63fc0a94ef7db",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/collapseToEnd.htm": [
-   "2f68ec6554b7057f02edc7b894a7bf945214535b",
-   "support"
+   "3a93d52ce07e506b110269ee5f48a19a899f641e",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/collapseToStart.htm": [
-   "da9676d57b8489e1e5d373d7d19f154e30317989",
+   "d24cbae8f525f53515d0fc3d461a5e0d94f3b50e",
+   "testharness"
+  ],
+  "old-tests/submission/Microsoft/selection/common.js": [
+   "6da739b5eb63107b16422f0b44ad3708c4207967",
    "support"
   ],
   "old-tests/submission/Microsoft/selection/deleteFromDocument.htm": [
-   "2373939cc49b9c9ffe359760aece06ef0dbe32f1",
-   "support"
+   "b9ae112275edf13b171c938573722ea4ccfa2fb4",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/getRangeAt.htm": [
-   "a3911e6cd9dcb7f3098981ce3699d8a716b381c5",
-   "support"
+   "d323e7d71c28d16d33fde750440f6a887311eae2",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm": [
-   "4ec0d80f359e8bed83ecb5c6cba96731e633bdc5",
-   "support"
+   "4ac8702a0e5b6cd0aa877f9ed854351afae1a6c1",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/removeAllRanges.htm": [
-   "869e5391dda1f8b8286a72120f23a22df53052b7",
-   "support"
+   "85d6211e1cb0203f5d648eed0e1d96a00e16b0e0",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/removeRange.htm": [
-   "e35047b4701de5f5adc0c94b82c2b9f7b7bac96d",
-   "support"
+   "8786e82671410497a384c6c8f738150a3919e098",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/select.htm": [
-   "f6a31f24964ba108948405ae8e94e25c51a17450",
-   "support"
+   "98086ef18916be9e1a3aa98a1bab00234bad5a07",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/selectAllChildren.htm": [
-   "a3ab4f57d40d39e9c5ecaaab8204248e632b1bbf",
-   "support"
+   "8f0d7c81b99bf786dd554a37e37343211e80fad7",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/selectionStartEnd.htm": [
-   "c5b69d5706003b6c42ab0d12ad936162f522860a",
-   "support"
+   "35687f4a5ad7a97d678b3880f75089b3527fb48f",
+   "testharness"
   ],
   "old-tests/submission/Microsoft/selection/setSelectionRange.htm": [
-   "a6d7a0f2ba1c3bd001d0c4f34c8c958d162f084b",
-   "support"
+   "8de7fe5eb4e19915dd37cf5987974c3809c02bcb",
+   "testharness"
   ],
   "orientation-event/META.yml": [
    "ba1811f6742078a6d05139527ac3873539a7d7ce",
@@ -612847,11 +614134,7 @@
    "testharness"
   ],
   "payment-handler/idlharness.https.any.js": [
-   "d039f66001f27005f8725ae3b482e894fc79f5cc",
-   "testharness"
-  ],
-  "payment-handler/interfaces.https.any.js": [
-   "73679300f070c84aeaf8aa25f2e01530713994a1",
+   "6fbba53515eba4db995624cecaff1512fbace056",
    "testharness"
   ],
   "payment-handler/manifest.json": [
@@ -614183,7 +615466,7 @@
    "testharness"
   ],
   "priority-hints/img-attr-named-constructor.tentative.html": [
-   "d9dd22a9c5de2c31f09c304b42454cc08de8ac61",
+   "ce677ccc177b6c1e002939d174339fd25c8f3303",
    "testharness"
   ],
   "priority-hints/link-attr.tentative.html": [
@@ -614222,8 +615505,8 @@
    "2f5a866d940363a9e514590d496e2fec4f3a3440",
    "support"
   ],
-  "push-api/idlharness.https.any.js": [
-   "7ed5e110c56a91d39ea1a6d585709160cc46bf69",
+  "push-api/idlharness.any.js": [
+   "16c0826a7592a4636caa70c53ec7a6bfb0f7b1c3",
    "testharness"
   ],
   "quirks/META.yml": [
@@ -622755,7 +624038,7 @@
    "support"
   ],
   "resources/chromium/webxr-test.js": [
-   "7ed9332bd6ee6b861aaefc9c3f4efe5d636d6e3d",
+   "d760e7c76d3050973e365021766cb00488b16156",
    "support"
   ],
   "resources/chromium/webxr-test.js.headers": [
@@ -625579,7 +626862,7 @@
    "support"
   ],
   "service-workers/cache-storage/script-tests/cache-keys.js": [
-   "96bd43b673a4f78af47aca307da3ced8373d6168",
+   "a94c18f873c8b75c6faaa3a10d54ac58cf7c7c00",
    "support"
   ],
   "service-workers/cache-storage/script-tests/cache-match.js": [
@@ -627079,7 +628362,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/interfaces-worker.sub.js": [
-   "10fe14d5becd01c481da734ef3ee7ae1bf8c458f",
+   "56bc8af445d5e7900b4573c35e6d680eff16c671",
    "support"
   ],
   "service-workers/service-worker/resources/invalid-blobtype-iframe.https.html": [
@@ -628458,6 +629741,26 @@
    "17263d91d367f5571ac7df3616aa026bdb4f6433",
    "support"
   ],
+  "speech-api/SpeechRecognition-abort-manual.https.html": [
+   "3c9e1ab2512e0a8451da5711252fc43956a41afa",
+   "manual"
+  ],
+  "speech-api/SpeechRecognition-basics.https.html": [
+   "dc5d3f5c1df6e254b05ba1decf353abc3ccbef13",
+   "testharness"
+  ],
+  "speech-api/SpeechRecognition-onerror-manual.https.html": [
+   "b0d5d5ebed059c92941af734d6e9d317aa6eda87",
+   "manual"
+  ],
+  "speech-api/SpeechRecognition-onresult-manual.https.html": [
+   "6a0877bbe1e3354b006e1e882620180e3e8bd2fe",
+   "manual"
+  ],
+  "speech-api/SpeechRecognition-stop-manual.https.html": [
+   "e4741b7fc6f450a5038f99c1b3de15ae4f5b0db0",
+   "manual"
+  ],
   "speech-api/SpeechSynthesis-speak-ownership.html": [
    "64bed13bd53a2a3b5ca6ccc8b2e17b686beaaf81",
    "testharness"
@@ -628466,10 +629769,18 @@
    "4e4ee34565c1228532d4a892dfa7782334939156",
    "testharness"
   ],
-  "speech-api/historical.html": [
-   "4ca574b1717a72f82445a51418bbdeb5a164c346",
+  "speech-api/SpeechSynthesisUtterance-basics.https.html": [
+   "9a90f086ac451d09922f05b55144818e787a5ded",
    "testharness"
   ],
+  "speech-api/historical.html": [
+   "2fb0ccd4b905b4503f0affa4c8c7be3141871fe3",
+   "testharness"
+  ],
+  "speech-api/webspeech.js": [
+   "93830e648b2e16e325295ec8cd5cd2db7f00baf0",
+   "support"
+  ],
   "storage/META.yml": [
    "2aad1fb513710e839ad86c923bf208dae604d3d2",
    "support"
@@ -632955,7 +634266,7 @@
    "support"
   ],
   "tools/ci/ci_taskcluster.sh": [
-   "8d00a5c537817aeafc432c0ab68d4945d1b2b91c",
+   "118243881a938b9d2cae0ebce2662c8ed416eaa4",
    "support"
   ],
   "tools/ci/ci_tools_unittest.sh": [
@@ -637279,15 +638590,15 @@
    "support"
   ],
   "tools/wptrunner/requirements_chrome.txt": [
-   "5a1d26b8b9bccd5cbbe637c7d115808b4fd85f49",
+   "22a07532657dadb79c404fcb61a26e1a127b8cc2",
    "support"
   ],
   "tools/wptrunner/requirements_chrome_android.txt": [
-   "5a1d26b8b9bccd5cbbe637c7d115808b4fd85f49",
+   "22a07532657dadb79c404fcb61a26e1a127b8cc2",
    "support"
   ],
   "tools/wptrunner/requirements_edge.txt": [
-   "5a1d26b8b9bccd5cbbe637c7d115808b4fd85f49",
+   "22a07532657dadb79c404fcb61a26e1a127b8cc2",
    "support"
   ],
   "tools/wptrunner/requirements_firefox.txt": [
@@ -637295,11 +638606,11 @@
    "support"
   ],
   "tools/wptrunner/requirements_ie.txt": [
-   "5a1d26b8b9bccd5cbbe637c7d115808b4fd85f49",
+   "22a07532657dadb79c404fcb61a26e1a127b8cc2",
    "support"
   ],
   "tools/wptrunner/requirements_opera.txt": [
-   "5a1d26b8b9bccd5cbbe637c7d115808b4fd85f49",
+   "22a07532657dadb79c404fcb61a26e1a127b8cc2",
    "support"
   ],
   "tools/wptrunner/requirements_safari.txt": [
@@ -637307,7 +638618,7 @@
    "support"
   ],
   "tools/wptrunner/requirements_sauce.txt": [
-   "5a86904a5caaaa1bedf37719a40b04cf0c79d504",
+   "77a74222433a693c8458f4a05857c7ed6db85601",
    "support"
   ],
   "tools/wptrunner/requirements_servo.txt": [
@@ -638366,10 +639677,14 @@
    "065c0c78848af60244a860c2d785fa48c66e5ef5",
    "support"
   ],
-  "uievents/auxclick/auxclick_event-manual.html": [
+  "uievents/click/auxclick_event-manual.html": [
    "786ebfaaebbc8f14710ac7b347a4383b77df0900",
    "manual"
   ],
+  "uievents/click/click_event_target-manual.html": [
+   "1e5670262b5cb39cf74e34616f908d7cc3cc09cf",
+   "manual"
+  ],
   "uievents/constructors/README.md": [
    "097a5103959ae8978eaa6256efdf69a0898696a2",
    "support"
@@ -638903,7 +640218,7 @@
    "support"
   ],
   "url/README.md": [
-   "667951d680fcdae240661f6cb3a1747f2ec545ec",
+   "823a8eec02228265dc94bc7c01ac87e99c22e06b",
    "support"
   ],
   "url/a-element-origin-xhtml.xhtml": [
@@ -638963,63 +640278,67 @@
    "testharness"
   ],
   "url/url-constructor.html": [
-   "6d7c2d64dbd8c5e3f632c86436a9f0bb9b500b22",
+   "cb4c0db3571d2f20efb1215faa0ba867fb321c15",
    "testharness"
   ],
   "url/url-origin.html": [
    "fccb643ed6c8069cc61fee276fbf5c69b3828850",
    "testharness"
   ],
+  "url/url-searchparams.any.js": [
+   "c55ae58d3b1e5be919296d541a01c65b56203e3a",
+   "testharness"
+  ],
   "url/url-setters.html": [
    "db30cf0774da445a18d9a6755b97ad1e13083b99",
    "testharness"
   ],
-  "url/url-tojson.html": [
-   "3e8798c08b556e59caf6ce732e28028a4107df96",
+  "url/url-tojson.any.js": [
+   "65165f96c572d9b01fe6a5e27339882c387260dd",
    "testharness"
   ],
-  "url/urlencoded-parser.html": [
-   "40a54f1e3eca1145335cdfb8a92e27218d36c991",
+  "url/urlencoded-parser.any.js": [
+   "65e894b94c26b0bd21d07706ff2601bd54a3d134",
    "testharness"
   ],
-  "url/urlsearchparams-append.html": [
-   "ca367e6f61827883e5962d949f9aa34009544572",
+  "url/urlsearchparams-append.any.js": [
+   "5a7376144d0637e52cd470491f88779220b43b99",
    "testharness"
   ],
-  "url/urlsearchparams-constructor.html": [
-   "0637a386ec764b847927205af6549fcb79b0dd0b",
+  "url/urlsearchparams-constructor.any.js": [
+   "5412fc8b751752d5bc161f407b455ca513305e4e",
    "testharness"
   ],
-  "url/urlsearchparams-delete.html": [
-   "d4bc0a6d26a6317d1de59c2d14b845f02b9e97f7",
+  "url/urlsearchparams-delete.any.js": [
+   "1aa9b313736de23e4724fe72217d9bad4df56595",
    "testharness"
   ],
-  "url/urlsearchparams-foreach.html": [
-   "29c0ee802fde38c7d04b0a94152dc74a19c67111",
+  "url/urlsearchparams-foreach.any.js": [
+   "7969a0cb11a2712bbbfc2a42c4856f5576531884",
    "testharness"
   ],
-  "url/urlsearchparams-get.html": [
-   "1d27727ce881e7665dd5777310fa82d2ced9ee3c",
+  "url/urlsearchparams-get.any.js": [
+   "a2610fc933a772b36157e04e90877e48b632327e",
    "testharness"
   ],
-  "url/urlsearchparams-getall.html": [
-   "db6c7e301b21b89d85d61c0d64a9ab30543d45ee",
+  "url/urlsearchparams-getall.any.js": [
+   "5d1a35352acf2c7c35f372a6c0462e98948c6569",
    "testharness"
   ],
-  "url/urlsearchparams-has.html": [
-   "ad045f73c40b065ef5eac3e3a47da3cb094afa4a",
+  "url/urlsearchparams-has.any.js": [
+   "673dce77dc44ab6f78bf713d196c0ea5b588a28d",
    "testharness"
   ],
-  "url/urlsearchparams-set.html": [
-   "61578b2c18e6fe820a429bf59419a3e91a4fd4cc",
+  "url/urlsearchparams-set.any.js": [
+   "eb24cac87b6dca1d3dd3bb2ed083745be3e1ca36",
    "testharness"
   ],
-  "url/urlsearchparams-sort.html": [
-   "22a7be2cb270b47785000ec86af7170c2665169a",
+  "url/urlsearchparams-sort.any.js": [
+   "4fd8cef69239d26eb6241df180453aedf00cc050",
    "testharness"
   ],
-  "url/urlsearchparams-stringifier.html": [
-   "5e885b446a3ec2894e5a78ed71098625e7a2fda3",
+  "url/urlsearchparams-stringifier.any.js": [
+   "ef95c1434c796418bf7fcaaa1732c46719ca3205",
    "testharness"
   ],
   "user-timing/META.yml": [
@@ -640422,18 +641741,6 @@
    "bb0ec21cc570bef2ecc880d8a03cf88395a56b76",
    "support"
   ],
-  "wasm/wasm_idb_worker.js": [
-   "9d36d748ded87434e9dd14c30a1bbfd389db2f95",
-   "support"
-  ],
-  "wasm/wasm_indexeddb_test.https.html": [
-   "320f046426d923e5df693d0347d77377961ce6b2",
-   "testharness"
-  ],
-  "wasm/wasm_indexeddb_test.js": [
-   "a5a582cd29305b47b4e32511a740c7a1a9a742a3",
-   "support"
-  ],
   "wasm/wasm_local_iframe_test.html": [
    "0f4fbd0c7191ece3a901b0a065f147c03431a2d4",
    "testharness"
@@ -643230,6 +644537,14 @@
    "4b1b38f741c940bf0396b28912dcb4fb4902e393",
    "testharness"
   ],
+  "webmidi/META.yml": [
+   "f39d4122887ba252516b12f98caaa08e84b3eb34",
+   "support"
+  ],
+  "webmidi/idlharness.window.js": [
+   "5fb88073b169cfac1d8353e5e8416bdd46ceab0e",
+   "testharness"
+  ],
   "webrtc-stats/META.yml": [
    "489264f23d6e8c096652620e6e7732a94644353f",
    "support"
@@ -643271,7 +644586,7 @@
    "testharness"
   ],
   "webrtc/RTCConfiguration-rtcpMuxPolicy.html": [
-   "6b65a12f07f803da58ec1661bccc95ffe1fc0fb1",
+   "1d99aa29d85a5dabddf21bc4d758c6cdf96ff9c2",
    "testharness"
   ],
   "webrtc/RTCDTMFSender-helper.js": [
@@ -643606,8 +644921,8 @@
    "90363662f742fbf1d31634030d2b470e08fe1421",
    "support"
   ],
-  "webrtc/interfaces.https.html": [
-   "a834f895abcc13d31da6a529b0c30d72e01c753c",
+  "webrtc/idlharness.https.window.js": [
+   "3c57a022cabfbedcf4a015024ac88ecd3080faf6",
    "testharness"
   ],
   "webrtc/no-media-call.html": [
@@ -644883,7 +646198,7 @@
    "support"
   ],
   "webusb/idlharness.https.any.js": [
-   "e520200f7e46e9e8f0115a751fc4046638ebc81d",
+   "9ba0198a5bc3634da194e7b08200ea0d68cb4b5a",
    "testharness"
   ],
   "webusb/insecure-context.any.js": [
@@ -644907,7 +646222,7 @@
    "support"
   ],
   "webusb/resources/usb-helpers.js": [
-   "81a712c1c6529d7f8cfbccec6587b4bade119891",
+   "e2b7d46dca528fba66a8b25c0bae9e927edee9ee",
    "support"
   ],
   "webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html": [
@@ -647858,8 +649173,8 @@
    "b5e3e65a12cb4124e43c4f24b7fca84910fda119",
    "support"
   ],
-  "webxr/interfaces.https.html": [
-   "65b2a85326eede96f44932383b41037d65f0d056",
+  "webxr/idlharness.https.window.js": [
+   "6ec963df6d56b82ee62175532fc789be1f698074",
    "testharness"
   ],
   "webxr/resources/webxr_check.html": [
@@ -647931,7 +649246,7 @@
    "testharness"
   ],
   "workers/WorkerGlobalScope_requestAnimationFrame.htm": [
-   "dcf58d92497e01b4ea58db66730e5ed91b054f34",
+   "c5efd53c210a72b7e188b74794ebfd044ca9a701",
    "testharness"
   ],
   "workers/WorkerGlobalScope_setInterval.htm": [
@@ -648631,7 +649946,7 @@
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-blob-url.any.js": [
-   "9a50b23893b3145494f4e71c74c636d467921db0",
+   "e3f61867c5b9e4ef23f19477d66222bb9ce7579e",
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-data-url.any.js": [
@@ -648639,11 +649954,11 @@
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-failure.html": [
-   "547f9e16dc9a8e97006422d0b7528551cd5c4c2d",
+   "81d93322c77dd0d223ade30fed5c6b43ab8f05e0",
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-meta.html": [
-   "6960cbe57702e71bf51debaf796de8732864e0c2",
+   "9292b0f6d8ef8f543cbdc060b64cf2826bac1ac4",
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-referrer.html": [
@@ -648651,7 +649966,7 @@
    "testharness"
   ],
   "workers/modules/dedicated-worker-import.any.js": [
-   "65adcb0b50317fadb703557c39c70db899e7c9bf",
+   "805dbf3288c0644415203b3670b7827a9981a2b8",
    "testharness"
   ],
   "workers/modules/dedicated-worker-options-credentials.html": [
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/allow_csp_from-header.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/allow_csp_from-header.html.ini
index fa81f9b09cb1..21cab9e30f56 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/allow_csp_from-header.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/allow_csp_from-header.html.ini
@@ -1,5 +1,4 @@
 [allow_csp_from-header.html]
-  expected: ERROR
   [Cross origin iframe with an empty Allow-CSP-From header gets blocked.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html.ini
index 3705469819e3..a8e454f928b0 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-general.html]
-  expected: ERROR
   [Iframe with empty returned CSP should be blocked.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html.ini
index 273dc6a8151a..d458f903d894 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-hashes.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-hashes.html]
-  expected: ERROR
   [Returned should not include hashes not present in required csp.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html.ini
index fbfeec6257bb..ab926be2b78e 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-hosts.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-host_sources-hosts.html]
-  expected: ERROR
   [Host must match.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html.ini
index 1b4e7f79a760..9cccb2793abc 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-paths.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-host_sources-paths.html]
-  expected: ERROR
   [Returned CSP must specify a path.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini
index 305a9921d632..229b13819b7a 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-host_sources-ports.html]
-  expected: ERROR
   [Specified ports must match.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html.ini
index 13b709befac8..ec4dcc01776e 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-protocols.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-host_sources-protocols.html]
-  expected: ERROR
   [`https` is more restrictive than `http`.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html.ini
index 4023f5a1200d..a0d3ec60de3a 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-none.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-none.html]
-  expected: ERROR
   [Required policy that allows `none` does not subsume empty list of policies.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html.ini
index 8923186b88c2..1fce751c20a0 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-self.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-self.html]
-  expected: ERROR
   [Returned CSP must not allow 'self' if required CSP does not.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html.ini
index da48059b8870..acf6b7f8713d 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-strict_dynamic.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-strict_dynamic.html]
-  expected: ERROR
   ['strict-dynamic' has to be allowed by required csp if it is present in returned csp.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html.ini
index 64c8e524ebea..1cc3e7e5db67 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_eval.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-unsafe_eval.html]
-  expected: ERROR
   [No other keyword has the same effect as 'unsafe-eval'.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html.ini
index 4db7a68e7078..11d72acb8408 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_hashes.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-unsafe_hashes.html]
-  expected: ERROR
   [No other keyword has the same effect as 'unsafe-hashes'.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html.ini b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html.ini
index 086a9ce77406..31951d532238 100644
--- a/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html.ini
+++ b/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-unsafe_inline.html.ini
@@ -1,5 +1,4 @@
 [subsumption_algorithm-unsafe_inline.html]
-  expected: ERROR
   [Required csp allows `strict-dynamic`, but retuned csp does.]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/cookie-store/httponly_cookies.https.window.js.ini b/testing/web-platform/meta/cookie-store/httponly_cookies.https.window.js.ini
index 5c356b9ce85b..bc65929bbf85 100644
--- a/testing/web-platform/meta/cookie-store/httponly_cookies.https.window.js.ini
+++ b/testing/web-platform/meta/cookie-store/httponly_cookies.https.window.js.ini
@@ -2,3 +2,9 @@
   [HttpOnly cookies are not observed]
     expected: FAIL
 
+  [HttpOnly cookies can not be set by document.cookie]
+    expected: FAIL
+
+  [HttpOnly cookies can not be set by CookieStore]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-016.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-016.html.ini
new file mode 100644
index 000000000000..04e9219b5fac
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-016.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-016.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-breaks-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-breaks-002.html.ini
new file mode 100644
index 000000000000..a1f34a821e16
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-breaks-002.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-breaks-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-cell-001.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-cell-001.html.ini
new file mode 100644
index 000000000000..a2cd740a8e7c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-cell-001.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-cell-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-cell-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-cell-002.html.ini
new file mode 100644
index 000000000000..d88da2762521
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-cell-002.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-cell-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ifc-022.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ifc-022.html.ini
new file mode 100644
index 000000000000..576cd4d4f2c4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ifc-022.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ifc-022.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-013.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-013.html.ini
new file mode 100644
index 000000000000..d458015b7123
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-013.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-013.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-014.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-014.html.ini
new file mode 100644
index 000000000000..1def4db7314d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-014.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-014.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-015.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-015.html.ini
new file mode 100644
index 000000000000..dd1ea64b9436
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-015.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-015.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-016.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-016.html.ini
new file mode 100644
index 000000000000..69986d1f804d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-016.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-016.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-017.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-017.html.ini
new file mode 100644
index 000000000000..abcc2e21403c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-017.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-017.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-018.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-018.html.ini
new file mode 100644
index 000000000000..0adf94368795
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-018.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-018.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-019.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-019.html.ini
new file mode 100644
index 000000000000..e53145594522
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-019.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-019.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-020.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-020.html.ini
new file mode 100644
index 000000000000..c713331223ea
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-ink-overflow-020.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-ink-overflow-020.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-size-003.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-size-003.html.ini
new file mode 100644
index 000000000000..9c18d1c4a4eb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-size-003.html.ini
@@ -0,0 +1,2 @@
+[contain-layout-size-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-clip-015.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-clip-015.html.ini
new file mode 100644
index 000000000000..422af66a82f0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-clip-015.html.ini
@@ -0,0 +1,2 @@
+[contain-paint-clip-015.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-clip-016.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-clip-016.html.ini
new file mode 100644
index 000000000000..0fb46cbfd2b1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-clip-016.html.ini
@@ -0,0 +1,2 @@
+[contain-paint-clip-016.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-size-041.html.ini b/testing/web-platform/meta/css/css-contain/contain-size-041.html.ini
new file mode 100644
index 000000000000..e5225c441b70
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-size-041.html.ini
@@ -0,0 +1,2 @@
+[contain-size-041.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-size-042.html.ini b/testing/web-platform/meta/css/css-contain/contain-size-042.html.ini
new file mode 100644
index 000000000000..5ae6321ea6f5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-size-042.html.ini
@@ -0,0 +1,2 @@
+[contain-size-042.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-size-061.html.ini b/testing/web-platform/meta/css/css-contain/contain-size-061.html.ini
new file mode 100644
index 000000000000..1115a37c025b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-size-061.html.ini
@@ -0,0 +1,2 @@
+[contain-size-061.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-style-counters-001.html.ini b/testing/web-platform/meta/css/css-contain/contain-style-counters-001.html.ini
new file mode 100644
index 000000000000..e28a93330ba9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-style-counters-001.html.ini
@@ -0,0 +1,2 @@
+[contain-style-counters-001.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-style-counters-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-style-counters-002.html.ini
new file mode 100644
index 000000000000..ce5ac5c334da
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-style-counters-002.html.ini
@@ -0,0 +1,2 @@
+[contain-style-counters-002.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-style-counters-003.html.ini b/testing/web-platform/meta/css/css-contain/contain-style-counters-003.html.ini
new file mode 100644
index 000000000000..784277bd5dcc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-style-counters-003.html.ini
@@ -0,0 +1,2 @@
+[contain-style-counters-003.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-style-counters-004.html.ini b/testing/web-platform/meta/css/css-contain/contain-style-counters-004.html.ini
new file mode 100644
index 000000000000..183f5d66b859
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-style-counters-004.html.ini
@@ -0,0 +1,2 @@
+[contain-style-counters-004.html]
+  expected: FAIL
diff --git a/testing/web-platform/meta/css/css-pseudo/idlharness.html.ini b/testing/web-platform/meta/css/css-pseudo/idlharness.html.ini
new file mode 100644
index 000000000000..20c068d71ac1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-pseudo/idlharness.html.ini
@@ -0,0 +1,76 @@
+[idlharness.html]
+  [CSSPseudoElementList interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CSSPseudoElementList must be primary interface of beforeElements]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: beforeElements must inherit property "item(unsigned long)" with the proper type]
+    expected: FAIL
+
+  [CSSPseudoElementList interface object length]
+    expected: FAIL
+
+  [idl_test setup]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: beforeElements must inherit property "getByType(CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CSSPseudoElement interface: beforeElements.item(0) must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [Stringification of beforeElements]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: calling getByType(CSSOMString) on beforeElements with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Window interface: operation getPseudoElements(Element, CSSOMString)]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: beforeElements must inherit property "length" with the proper type]
+    expected: FAIL
+
+  [Window interface: window must inherit property "getPseudoElements(Element, CSSOMString)" with the proper type]
+    expected: FAIL
+
+  [Stringification of beforeElements.item(0)]
+    expected: FAIL
+
+  [Window interface: calling getPseudoElements(Element, CSSOMString) on window with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: operation getByType(CSSOMString)]
+    expected: FAIL
+
+  [CSSPseudoElementList interface object name]
+    expected: FAIL
+
+  [CSSPseudoElement interface: beforeElements.item(0) must inherit property "style" with the proper type]
+    expected: FAIL
+
+  [CSSPseudoElement must be primary interface of beforeElements.item(0)]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: operation item(unsigned long)]
+    expected: FAIL
+
+  [CSSPseudoElement interface: attribute style]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: attribute length]
+    expected: FAIL
+
+  [CSSPseudoElementList interface: calling item(unsigned long) on beforeElements with too few arguments must throw TypeError]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/css/css-typed-om/interfaces.html.ini b/testing/web-platform/meta/css/css-typed-om/interfaces.html.ini
index 9784ff1fb5b4..87c25ffdf1c2 100644
--- a/testing/web-platform/meta/css/css-typed-om/interfaces.html.ini
+++ b/testing/web-platform/meta/css/css-typed-om/interfaces.html.ini
@@ -854,3 +854,663 @@
   [CSSNumericValue interface: operation parse(USVString)]
     expected: FAIL
 
+  [StylePropertyMap interface: styleMap must inherit property "set(USVString, [object Object\],[object Object\])" with the proper type]
+    expected: FAIL
+
+  [Stringification of matrix]
+    expected: FAIL
+
+  [CSSRotate interface: rotate must inherit property "z" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "div(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation em(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "add(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSMathClamp interface object name]
+    expected: FAIL
+
+  [CSSMathSum must be primary interface of mathSum]
+    expected: FAIL
+
+  [Stringification of scale]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: calling getAll(USVString) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSPerspective interface: perspective must inherit property "length" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation kHz(double)]
+    expected: FAIL
+
+  [CSS interface: operation ch(double)]
+    expected: FAIL
+
+  [CSS interface: operation vmax(double)]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: calling has(USVString) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSMathClamp interface object length]
+    expected: FAIL
+
+  [CSSStyleValue interface: unitValue must inherit property "parse(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: calling forEach(function, any) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSSkewY interface: skewY must inherit property "ay" with the proper type]
+    expected: FAIL
+
+  [Stringification of skewY]
+    expected: FAIL
+
+  [CSSUnitValue must be primary interface of unitValue]
+    expected: FAIL
+
+  [CSSScale interface: scale must inherit property "x" with the proper type]
+    expected: FAIL
+
+  [Stringification of perspective]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling to(USVString) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation dppx(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling equals(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling div(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation vh(double)]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "has(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling parse(USVString) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "parse(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skew must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parseAll(USVString, USVString) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "entries()" with the proper type]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parse(USVString, USVString) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parseAll(USVString, USVString) on transformValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "toSum(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling sub(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of mathSum]
+    expected: FAIL
+
+  [CSS interface: operation Q(double)]
+    expected: FAIL
+
+  [CSSTransformValue interface: calling forEach(function, any) on transformValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skewY must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation percent(double)]
+    expected: FAIL
+
+  [CSS interface: operation ic(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "sub(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSRotate must be primary interface of rotate]
+    expected: FAIL
+
+  [CSSSkew interface: skew must inherit property "ax" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "div(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMap interface: calling append(USVString, [object Object\],[object Object\]) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation number(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "type()" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "to(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling parse(USVString) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSMathClamp interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [CSSMathClamp interface: attribute min]
+    expected: FAIL
+
+  [CSS interface: operation px(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling add(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "sub(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "getAll(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling equals(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling mul(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation pt(double)]
+    expected: FAIL
+
+  [StylePropertyMap interface: styleMap must inherit property "clear()" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: rotate must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSTranslate interface: transformValue[0\] must inherit property "z" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation vb(double)]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "values()" with the proper type]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "length" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation rlh(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling max(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling mul(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation pc(double)]
+    expected: FAIL
+
+  [CSSStyleValue interface: transformValue must inherit property "parse(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSMathValue interface: mathSum must inherit property "operator" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "add(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation lh(double)]
+    expected: FAIL
+
+  [Stringification of rotate]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "type()" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation vmin(double)]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skewX must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSSTransformValue must be primary interface of transformValue]
+    expected: FAIL
+
+  [CSS interface: operation rad(double)]
+    expected: FAIL
+
+  [Stringification of skew]
+    expected: FAIL
+
+  [CSSMathClamp interface: attribute max]
+    expected: FAIL
+
+  [Stringification of transformValue]
+    expected: FAIL
+
+  [StylePropertyMap must be primary interface of styleMap]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "toSum(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSSkewX interface: skewX must inherit property "ax" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "values()" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation s(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "equals(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSTranslate interface: transformValue[0\] must inherit property "y" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling add(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformComponent interface: perspective must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: matrix must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation deg(double)]
+    expected: FAIL
+
+  [StylePropertyMap interface: calling set(USVString, [object Object\],[object Object\]) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation vw(double)]
+    expected: FAIL
+
+  [CSSTransformComponent interface: rotate must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling div(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSScale interface: scale must inherit property "z" with the proper type]
+    expected: FAIL
+
+  [SVGElement interface: attribute attributeStyleMap]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "entries()" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling toSum(USVString) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSMathClamp interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [CSS interface: operation ms(double)]
+    expected: FAIL
+
+  [Stringification of unitValue]
+    expected: FAIL
+
+  [CSSStyleValue interface: transformValue must inherit property "parseAll(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation rem(double)]
+    expected: FAIL
+
+  [HTMLElement interface: attribute attributeStyleMap]
+    expected: FAIL
+
+  [CSSSkewY must be primary interface of skewY]
+    expected: FAIL
+
+  [CSSStyleValue interface: unitValue must inherit property "parseAll(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "max(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: matrix must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "to(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "keys()" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "parse(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSMathClamp interface: attribute val]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parse(USVString, USVString) on transformValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of skewX]
+    expected: FAIL
+
+  [CSS interface: operation grad(double)]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "forEach(function, any)" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMap interface: calling delete(USVString) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSUnitValue interface: unitValue must inherit property "value" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skewX must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "forEach(function, any)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation fr(double)]
+    expected: FAIL
+
+  [CSSTransformComponent interface: scale must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: perspective must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "min(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSPerspective must be primary interface of perspective]
+    expected: FAIL
+
+  [CSSTransformComponent interface: scale must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [Stringification of styleMap]
+    expected: FAIL
+
+  [CSSMathClamp interface: existence and properties of interface object]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling min(CSSNumberish) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation cm(double)]
+    expected: FAIL
+
+  [CSSTransformValue interface: transformValue must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation vi(double)]
+    expected: FAIL
+
+  [CSSStyleValue interface: mathSum must inherit property "parse(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSSkewX must be primary interface of skewX]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: calling get(USVString) on styleMap with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSRotate interface: rotate must inherit property "angle" with the proper type]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parseAll(USVString, USVString) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "mul(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation in(double)]
+    expected: FAIL
+
+  [CSSSkew interface: skew must inherit property "ay" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation Hz(double)]
+    expected: FAIL
+
+  [CSSScale interface: scale must inherit property "y" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "mul(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "max(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSSMathClamp interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [CSS interface: operation mm(double)]
+    expected: FAIL
+
+  [CSSRotate interface: rotate must inherit property "x" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: unitValue must inherit property "equals(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "get(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSTransformComponent interface: transformValue[0\] must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [CSSTranslate interface: transformValue[0\] must inherit property "x" with the proper type]
+    expected: FAIL
+
+  [CSSUnitValue interface: unitValue must inherit property "unit" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "keys()" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMap interface: styleMap must inherit property "append(USVString, [object Object\],[object Object\])" with the proper type]
+    expected: FAIL
+
+  [CSSTranslate must be primary interface of transformValue[0\]]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling to(USVString) on unitValue with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling sub(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling toSum(USVString) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSS interface: operation ex(double)]
+    expected: FAIL
+
+  [CSSMatrixComponent must be primary interface of matrix]
+    expected: FAIL
+
+  [StylePropertyMapReadOnly interface: styleMap must inherit property "size" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling min(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skew must inherit property "toMatrix()" with the proper type]
+    expected: FAIL
+
+  [StylePropertyMap interface: styleMap must inherit property "delete(USVString)" with the proper type]
+    expected: FAIL
+
+  [CSSRotate interface: rotate must inherit property "y" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation turn(double)]
+    expected: FAIL
+
+  [CSSNumericValue interface: calling max(CSSNumberish) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSStyleValue interface: calling parse(USVString, USVString) on mathSum with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [CSSTransformComponent interface: transformValue[0\] must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSSkew must be primary interface of skew]
+    expected: FAIL
+
+  [CSSTransformComponent interface: skewY must inherit property "is2D" with the proper type]
+    expected: FAIL
+
+  [CSSScale must be primary interface of scale]
+    expected: FAIL
+
+  [CSSStyleValue interface: mathSum must inherit property "parseAll(USVString, USVString)" with the proper type]
+    expected: FAIL
+
+  [Stringification of transformValue[0\]]
+    expected: FAIL
+
+  [CSS interface: operation dpcm(double)]
+    expected: FAIL
+
+  [CSSMatrixComponent interface: matrix must inherit property "matrix" with the proper type]
+    expected: FAIL
+
+  [CSSMathSum interface: mathSum must inherit property "values" with the proper type]
+    expected: FAIL
+
+  [CSSNumericValue interface: mathSum must inherit property "min(CSSNumberish)" with the proper type]
+    expected: FAIL
+
+  [CSS interface: operation dpi(double)]
+    expected: FAIL
+
+  [CSS namespace: operation percent(double)]
+    expected: FAIL
+
+  [CSS namespace: operation ex(double)]
+    expected: FAIL
+
+  [CSS namespace: operation number(double)]
+    expected: FAIL
+
+  [CSS namespace: operation fr(double)]
+    expected: FAIL
+
+  [CSS namespace: operation Q(double)]
+    expected: FAIL
+
+  [CSS namespace: operation dpcm(double)]
+    expected: FAIL
+
+  [CSS namespace: operation Hz(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vb(double)]
+    expected: FAIL
+
+  [CSS namespace: operation kHz(double)]
+    expected: FAIL
+
+  [CSS namespace: operation deg(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vw(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vi(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vmin(double)]
+    expected: FAIL
+
+  [CSS namespace: operation dppx(double)]
+    expected: FAIL
+
+  [CSS namespace: operation lh(double)]
+    expected: FAIL
+
+  [CSS namespace: operation ch(double)]
+    expected: FAIL
+
+  [CSS namespace: operation ms(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vmax(double)]
+    expected: FAIL
+
+  [CSS namespace: operation in(double)]
+    expected: FAIL
+
+  [CSS namespace: operation vh(double)]
+    expected: FAIL
+
+  [CSS namespace: operation s(double)]
+    expected: FAIL
+
+  [CSS namespace: operation pt(double)]
+    expected: FAIL
+
+  [CSS namespace: operation rad(double)]
+    expected: FAIL
+
+  [CSS namespace: operation em(double)]
+    expected: FAIL
+
+  [CSS namespace: operation px(double)]
+    expected: FAIL
+
+  [CSS namespace: operation dpi(double)]
+    expected: FAIL
+
+  [CSS namespace: operation cm(double)]
+    expected: FAIL
+
+  [CSS namespace: operation rlh(double)]
+    expected: FAIL
+
+  [CSS namespace: operation pc(double)]
+    expected: FAIL
+
+  [CSS namespace: operation grad(double)]
+    expected: FAIL
+
+  [CSS namespace: operation turn(double)]
+    expected: FAIL
+
+  [CSS namespace: operation ic(double)]
+    expected: FAIL
+
+  [CSS namespace: operation rem(double)]
+    expected: FAIL
+
+  [CSS namespace: operation mm(double)]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/domparsing/interfaces.any.js.ini b/testing/web-platform/meta/domparsing/interfaces.any.js.ini
index 2ffd82aaf071..58633f155ede 100644
--- a/testing/web-platform/meta/domparsing/interfaces.any.js.ini
+++ b/testing/web-platform/meta/domparsing/interfaces.any.js.ini
@@ -2,3 +2,35 @@
   [Text interface: attribute serializeAsCDATA]
     expected: FAIL
 
+
+[interfaces.any.worker.html]
+  [Element interface: document.createElement("div") must not have property "innerHTML"]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must not have property "insertAdjacentHTML"]
+    expected: FAIL
+
+  [Stringification of new XMLSerializer()]
+    expected: FAIL
+
+  [Stringification of new DOMParser()]
+    expected: FAIL
+
+  [XMLSerializer must be primary interface of new XMLSerializer()]
+    expected: FAIL
+
+  [XMLSerializer interface: new XMLSerializer() must not have property "serializeToString"]
+    expected: FAIL
+
+  [DOMParser interface: new DOMParser() must not have property "parseFromString"]
+    expected: FAIL
+
+  [Range interface: new Range() must not have property "createContextualFragment"]
+    expected: FAIL
+
+  [Element interface: document.createElement("div") must not have property "outerHTML"]
+    expected: FAIL
+
+  [DOMParser must be primary interface of new DOMParser()]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/encoding/idlharness.any.js.ini b/testing/web-platform/meta/encoding/idlharness.any.js.ini
index 0127100ababc..324fb7aa35c1 100644
--- a/testing/web-platform/meta/encoding/idlharness.any.js.ini
+++ b/testing/web-platform/meta/encoding/idlharness.any.js.ini
@@ -1,26 +1,2 @@
-[idlharness.any.html]
-  [TextDecoder interface: attribute ignoreBOM]
-    expected: FAIL
-
-  [TextDecoder interface: new TextDecoder() must inherit property "ignoreBOM" with the proper type]
-    expected: FAIL
-
-
-[idlharness.any.worker.html]
-  [TextDecoder interface: attribute ignoreBOM]
-    expected: FAIL
-
-  [TextDecoder interface: new TextDecoder() must inherit property "ignoreBOM" with the proper type]
-    expected: FAIL
-
-
 [idlharness.https.any.serviceworker.html]
   expected: TIMEOUT
-
-[idlharness.any.sharedworker.html]
-  [TextDecoder interface: attribute ignoreBOM]
-    expected: FAIL
-
-  [TextDecoder interface: new TextDecoder() must inherit property "ignoreBOM" with the proper type]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/encoding/textdecoder-ignorebom.any.js.ini b/testing/web-platform/meta/encoding/textdecoder-ignorebom.any.js.ini
deleted file mode 100644
index 8bd17c89f3ef..000000000000
--- a/testing/web-platform/meta/encoding/textdecoder-ignorebom.any.js.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-[textdecoder-ignorebom.any.html]
-  [BOM is ignored if ignoreBOM option is specified: utf-8]
-    expected: FAIL
-
-  [BOM is ignored if ignoreBOM option is specified: utf-16le]
-    expected: FAIL
-
-  [BOM is ignored if ignoreBOM option is specified: utf-16be]
-    expected: FAIL
-
-  [The ignoreBOM attribute of TextDecoder]
-    expected: FAIL
-
-
-[textdecoder-ignorebom.any.worker.html]
-  [BOM is ignored if ignoreBOM option is specified: utf-8]
-    expected: FAIL
-
-  [BOM is ignored if ignoreBOM option is specified: utf-16le]
-    expected: FAIL
-
-  [BOM is ignored if ignoreBOM option is specified: utf-16be]
-    expected: FAIL
-
-  [The ignoreBOM attribute of TextDecoder]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/hr-time/idlharness.any.js.ini b/testing/web-platform/meta/hr-time/idlharness.any.js.ini
new file mode 100644
index 000000000000..2b3f19640d4f
--- /dev/null
+++ b/testing/web-platform/meta/hr-time/idlharness.any.js.ini
@@ -0,0 +1,32 @@
+[idlharness.any.worker.html]
+  [Test default toJSON operation of Performance]
+    expected: FAIL
+
+  [Performance interface: operation toJSON()]
+    expected: FAIL
+
+  [Performance interface: performance must inherit property "toJSON()" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: attribute performance]
+    expected: FAIL
+
+
+[idlharness.any.sharedworker.html]
+  [Test default toJSON operation of Performance]
+    expected: FAIL
+
+  [Performance interface: operation toJSON()]
+    expected: FAIL
+
+  [Performance interface: performance must inherit property "toJSON()" with the proper type]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: attribute performance]
+    expected: FAIL
+
+
+[idlharness.any.html]
+
+[idlharness.https.any.serviceworker.html]
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/html-media-capture/idlharness.window.js.ini b/testing/web-platform/meta/html-media-capture/idlharness.window.js.ini
new file mode 100644
index 000000000000..544bcd28eeb8
--- /dev/null
+++ b/testing/web-platform/meta/html-media-capture/idlharness.window.js.ini
@@ -0,0 +1,7 @@
+[idlharness.window.html]
+  [HTMLInputElement interface: input must inherit property "capture" with the proper type]
+    expected: FAIL
+
+  [HTMLInputElement interface: attribute capture]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/dom/interfaces.https.html.ini b/testing/web-platform/meta/html/dom/interfaces.https.html.ini
index de04c8eb90f2..acf9ef3d2e20 100644
--- a/testing/web-platform/meta/html/dom/interfaces.https.html.ini
+++ b/testing/web-platform/meta/html/dom/interfaces.https.html.ini
@@ -353,6 +353,15 @@
   [Window interface: operation postMessage(any, [object Object\], WindowPostMessageOptions)]
     expected: FAIL
 
+  [html interfaces]
+    expected: FAIL
+
+  [Partial interface Document[2\]: original interface defined]
+    expected: FAIL
+
+  [Partial interface Document: original interface defined]
+    expected: FAIL
+
 
 [interfaces.https.html?include=HTML.*]
   [HTMLAllCollection interface: operation item(DOMString)]
@@ -793,6 +802,15 @@
   [HTMLFrameSetElement interface: document.createElement("frameset") must inherit property "onunhandledrejection" with the proper type]
     expected: FAIL
 
+  [html interfaces]
+    expected: FAIL
+
+  [Partial interface Document[2\]: original interface defined]
+    expected: FAIL
+
+  [Partial interface Document: original interface defined]
+    expected: FAIL
+
 
 [interfaces.https.html?exclude=(Document|Window|HTML.*)]
   [AudioTrackList interface: existence and properties of interface object]
@@ -1425,3 +1443,12 @@
   [SVGElement interface: attribute oncancel]
     expected: FAIL
 
+  [html interfaces]
+    expected: FAIL
+
+  [Partial interface Document[2\]: original interface defined]
+    expected: FAIL
+
+  [Partial interface Document: original interface defined]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/html/dom/reflection-embedded.html.ini b/testing/web-platform/meta/html/dom/reflection-embedded.html.ini
index e5f1b4a76f62..199cf60116c2 100644
--- a/testing/web-platform/meta/html/dom/reflection-embedded.html.ini
+++ b/testing/web-platform/meta/html/dom/reflection-embedded.html.ini
@@ -1058,183 +1058,3 @@
   [iframe.delegateStickyUserActivation: IDL set to "MEDIA"]
     expected: FAIL
 
-  [img.decoding: typeof IDL attribute]
-    expected: FAIL
-
-  [img.decoding: IDL get with DOM attribute unset]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to ""]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to undefined]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to 7]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to 1.5]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to true]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to false]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to object "[object Object\]"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to NaN]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to Infinity]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to -Infinity]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "\\0"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to null]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to object "test-toString"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to object "test-valueOf"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "async"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "xasync"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "async\\0"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "ASYNC"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "sync"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "xsync"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "sync\\0"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "ync"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "SYNC"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "auto"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "xauto"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "auto\\0"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "uto"]
-    expected: FAIL
-
-  [img.decoding: setAttribute() to "AUTO"]
-    expected: FAIL
-
-  [img.decoding: IDL set to ""]
-    expected: FAIL
-
-  [img.decoding: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo "]
-    expected: FAIL
-
-  [img.decoding: IDL set to undefined]
-    expected: FAIL
-
-  [img.decoding: IDL set to 7]
-    expected: FAIL
-
-  [img.decoding: IDL set to 1.5]
-    expected: FAIL
-
-  [img.decoding: IDL set to true]
-    expected: FAIL
-
-  [img.decoding: IDL set to false]
-    expected: FAIL
-
-  [img.decoding: IDL set to object "[object Object\]"]
-    expected: FAIL
-
-  [img.decoding: IDL set to NaN]
-    expected: FAIL
-
-  [img.decoding: IDL set to Infinity]
-    expected: FAIL
-
-  [img.decoding: IDL set to -Infinity]
-    expected: FAIL
-
-  [img.decoding: IDL set to "\\0"]
-    expected: FAIL
-
-  [img.decoding: IDL set to null]
-    expected: FAIL
-
-  [img.decoding: IDL set to object "test-toString"]
-    expected: FAIL
-
-  [img.decoding: IDL set to object "test-valueOf"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "async"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "xasync"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "async\\0"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "ASYNC"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "sync"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "xsync"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "sync\\0"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "ync"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "SYNC"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "auto"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "xauto"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "auto\\0"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "uto"]
-    expected: FAIL
-
-  [img.decoding: IDL set to "AUTO"]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/intersection-observer/idlharness.window.js.ini b/testing/web-platform/meta/intersection-observer/idlharness.window.js.ini
new file mode 100644
index 000000000000..de739eb405e7
--- /dev/null
+++ b/testing/web-platform/meta/intersection-observer/idlharness.window.js.ini
@@ -0,0 +1,7 @@
+[idlharness.window.html]
+  [IntersectionObserverEntry interface object length]
+    expected: FAIL
+
+  [IntersectionObserver interface: observer must inherit property "thresholds" with the proper type]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mediacapture-streams/MediaStream-removetrack.https.html.ini b/testing/web-platform/meta/mediacapture-streams/MediaStream-removetrack.https.html.ini
new file mode 100644
index 000000000000..8495efb15305
--- /dev/null
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStream-removetrack.https.html.ini
@@ -0,0 +1,4 @@
+[MediaStream-removetrack.https.html]
+  [Test that removal from a MediaStream fires ended on media elements (audio first)]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/mozilla-sync b/testing/web-platform/meta/mozilla-sync
index ceab5e5b767f..6e542c3af291 100644
--- a/testing/web-platform/meta/mozilla-sync
+++ b/testing/web-platform/meta/mozilla-sync
@@ -1,2 +1,2 @@
-local: 6e9e1e49494c58bb1b7b031f7c073e88f7ee04f1
-upstream: ec8570ebda567074ecd4982253f46931be5eb03b
+local: 767d1527dae2e181dd52d3073b8e6ab488d09f66
+upstream: 41c5a5ec588f4e0e7b31ee9964831712848d8b44
diff --git a/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini b/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini
new file mode 100644
index 000000000000..7cc9f63cd828
--- /dev/null
+++ b/testing/web-platform/meta/navigation-timing/nav2_test_document_open.html.ini
@@ -0,0 +1,5 @@
+[nav2_test_document_open.html]
+  [Navigation Timing 2 WPT]
+    expected:
+      if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+
diff --git a/testing/web-platform/meta/notifications/idlharness.any.js.ini b/testing/web-platform/meta/notifications/idlharness.any.js.ini
new file mode 100644
index 000000000000..fc3b85b6fccb
--- /dev/null
+++ b/testing/web-platform/meta/notifications/idlharness.any.js.ini
@@ -0,0 +1,188 @@
+[idlharness.any.html]
+  [Notification interface: attribute silent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "image" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute actions]
+    expected: FAIL
+
+  [Notification interface: attribute timestamp]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "notification"]
+    expected: FAIL
+
+  [Stringification of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "vibrate" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute image]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "renotify" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute renotify]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "action"]
+    expected: FAIL
+
+  [Notification interface: attribute badge]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "actions" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "silent" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "badge" with the proper type]
+    expected: FAIL
+
+  [idlharness]
+    expected: FAIL
+
+  [NotificationEvent must be primary interface of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: attribute maxActions]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "timestamp" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute vibrate]
+    expected: FAIL
+
+
+[idlharness.any.worker.html]
+  [Notification interface: attribute silent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "image" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute actions]
+    expected: FAIL
+
+  [Notification interface: attribute timestamp]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "notification"]
+    expected: FAIL
+
+  [Stringification of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "vibrate" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute image]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "renotify" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute renotify]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "action"]
+    expected: FAIL
+
+  [Notification interface: attribute badge]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "actions" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "silent" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "badge" with the proper type]
+    expected: FAIL
+
+  [idlharness]
+    expected: FAIL
+
+  [NotificationEvent must be primary interface of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: attribute maxActions]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "timestamp" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute vibrate]
+    expected: FAIL
+
+
+[idlharness.any.sharedworker.html]
+  [Notification interface: attribute silent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "image" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute actions]
+    expected: FAIL
+
+  [Notification interface: attribute timestamp]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "notification"]
+    expected: FAIL
+
+  [Stringification of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "vibrate" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute image]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "renotify" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute renotify]
+    expected: FAIL
+
+  [NotificationEvent interface: notificationEvent must not have property "action"]
+    expected: FAIL
+
+  [Notification interface: attribute badge]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "actions" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "silent" with the proper type]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "badge" with the proper type]
+    expected: FAIL
+
+  [idlharness]
+    expected: FAIL
+
+  [NotificationEvent must be primary interface of notificationEvent]
+    expected: FAIL
+
+  [Notification interface: attribute maxActions]
+    expected: FAIL
+
+  [Notification interface: notification must inherit property "timestamp" with the proper type]
+    expected: FAIL
+
+  [Notification interface: attribute vibrate]
+    expected: FAIL
+
+
+[idlharness.https.any.serviceworker.html]
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini
new file mode 100644
index 000000000000..88de93d55b67
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm.ini
@@ -0,0 +1,4 @@
+[insertNodeIntoSelection.htm]
+  [HTML5 Selection: Insert a new element and text node into an element that is currently selected]
+    expected:
+      if os == "win": FAIL
diff --git a/testing/web-platform/meta/old-tests/submission/Microsoft/selection/select.htm.ini b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/select.htm.ini
new file mode 100644
index 000000000000..ddab2850fb69
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/select.htm.ini
@@ -0,0 +1,4 @@
+[select.htm]
+  [HTML5 Selection: Call select() on a text field]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini
new file mode 100644
index 000000000000..3945a8931de5
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/selectionStartEnd.htm.ini
@@ -0,0 +1,4 @@
+[selectionStartEnd.htm]
+  [HTML5 Selection: Set selectionStart and selectionEnd on a text field]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini
new file mode 100644
index 000000000000..74de8ad6cb1e
--- /dev/null
+++ b/testing/web-platform/meta/old-tests/submission/Microsoft/selection/setSelectionRange.htm.ini
@@ -0,0 +1,4 @@
+[setSelectionRange.htm]
+  [HTML5 Selection: Call setSelectionRange() on a text field]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/payment-handler/idlharness.https.any.js.ini b/testing/web-platform/meta/payment-handler/idlharness.https.any.js.ini
index b01a987bc4de..09ee922a0696 100644
--- a/testing/web-platform/meta/payment-handler/idlharness.https.any.js.ini
+++ b/testing/web-platform/meta/payment-handler/idlharness.https.any.js.ini
@@ -1,88 +1,47 @@
-[idlharness.https.any.html]
-  [PaymentManager interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentManager interface object length]
-    expected: FAIL
-
-  [PaymentManager interface object name]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PaymentManager interface: attribute instruments]
-    expected: FAIL
-
-  [PaymentManager interface: operation requestPermission()]
-    expected: FAIL
-
-  [PaymentManager interface: attribute userHint]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentInstruments interface object length]
-    expected: FAIL
-
-  [PaymentInstruments interface object name]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
+[idlharness.https.any.sharedworker.html]
   [PaymentInstruments interface: operation delete(DOMString)]
     expected: FAIL
 
-  [PaymentInstruments interface: operation get(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation keys()]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation has(DOMString)]
-    expected: FAIL
-
   [PaymentInstruments interface: operation set(DOMString, PaymentInstrument)]
     expected: FAIL
 
-  [PaymentInstruments interface: operation clear()]
+  [PaymentManager interface: attribute userHint]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
   [ServiceWorkerRegistration interface: attribute paymentManager]
     expected: FAIL
 
-
-[idlharness.https.any.worker.html]
-  [PaymentManager interface: existence and properties of interface object]
-    expected: FAIL
-
   [PaymentManager interface object length]
     expected: FAIL
 
-  [PaymentManager interface object name]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
-  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
+  [PaymentManager interface object name]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation get(DOMString)]
+    expected: FAIL
+
+  [PaymentInstruments interface object name]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation has(DOMString)]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation clear()]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface object]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
   [PaymentManager interface: attribute instruments]
@@ -91,45 +50,220 @@
   [PaymentManager interface: member requestPermission]
     expected: FAIL
 
-  [PaymentManager interface: attribute userHint]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface object]
-    expected: FAIL
-
   [PaymentInstruments interface object length]
     expected: FAIL
 
-  [PaymentInstruments interface object name]
+  [PaymentManager interface: existence and properties of interface prototype object]
     expected: FAIL
 
   [PaymentInstruments interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
+  [PaymentInstruments interface: operation keys()]
     expected: FAIL
 
-  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
+  [PaymentManager interface: existence and properties of interface object]
+    expected: FAIL
+
+
+[idlharness.https.any.worker.html]
+  [idlharness]
     expected: FAIL
 
   [PaymentInstruments interface: operation delete(DOMString)]
     expected: FAIL
 
-  [PaymentInstruments interface: operation get(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation keys()]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation has(DOMString)]
-    expected: FAIL
-
   [PaymentInstruments interface: operation set(DOMString, PaymentInstrument)]
     expected: FAIL
 
-  [PaymentInstruments interface: operation clear()]
+  [PaymentManager interface: attribute userHint]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
   [ServiceWorkerRegistration interface: attribute paymentManager]
     expected: FAIL
 
+  [PaymentManager interface object length]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [PaymentManager interface object name]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation get(DOMString)]
+    expected: FAIL
+
+  [PaymentInstruments interface object name]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation has(DOMString)]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation clear()]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface object]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [PaymentManager interface: attribute instruments]
+    expected: FAIL
+
+  [PaymentManager interface: member requestPermission]
+    expected: FAIL
+
+  [PaymentInstruments interface object length]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation keys()]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface object]
+    expected: FAIL
+
+
+[idlharness.https.any.html]
+  [idlharness]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation delete(DOMString)]
+    expected: FAIL
+
+  [PaymentManager interface: paymentManager must inherit property "instruments" with the proper type]
+    expected: FAIL
+
+  [PaymentInstruments interface: calling delete(DOMString) on instruments with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "delete(DOMString)" with the proper type]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "get(DOMString)" with the proper type]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "clear()" with the proper type]
+    expected: FAIL
+
+  [idl_test setup]
+    expected: FAIL
+
+  [Stringification of instruments]
+    expected: FAIL
+
+  [PaymentInstruments interface: calling has(DOMString) on instruments with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [PaymentManager interface: attribute userHint]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "has(DOMString)" with the proper type]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation set(DOMString, PaymentInstrument)]
+    expected: FAIL
+
+  [PaymentManager interface object length]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [PaymentInstruments interface: calling get(DOMString) on instruments with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [PaymentManager interface object name]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation get(DOMString)]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "set(DOMString, PaymentInstrument)" with the proper type]
+    expected: FAIL
+
+  [PaymentInstruments interface object name]
+    expected: FAIL
+
+  [PaymentManager interface: paymentManager must inherit property "userHint" with the proper type]
+    expected: FAIL
+
+  [Stringification of paymentManager]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation has(DOMString)]
+    expected: FAIL
+
+  [PaymentManager must be primary interface of paymentManager]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation clear()]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface object]
+    expected: FAIL
+
+  [PaymentInstruments must be primary interface of instruments]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: registration must inherit property "paymentManager" with the proper type]
+    expected: FAIL
+
+  [ServiceWorkerRegistration interface: attribute paymentManager]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [PaymentInstruments interface: instruments must inherit property "keys()" with the proper type]
+    expected: FAIL
+
+  [PaymentManager interface: attribute instruments]
+    expected: FAIL
+
+  [PaymentInstruments interface object length]
+    expected: FAIL
+
+  [PaymentManager interface: operation requestPermission()]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [PaymentManager interface: paymentManager must inherit property "requestPermission()" with the proper type]
+    expected: FAIL
+
+  [PaymentInstruments interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [PaymentInstruments interface: operation keys()]
+    expected: FAIL
+
+  [PaymentInstruments interface: calling set(DOMString, PaymentInstrument) on instruments with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [PaymentManager interface: existence and properties of interface object]
+    expected: FAIL
+
+
+[idlharness.https.any.serviceworker.html]
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/payment-handler/interfaces.https.any.js.ini b/testing/web-platform/meta/payment-handler/interfaces.https.any.js.ini
deleted file mode 100644
index 519e3e7ef8db..000000000000
--- a/testing/web-platform/meta/payment-handler/interfaces.https.any.js.ini
+++ /dev/null
@@ -1,147 +0,0 @@
-[interfaces.https.any.html]
-  [PaymentManager interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentManager interface object length]
-    expected: FAIL
-
-  [PaymentManager interface object name]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PaymentManager interface: attribute instruments]
-    expected: FAIL
-
-  [PaymentManager interface: operation requestPermission()]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentInstruments interface object length]
-    expected: FAIL
-
-  [PaymentInstruments interface object name]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation delete(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation get(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation keys()]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation has(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation set(DOMString, PaymentInstrument)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation clear()]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerRegistration: original interface defined]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerGlobalScope: original interface defined]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerGlobalScope[2\]: original interface defined]
-    expected: FAIL
-
-  [PaymentManager interface: attribute userHint]
-    expected: FAIL
-
-
-[interfaces.https.any.worker.html]
-  [PaymentManager interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentManager interface object length]
-    expected: FAIL
-
-  [PaymentManager interface object name]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentManager interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PaymentManager interface: attribute instruments]
-    expected: FAIL
-
-  [PaymentManager interface: member requestPermission]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface object]
-    expected: FAIL
-
-  [PaymentInstruments interface object length]
-    expected: FAIL
-
-  [PaymentInstruments interface object name]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
-  [PaymentInstruments interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation delete(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation get(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation keys()]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation has(DOMString)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation set(DOMString, PaymentInstrument)]
-    expected: FAIL
-
-  [PaymentInstruments interface: operation clear()]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerRegistration: original interface defined]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerGlobalScope: original interface defined]
-    expected: FAIL
-
-  [Partial interface ServiceWorkerGlobalScope[2\]: original interface defined]
-    expected: FAIL
-
-  [PaymentManager interface: attribute userHint]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/priority-hints/img-attr-named-constructor.tentative.html.ini b/testing/web-platform/meta/priority-hints/img-attr-named-constructor.tentative.html.ini
index 61a0576f8402..0b34420bcb57 100644
--- a/testing/web-platform/meta/priority-hints/img-attr-named-constructor.tentative.html.ini
+++ b/testing/web-platform/meta/priority-hints/img-attr-named-constructor.tentative.html.ini
@@ -1,5 +1,7 @@
 [img-attr-named-constructor.tentative.html]
-  expected: ERROR
   [importance attribute on <img> elements should reflect valid IDL values]
     expected: FAIL
 
+  [importance of new Image() is 'auto']
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/push-api/idlharness.any.js.ini b/testing/web-platform/meta/push-api/idlharness.any.js.ini
new file mode 100644
index 000000000000..c6736c0fe915
--- /dev/null
+++ b/testing/web-platform/meta/push-api/idlharness.any.js.ini
@@ -0,0 +1,47 @@
+[idlharness.any.html]
+  [idlharness]
+    expected: FAIL
+
+  [idl_test setup]
+    expected: FAIL
+
+
+[idlharness.any.worker.html]
+  [idlharness]
+    expected: FAIL
+
+  [PushManager interface object length]
+    expected: FAIL
+
+  [PushSubscription interface: attribute expirationTime]
+    expected: FAIL
+
+  [PushSubscription interface object length]
+    expected: FAIL
+
+  [PushSubscriptionOptions interface: attribute userVisibleOnly]
+    expected: FAIL
+
+  [PushManager interface: attribute supportedContentEncodings]
+    expected: FAIL
+
+
+[idlharness.any.sharedworker.html]
+  [PushManager interface object length]
+    expected: FAIL
+
+  [PushSubscription interface: attribute expirationTime]
+    expected: FAIL
+
+  [PushSubscription interface object length]
+    expected: FAIL
+
+  [PushSubscriptionOptions interface: attribute userVisibleOnly]
+    expected: FAIL
+
+  [PushManager interface: attribute supportedContentEncodings]
+    expected: FAIL
+
+
+[idlharness.https.any.serviceworker.html]
+  expected: TIMEOUT
diff --git a/testing/web-platform/meta/service-workers/service-worker/claim-with-redirect.https.html.ini b/testing/web-platform/meta/service-workers/service-worker/claim-with-redirect.https.html.ini
new file mode 100644
index 000000000000..69453fb183a3
--- /dev/null
+++ b/testing/web-platform/meta/service-workers/service-worker/claim-with-redirect.https.html.ini
@@ -0,0 +1,7 @@
+[claim-with-redirect.https.html]
+  expected:
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+  [Claim works after redirection to another origin]
+    expected:
+      if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
+
diff --git a/testing/web-platform/meta/speech-api/SpeechRecognition-basics.https.html.ini b/testing/web-platform/meta/speech-api/SpeechRecognition-basics.https.html.ini
new file mode 100644
index 000000000000..8676595ab419
--- /dev/null
+++ b/testing/web-platform/meta/speech-api/SpeechRecognition-basics.https.html.ini
@@ -0,0 +1,4 @@
+[SpeechRecognition-basics.https.html]
+  [SpeechRecognition basics]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webmidi/idlharness.window.js.ini b/testing/web-platform/meta/webmidi/idlharness.window.js.ini
new file mode 100644
index 000000000000..ac7bbfd0a909
--- /dev/null
+++ b/testing/web-platform/meta/webmidi/idlharness.window.js.ini
@@ -0,0 +1,250 @@
+[idlharness.window.html]
+  [MIDIAccess interface: attribute outputs]
+    expected: FAIL
+
+  [MIDIInput interface: attribute onmidimessage]
+    expected: FAIL
+
+  [MIDIAccess interface: access must inherit property "outputs" with the proper type]
+    expected: FAIL
+
+  [MIDIPort interface: attribute onstatechange]
+    expected: FAIL
+
+  [Stringification of inputs]
+    expected: FAIL
+
+  [MIDIOutput interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIAccess interface: access must inherit property "onstatechange" with the proper type]
+    expected: FAIL
+
+  [MIDIInputMap interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIMessageEvent interface: attribute data]
+    expected: FAIL
+
+  [Navigator interface: operation requestMIDIAccess(MIDIOptions)]
+    expected: FAIL
+
+  [MIDIMessageEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIOutput interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIPort interface: attribute type]
+    expected: FAIL
+
+  [MIDIPort interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Stringification of new MIDIConnectionEvent("type")]
+    expected: FAIL
+
+  [MIDIAccess interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIMessageEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIPort interface: operation open()]
+    expected: FAIL
+
+  [MIDIOutputMap must be primary interface of outputs]
+    expected: FAIL
+
+  [MIDIOutputMap interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface object length]
+    expected: FAIL
+
+  [MIDIInput interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIPort interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIInputMap must be primary interface of inputs]
+    expected: FAIL
+
+  [MIDIInputMap interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIAccess interface: attribute onstatechange]
+    expected: FAIL
+
+  [MIDIInput interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIInput interface object length]
+    expected: FAIL
+
+  [MIDIAccess interface: attribute inputs]
+    expected: FAIL
+
+  [MIDIInputMap interface object name]
+    expected: FAIL
+
+  [MIDIMessageEvent interface object name]
+    expected: FAIL
+
+  [MIDIAccess interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Stringification of outputs]
+    expected: FAIL
+
+  [MIDIOutputMap interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIAccess interface object name]
+    expected: FAIL
+
+  [MIDIAccess interface object length]
+    expected: FAIL
+
+  [MIDIOutput interface: operation send([object Object\], DOMHighResTimeStamp)]
+    expected: FAIL
+
+  [MIDIPort interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIPort interface object name]
+    expected: FAIL
+
+  [MIDIAccess interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIMessageEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIOutputMap interface object length]
+    expected: FAIL
+
+  [idlharness]
+    expected: FAIL
+
+  [MIDIPort interface: attribute version]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIInputMap interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIOutputMap interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface object name]
+    expected: FAIL
+
+  [MIDIInput interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIAccess interface: access must inherit property "sysexEnabled" with the proper type]
+    expected: FAIL
+
+  [MIDIPort interface: attribute connection]
+    expected: FAIL
+
+  [MIDIOutput interface: operation clear()]
+    expected: FAIL
+
+  [MIDIPort interface: attribute manufacturer]
+    expected: FAIL
+
+  [MIDIAccess interface: access must inherit property "inputs" with the proper type]
+    expected: FAIL
+
+  [MIDIMessageEvent interface object length]
+    expected: FAIL
+
+  [MIDIAccess interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIOutput interface object length]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: new MIDIConnectionEvent("type") must inherit property "port" with the proper type]
+    expected: FAIL
+
+  [MIDIOutputMap interface object name]
+    expected: FAIL
+
+  [MIDIInputMap interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIPort interface object length]
+    expected: FAIL
+
+  [MIDIInput interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIInput interface object name]
+    expected: FAIL
+
+  [Stringification of access]
+    expected: FAIL
+
+  [MIDIAccess must be primary interface of access]
+    expected: FAIL
+
+  [MIDIInputMap interface object length]
+    expected: FAIL
+
+  [MIDIMessageEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIPort interface: operation close()]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: attribute port]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIPort interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [MIDIAccess interface: attribute sysexEnabled]
+    expected: FAIL
+
+  [MIDIOutput interface: existence and properties of interface object]
+    expected: FAIL
+
+  [MIDIPort interface: attribute name]
+    expected: FAIL
+
+  [MIDIConnectionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIOutput interface object name]
+    expected: FAIL
+
+  [MIDIConnectionEvent must be primary interface of new MIDIConnectionEvent("type")]
+    expected: FAIL
+
+  [MIDIPort interface: attribute state]
+    expected: FAIL
+
+  [MIDIOutputMap interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [MIDIOutput interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [MIDIPort interface: attribute id]
+    expected: FAIL
+
+  [idl_test setup]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webrtc/RTCConfiguration-rtcpMuxPolicy.html.ini b/testing/web-platform/meta/webrtc/RTCConfiguration-rtcpMuxPolicy.html.ini
index bbeea661690d..af9735768528 100644
--- a/testing/web-platform/meta/webrtc/RTCConfiguration-rtcpMuxPolicy.html.ini
+++ b/testing/web-platform/meta/webrtc/RTCConfiguration-rtcpMuxPolicy.html.ini
@@ -32,3 +32,9 @@
   [setConfiguration({}) with initial rtcpMuxPolicy negotiate should throw InvalidModificationError]
     expected: FAIL
 
+  [setRemoteDescription throws InvalidAccessError when called with an offer without rtcp-mux and rtcpMuxPolicy is set to require]
+    expected: FAIL
+
+  [setRemoteDescription throws InvalidAccessError when called with an answer without rtcp-mux and rtcpMuxPolicy is set to require]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini b/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini
new file mode 100644
index 000000000000..5f94510016c9
--- /dev/null
+++ b/testing/web-platform/meta/webrtc/idlharness.https.window.js.ini
@@ -0,0 +1,601 @@
+[idlharness.https.window.html]
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "protocol" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "foundation" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "relatedAddress" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute tcpType]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "sdpMLineIndex" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute candidate]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "candidate" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute priority]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onnegotiationneeded" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "sdpMid" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute foundation]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute port]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "setConfiguration(RTCConfiguration)" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "ontrack" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute onicecandidateerror]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "relatedPort" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "usernameFragment" with the proper type]
+    expected: FAIL
+
+  [Stringification of new RTCIceCandidate({ sdpMid: 1 })]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "tcpType" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute usernameFragment]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onsignalingstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute onstatsended]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute ip]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "oniceconnectionstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate must be primary interface of new RTCIceCandidate({ sdpMid: 1 })]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "component" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation getDefaultIceServers()]
+    expected: FAIL
+
+  [RTCSessionDescription interface: attribute type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "toJSON()" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface object length]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute sdpMLineIndex]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation setConfiguration(RTCConfiguration)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onconnectionstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "ip" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute protocol]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onicecandidate" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute component]
+    expected: FAIL
+
+  [Test driver for asyncInitTransports]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute relatedPort]
+    expected: FAIL
+
+  [RTCPeerConnection interface: operation addTrack(MediaStreamTrack, MediaStream)]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "sctp" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onicecandidateerror" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "port" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onstatsended" with the proper type]
+    expected: FAIL
+
+  [RTCSessionDescription interface object length]
+    expected: FAIL
+
+  [RTCSessionDescription interface: attribute sdp]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute sctp]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "ondatachannel" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute sdpMid]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute onconnectionstatechange]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "onicegatheringstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCIceCandidate interface: attribute relatedAddress]
+    expected: FAIL
+
+  [RTCPeerConnection interface: calling setConfiguration(RTCConfiguration) on new RTCPeerConnection() with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCIceCandidate interface: new RTCIceCandidate({ sdpMid: 1 }) must inherit property "priority" with the proper type]
+    expected: FAIL
+
+  [Main test driver]
+    expected: FAIL
+
+  [RTCPeerConnection interface: new RTCPeerConnection() must inherit property "connectionState" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnection interface: attribute connectionState]
+    expected: FAIL
+
+  [idlharness]
+    expected: FAIL
+
+  [RTCRtpTransceiver interface: new RTCPeerConnection().addTransceiver('audio') must inherit property "setCodecPreferences([object Object\])" with the proper type]
+    expected: FAIL
+
+  [RTCSctpTransport interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [RTCIceTransport interface: operation getSelectedCandidatePair()]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [RTCDtlsTransport must be primary interface of idlTestObjects.dtlsTransport]
+    expected: FAIL
+
+  [RTCErrorEvent must be primary interface of new RTCErrorEvent('error')]
+    expected: FAIL
+
+  [RTCSctpTransport interface: idlTestObjects.sctpTransport must inherit property "onstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCRtpSender interface: attribute transport]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCRtpSender interface: operation setStreams(MediaStream)]
+    expected: FAIL
+
+  [RTCErrorEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "ongatheringstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "transport" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "onmessage" with the proper type]
+    expected: FAIL
+
+  [RTCErrorEvent interface: new RTCErrorEvent('error') must inherit property "error" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: attribute errorText]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "onstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCRtpSender interface: attribute rtcpTransport]
+    expected: FAIL
+
+  [RTCDTMFSender interface: attribute canInsertDTMF]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: calling getCapabilities(DOMString) on new RTCPeerConnection().addTransceiver('audio').receiver with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCStatsEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "component" with the proper type]
+    expected: FAIL
+
+  [RTCIceTransport interface object length]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "transport" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "getRemoteParameters()" with the proper type]
+    expected: FAIL
+
+  [RTCRtpTransceiver interface: calling setCodecPreferences([object Object\]) on new RTCPeerConnection().addTransceiver('audio') with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCDtlsTransport interface object name]
+    expected: FAIL
+
+  [RTCRtpSender interface: operation setParameters(RTCRtpSendParameters)]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute gatheringState]
+    expected: FAIL
+
+  [RTCErrorEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: operation getCapabilities(DOMString)]
+    expected: FAIL
+
+  [RTCSctpTransport interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [RTCRtpSender interface: calling setStreams(MediaStream) on new RTCPeerConnection().addTransceiver('audio').sender with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "onselectedcandidatepairchange" with the proper type]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "priority" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface object name]
+    expected: FAIL
+
+  [RTCDataChannel interface: attribute priority]
+    expected: FAIL
+
+  [RTCIceTransport must be primary interface of idlTestObjects.iceTransport]
+    expected: FAIL
+
+  [RTCPeerConnectionIceEvent interface: new RTCPeerConnectionIceEvent('ice') must inherit property "url" with the proper type]
+    expected: FAIL
+
+  [RTCErrorEvent interface object length]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 }); must inherit property "url" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface object length]
+    expected: FAIL
+
+  [RTCSctpTransport interface: idlTestObjects.sctpTransport must inherit property "maxChannels" with the proper type]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "onclose" with the proper type]
+    expected: FAIL
+
+  [RTCSctpTransport interface: attribute transport]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "getRemoteCertificates()" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "state" with the proper type]
+    expected: FAIL
+
+  [RTCRtpSender interface: calling getCapabilities(DOMString) on new RTCPeerConnection().addTransceiver('audio').sender with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCRtpSender interface: operation getCapabilities(DOMString)]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 }); must inherit property "errorText" with the proper type]
+    expected: FAIL
+
+  [RTCDataChannel interface: attribute negotiated]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: attribute transport]
+    expected: FAIL
+
+  [Stringification of new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 });]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "getLocalParameters()" with the proper type]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "onopen" with the proper type]
+    expected: FAIL
+
+  [RTCSctpTransport interface: attribute onstatechange]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute state]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "onstatechange" with the proper type]
+    expected: FAIL
+
+  [RTCSctpTransport interface object name]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "onbufferedamountlow" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "transport" with the proper type]
+    expected: FAIL
+
+  [RTCErrorEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [RTCSctpTransport interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [RTCStatsEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCIceTransport interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Stringification of idlTestObjects.dtlsTransport]
+    expected: FAIL
+
+  [RTCCertificate interface: idlTestObjects.certificate must inherit property "getFingerprints()" with the proper type]
+    expected: FAIL
+
+  [RTCSctpTransport interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "getSelectedCandidatePair()" with the proper type]
+    expected: FAIL
+
+  [RTCErrorEvent interface: attribute error]
+    expected: FAIL
+
+  [RTCIceTransport interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Stringification of new RTCErrorEvent('error')]
+    expected: FAIL
+
+  [RTCCertificate interface: operation getFingerprints()]
+    expected: FAIL
+
+  [RTCSctpTransport interface: attribute state]
+    expected: FAIL
+
+  [RTCSctpTransport interface: attribute maxChannels]
+    expected: FAIL
+
+  [RTCIceTransport interface: operation getLocalParameters()]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute ongatheringstatechange]
+    expected: FAIL
+
+  [RTCSctpTransport interface: attribute maxMessageSize]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "getParameters()" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface object length]
+    expected: FAIL
+
+  [RTCDTMFToneChangeEvent interface object length]
+    expected: FAIL
+
+  [RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "rtcpTransport" with the proper type]
+    expected: FAIL
+
+  [RTCStatsEvent interface: attribute report]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: attribute hostCandidate]
+    expected: FAIL
+
+  [RTCRtpSender interface: new RTCPeerConnection().addTransceiver('audio').sender must inherit property "setStreams(MediaStream)" with the proper type]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: operation getParameters()]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute onselectedcandidatepairchange]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 }); must inherit property "errorCode" with the proper type]
+    expected: FAIL
+
+  [RTCCertificate interface: operation getSupportedAlgorithms()]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute onstatechange]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "negotiated" with the proper type]
+    expected: FAIL
+
+  [RTCStatsEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [RTCStatsEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "role" with the proper type]
+    expected: FAIL
+
+  [RTCIceTransport interface: operation getRemoteParameters()]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Stringification of idlTestObjects.iceTransport]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "getLocalCandidates()" with the proper type]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: attribute rtcpTransport]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: attribute transport]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: attribute state]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "getRemoteCandidates()" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: attribute errorCode]
+    expected: FAIL
+
+  [RTCRtpSender interface: calling setParameters(RTCRtpSendParameters) on new RTCPeerConnection().addTransceiver('audio').sender with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "gatheringState" with the proper type]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent must be primary interface of new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 });]
+    expected: FAIL
+
+  [RTCErrorEvent interface object name]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: idlTestObjects.dtlsTransport must inherit property "onerror" with the proper type]
+    expected: FAIL
+
+  [RTCIceTransport interface object name]
+    expected: FAIL
+
+  [Test toJSON operation of toJSON object]
+    expected: FAIL
+
+  [RTCPeerConnectionIceEvent interface: attribute url]
+    expected: FAIL
+
+  [RTCStatsEvent interface object length]
+    expected: FAIL
+
+  [RTCIceTransport interface: existence and properties of interface object]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute role]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: attribute onstatechange]
+    expected: FAIL
+
+  [RTCRtpReceiver interface: new RTCPeerConnection().addTransceiver('audio').receiver must inherit property "rtcpTransport" with the proper type]
+    expected: FAIL
+
+  [RTCDataChannel interface: new RTCPeerConnection().createDataChannel('') must inherit property "onerror" with the proper type]
+    expected: FAIL
+
+  [RTCRtpTransceiver interface: operation setCodecPreferences([object Object\])]
+    expected: FAIL
+
+  [RTCIceTransport interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [RTCIceTransport interface: attribute component]
+    expected: FAIL
+
+  [RTCSctpTransport interface: idlTestObjects.sctpTransport must inherit property "state" with the proper type]
+    expected: FAIL
+
+  [RTCIceTransport interface: idlTestObjects.iceTransport must inherit property "state" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: operation getRemoteCertificates()]
+    expected: FAIL
+
+  [RTCStatsEvent interface object name]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 }); must inherit property "hostCandidate" with the proper type]
+    expected: FAIL
+
+  [RTCIceTransport interface: operation getRemoteCandidates()]
+    expected: FAIL
+
+  [RTCSctpTransport must be primary interface of idlTestObjects.sctpTransport]
+    expected: FAIL
+
+  [RTCSctpTransport interface: idlTestObjects.sctpTransport must inherit property "maxMessageSize" with the proper type]
+    expected: FAIL
+
+  [Stringification of idlTestObjects.sctpTransport]
+    expected: FAIL
+
+  [RTCIceTransport interface: operation getLocalCandidates()]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [RTCPeerConnectionIceErrorEvent interface: attribute url]
+    expected: FAIL
+
+  [RTCSctpTransport interface object length]
+    expected: FAIL
+
+  [RTCSctpTransport interface: idlTestObjects.sctpTransport must inherit property "transport" with the proper type]
+    expected: FAIL
+
+  [RTCDtlsTransport interface: attribute onerror]
+    expected: FAIL
+
+  [RTCErrorEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webusb/idlharness.any.js.ini b/testing/web-platform/meta/webusb/idlharness.any.js.ini
new file mode 100644
index 000000000000..9eb824d18038
--- /dev/null
+++ b/testing/web-platform/meta/webusb/idlharness.any.js.ini
@@ -0,0 +1,1503 @@
+[idlharness.any.html]
+  [USBOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productName]
+    expected: FAIL
+
+  [USBInterface interface: attribute interfaceNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "open()" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMajor]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation transferOut(octet, BufferSource)]
+    expected: FAIL
+
+  [USBAlternateInterface must be primary interface of usbAlternateInterface]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionSubminor]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectConfiguration(octet)" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult must be primary interface of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceClass]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute alternateSetting]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "serialNumber" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceProtocol" with the proper type]
+    expected: FAIL
+
+  [USB interface object length]
+    expected: FAIL
+
+  [USBDevice must be primary interface of usbDevice]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferOut(USBControlTransferParameters, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "interfaces" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "endpoints" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferOut(octet, BufferSource, [object Object\])]
+    expected: FAIL
+
+  [Stringification of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "clearHalt(USBDirection, octet)" with the proper type]
+    expected: FAIL
+
+  [USBPermissionResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectConfiguration(octet)]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceClass" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferIn(octet, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult must be primary interface of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferOut(USBControlTransferParameters, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: attribute opened]
+    expected: FAIL
+
+  [USBConnectionEvent must be primary interface of usbConnectionEvent]
+    expected: FAIL
+
+  [Stringification of usbAlternateInterface]
+    expected: FAIL
+
+  [USBPermissionResult interface: attribute devices]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "manufacturerName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMinor]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationValue]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: calling selectConfiguration(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "claimInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "reset()" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productName" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternate]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionSubminor]
+    expected: FAIL
+
+  [Stringification of navigator.usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface object name]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productId]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute data]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute packetSize]
+    expected: FAIL
+
+  [USB must be primary interface of navigator.usb]
+    expected: FAIL
+
+  [USBInterface interface: attribute claimed]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute direction]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute vendorId]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternates]
+    expected: FAIL
+
+  [USBEndpoint interface object length]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "claimed" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferOut(octet, BufferSource, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectAlternateInterface(octet, octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: new USBIsochronousOutTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute endpoints]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "ondisconnect" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferIn(USBControlTransferParameters, unsigned short)" with the proper type]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "getDevices()" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation getDevices()]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationValue" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object name]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMajor]
+    expected: FAIL
+
+  [USBDevice interface: attribute manufacturerName]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling releaseInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of usbConnectionEvent]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferOut(octet, BufferSource, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute serialNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configuration" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute onconnect]
+    expected: FAIL
+
+  [USBConnectionEvent interface: usbConnectionEvent must inherit property "device" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation transferIn(octet, unsigned long)]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferOut(USBControlTransferParameters, BufferSource)]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Stringification of usbInterface]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productId" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling clearHalt(USBDirection, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBInterface must be primary interface of usbInterface]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Stringification of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: calling transferIn(octet, unsigned long) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceName]
+    expected: FAIL
+
+  [USBDevice interface: attribute configuration]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket must be primary interface of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [Stringification of usbDevice]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternates" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute interfaces]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBConfiguration must be primary interface of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: operation claimInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "opened" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternate" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBDevice interface: operation clearHalt(USBDirection, octet)]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationName]
+    expected: FAIL
+
+  [USBDevice interface: operation reset()]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConnectionEvent interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectAlternateInterface(octet, octet)]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferIn(octet, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute ondisconnect]
+    expected: FAIL
+
+  [USB interface: calling requestDevice(USBDeviceRequestOptions) on navigator.usb with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling transferOut(octet, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute type]
+    expected: FAIL
+
+  [USBInTransferResult must be primary interface of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferIn(USBControlTransferParameters, unsigned short) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USB interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "onconnect" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceProtocol]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute configurations]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "interfaceNumber" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceProtocol]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "vendorId" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute endpointNumber]
+    expected: FAIL
+
+  [USBDevice interface: operation releaseInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceClass" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceSubclass]
+    expected: FAIL
+
+  [USBEndpoint interface object name]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceName" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceProtocol" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation open()]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBDevice interface: calling claimInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceClass]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "alternateSetting" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferOut(octet, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferIn(octet, unsigned long)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling selectAlternateInterface(octet, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Navigator interface: attribute usb]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configurations" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: attribute device]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "requestDevice(USBDeviceRequestOptions)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceSubclass]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "releaseInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMinor]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult must be primary interface of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInTransferResult interface object name]
+    expected: FAIL
+
+  [USBInTransferResult interface object length]
+    expected: FAIL
+
+  [USBPermissionResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket must be primary interface of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USB device setup]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferIn(USBControlTransferParameters, unsigned short)]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation close()]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation requestDevice(USBDeviceRequestOptions)]
+    expected: FAIL
+
+  [USBAlternateInterface interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "close()" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint must be primary interface of usbEndpoint]
+    expected: FAIL
+
+  [Stringification of usbEndpoint]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferIn(octet, [object Object\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "usb" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface object name]
+    expected: FAIL
+
+
+[idlharness.any.worker.html]
+  [USBOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productName]
+    expected: FAIL
+
+  [USBInterface interface: attribute interfaceNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "open()" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMajor]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation transferOut(octet, BufferSource)]
+    expected: FAIL
+
+  [USBAlternateInterface must be primary interface of usbAlternateInterface]
+    expected: FAIL
+
+  [USB interface: member requestDevice]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionSubminor]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectConfiguration(octet)" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult must be primary interface of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceClass]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute alternateSetting]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "serialNumber" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceProtocol" with the proper type]
+    expected: FAIL
+
+  [USB interface object length]
+    expected: FAIL
+
+  [USBDevice must be primary interface of usbDevice]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferOut(USBControlTransferParameters, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "interfaces" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "endpoints" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferOut(octet, BufferSource, [object Object\])]
+    expected: FAIL
+
+  [Stringification of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "clearHalt(USBDirection, octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation selectConfiguration(octet)]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferIn(octet, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult must be primary interface of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferOut(USBControlTransferParameters, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: attribute opened]
+    expected: FAIL
+
+  [USBConnectionEvent must be primary interface of usbConnectionEvent]
+    expected: FAIL
+
+  [Stringification of usbAlternateInterface]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "manufacturerName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMinor]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationValue]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: calling selectConfiguration(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "claimInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "reset()" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productName" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternate]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionSubminor]
+    expected: FAIL
+
+  [Stringification of navigator.usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface object name]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productId]
+    expected: FAIL
+
+  [USB interface: navigator.usb must not have property "requestDevice"]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute data]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute packetSize]
+    expected: FAIL
+
+  [USB must be primary interface of navigator.usb]
+    expected: FAIL
+
+  [USBInterface interface: attribute claimed]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute direction]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute vendorId]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternates]
+    expected: FAIL
+
+  [USBEndpoint interface object length]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "claimed" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferOut(octet, BufferSource, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectAlternateInterface(octet, octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: new USBIsochronousOutTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute endpoints]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "ondisconnect" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferIn(USBControlTransferParameters, unsigned short)" with the proper type]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "getDevices()" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation getDevices()]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationValue" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object name]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMajor]
+    expected: FAIL
+
+  [USBDevice interface: attribute manufacturerName]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling releaseInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of usbConnectionEvent]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferOut(octet, BufferSource, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute serialNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configuration" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute onconnect]
+    expected: FAIL
+
+  [USBConnectionEvent interface: usbConnectionEvent must inherit property "device" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation transferIn(octet, unsigned long)]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferOut(USBControlTransferParameters, BufferSource)]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Stringification of usbInterface]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productId" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling clearHalt(USBDirection, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBInterface must be primary interface of usbInterface]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Stringification of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: calling transferIn(octet, unsigned long) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceName]
+    expected: FAIL
+
+  [USBDevice interface: attribute configuration]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceClass" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket must be primary interface of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [Stringification of usbDevice]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternates" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute interfaces]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBConfiguration must be primary interface of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: operation claimInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "opened" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternate" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBDevice interface: operation clearHalt(USBDirection, octet)]
+    expected: FAIL
+
+  [USBDevice interface: operation reset()]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConnectionEvent interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectAlternateInterface(octet, octet)]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferIn(octet, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute ondisconnect]
+    expected: FAIL
+
+  [USBDevice interface object name]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationName]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling transferOut(octet, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute type]
+    expected: FAIL
+
+  [USBInTransferResult must be primary interface of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferIn(USBControlTransferParameters, unsigned short) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USB interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "onconnect" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceProtocol]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute configurations]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "interfaceNumber" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceProtocol]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "vendorId" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute endpointNumber]
+    expected: FAIL
+
+  [USBDevice interface: operation releaseInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceClass" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceSubclass]
+    expected: FAIL
+
+  [USBEndpoint interface object name]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceName" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object length]
+    expected: FAIL
+
+  [WorkerNavigator interface: attribute usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceProtocol" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation open()]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBDevice interface: calling claimInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceClass]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "alternateSetting" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferOut(octet, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferIn(octet, unsigned long)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling selectAlternateInterface(octet, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configurations" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: attribute device]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceSubclass]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "releaseInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMinor]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult must be primary interface of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [WorkerNavigator interface: navigator must inherit property "usb" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface object name]
+    expected: FAIL
+
+  [USBInTransferResult interface object length]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket must be primary interface of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USB device setup]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferIn(USBControlTransferParameters, unsigned short)]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation close()]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "close()" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint must be primary interface of usbEndpoint]
+    expected: FAIL
+
+  [Stringification of usbEndpoint]
+    expected: FAIL
+
+  [USBInterface interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferIn(octet, [object Object\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface object name]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/webusb/idlharness.https.any.js.ini b/testing/web-platform/meta/webusb/idlharness.https.any.js.ini
index 6da65a498495..00e168795c2a 100644
--- a/testing/web-platform/meta/webusb/idlharness.https.any.js.ini
+++ b/testing/web-platform/meta/webusb/idlharness.https.any.js.ini
@@ -1,16 +1,1510 @@
 [idlharness.https.any.html]
-  [WebUSB IDL test]
+  [idlharness]
     expected: FAIL
 
-  [idlharness]
+  [USBOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productName]
+    expected: FAIL
+
+  [USBInterface interface: attribute interfaceNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "open()" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMajor]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation transferOut(octet, BufferSource)]
+    expected: FAIL
+
+  [USBAlternateInterface must be primary interface of usbAlternateInterface]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionSubminor]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectConfiguration(octet)" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult must be primary interface of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceClass]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute alternateSetting]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "serialNumber" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceProtocol" with the proper type]
+    expected: FAIL
+
+  [USB interface object length]
+    expected: FAIL
+
+  [USBDevice must be primary interface of usbDevice]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferOut(USBControlTransferParameters, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "interfaces" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "endpoints" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferOut(octet, BufferSource, [object Object\])]
+    expected: FAIL
+
+  [Stringification of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "clearHalt(USBDirection, octet)" with the proper type]
+    expected: FAIL
+
+  [USBPermissionResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectConfiguration(octet)]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceClass" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferIn(octet, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult must be primary interface of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferOut(USBControlTransferParameters, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: attribute opened]
+    expected: FAIL
+
+  [USBConnectionEvent must be primary interface of usbConnectionEvent]
+    expected: FAIL
+
+  [Stringification of usbAlternateInterface]
+    expected: FAIL
+
+  [USBPermissionResult interface: attribute devices]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "manufacturerName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMinor]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationValue]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: calling selectConfiguration(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "claimInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "reset()" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productName" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternate]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionSubminor]
+    expected: FAIL
+
+  [Stringification of navigator.usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface object name]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productId]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute data]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute packetSize]
+    expected: FAIL
+
+  [USB must be primary interface of navigator.usb]
+    expected: FAIL
+
+  [USBInterface interface: attribute claimed]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute direction]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute vendorId]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternates]
+    expected: FAIL
+
+  [USBEndpoint interface object length]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "claimed" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferOut(octet, BufferSource, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectAlternateInterface(octet, octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: new USBIsochronousOutTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute endpoints]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "ondisconnect" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferIn(USBControlTransferParameters, unsigned short)" with the proper type]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "getDevices()" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation getDevices()]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationValue" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object name]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMajor]
+    expected: FAIL
+
+  [USBDevice interface: attribute manufacturerName]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling releaseInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of usbConnectionEvent]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferOut(octet, BufferSource, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute serialNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configuration" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute onconnect]
+    expected: FAIL
+
+  [USBConnectionEvent interface: usbConnectionEvent must inherit property "device" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation transferIn(octet, unsigned long)]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferOut(USBControlTransferParameters, BufferSource)]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Stringification of usbInterface]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productId" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling clearHalt(USBDirection, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBInterface must be primary interface of usbInterface]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Stringification of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: calling transferIn(octet, unsigned long) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceName]
+    expected: FAIL
+
+  [USBDevice interface: attribute configuration]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket must be primary interface of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [Stringification of usbDevice]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternates" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute interfaces]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBConfiguration must be primary interface of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: operation claimInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "opened" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternate" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBDevice interface: operation clearHalt(USBDirection, octet)]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationName]
+    expected: FAIL
+
+  [USBDevice interface: operation reset()]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConnectionEvent interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectAlternateInterface(octet, octet)]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferIn(octet, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute ondisconnect]
+    expected: FAIL
+
+  [USB interface: calling requestDevice(USBDeviceRequestOptions) on navigator.usb with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling transferOut(octet, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute type]
+    expected: FAIL
+
+  [USBInTransferResult must be primary interface of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferIn(USBControlTransferParameters, unsigned short) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USB interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "onconnect" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceProtocol]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute configurations]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "interfaceNumber" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceProtocol]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "vendorId" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute endpointNumber]
+    expected: FAIL
+
+  [USBDevice interface: operation releaseInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceClass" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceSubclass]
+    expected: FAIL
+
+  [USBEndpoint interface object name]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceName" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceProtocol" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation open()]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBDevice interface: calling claimInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceClass]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "alternateSetting" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferOut(octet, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferIn(octet, unsigned long)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling selectAlternateInterface(octet, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Navigator interface: attribute usb]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configurations" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: attribute device]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "requestDevice(USBDeviceRequestOptions)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceSubclass]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "releaseInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMinor]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult must be primary interface of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInTransferResult interface object name]
+    expected: FAIL
+
+  [USBInTransferResult interface object length]
+    expected: FAIL
+
+  [USBPermissionResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket must be primary interface of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USB device setup]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferIn(USBControlTransferParameters, unsigned short)]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation close()]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation requestDevice(USBDeviceRequestOptions)]
+    expected: FAIL
+
+  [USBAlternateInterface interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "close()" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint must be primary interface of usbEndpoint]
+    expected: FAIL
+
+  [Stringification of usbEndpoint]
+    expected: FAIL
+
+  [USBPermissionResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferIn(octet, [object Object\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "usb" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface object name]
     expected: FAIL
 
 
 [idlharness.https.any.worker.html]
-  [WebUSB IDL test]
+  [idlharness]
     expected: FAIL
 
-  [idlharness]
+  [USBOutTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productName]
+    expected: FAIL
+
+  [USBInterface interface: attribute interfaceNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "open()" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMajor]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation transferOut(octet, BufferSource)]
+    expected: FAIL
+
+  [USBAlternateInterface must be primary interface of usbAlternateInterface]
+    expected: FAIL
+
+  [USB interface: member requestDevice]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionSubminor]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectConfiguration(octet)" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult must be primary interface of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceClass]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "packetSize" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute alternateSetting]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "serialNumber" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceProtocol" with the proper type]
+    expected: FAIL
+
+  [USB interface object length]
+    expected: FAIL
+
+  [USBDevice must be primary interface of usbDevice]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferOut(USBControlTransferParameters, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "interfaces" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "endpoints" with the proper type]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferResult([\])]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferOut(octet, BufferSource, [object Object\])]
+    expected: FAIL
+
+  [Stringification of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "clearHalt(USBDirection, octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation selectConfiguration(octet)]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferIn(octet, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult must be primary interface of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferOut(USBControlTransferParameters, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: attribute opened]
+    expected: FAIL
+
+  [USBConnectionEvent must be primary interface of usbConnectionEvent]
+    expected: FAIL
+
+  [Stringification of usbAlternateInterface]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "manufacturerName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionMinor]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationValue]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: calling selectConfiguration(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "claimInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "reset()" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productName" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternate]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute usbVersionSubminor]
+    expected: FAIL
+
+  [Stringification of navigator.usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface object name]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute productId]
+    expected: FAIL
+
+  [USB interface: navigator.usb must not have property "requestDevice"]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute data]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute packetSize]
+    expected: FAIL
+
+  [USB must be primary interface of navigator.usb]
+    expected: FAIL
+
+  [USBInterface interface: attribute claimed]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: attribute status]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute direction]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute vendorId]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: attribute alternates]
+    expected: FAIL
+
+  [USBEndpoint interface object length]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "claimed" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "isochronousTransferOut(octet, BufferSource, [object Object\])" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "selectAlternateInterface(octet, octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: new USBIsochronousOutTransferResult([\]) must inherit property "packets" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute endpoints]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "ondisconnect" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "controlTransferIn(USBControlTransferParameters, unsigned short)" with the proper type]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "getDevices()" with the proper type]
+    expected: FAIL
+
+  [USB interface: operation getDevices()]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationValue" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object name]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMajor]
+    expected: FAIL
+
+  [USBDevice interface: attribute manufacturerName]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling releaseInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of usbConnectionEvent]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferOut(octet, BufferSource, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBConfiguration interface: usbConfiguration must inherit property "configurationName" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute serialNumber]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configuration" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute onconnect]
+    expected: FAIL
+
+  [USBConnectionEvent interface: usbConnectionEvent must inherit property "device" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation transferIn(octet, unsigned long)]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferOut(USBControlTransferParameters, BufferSource)]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [Stringification of usbInterface]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "productId" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling clearHalt(USBDirection, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBInterface must be primary interface of usbInterface]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface object name]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Stringification of new USBOutTransferResult("ok")]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface object length]
+    expected: FAIL
+
+  [USBDevice interface: calling transferIn(octet, unsigned long) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceName]
+    expected: FAIL
+
+  [USBDevice interface: attribute configuration]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceClass" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket must be primary interface of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [Stringification of usbDevice]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternates" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute interfaces]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBConfiguration must be primary interface of usbConfiguration]
+    expected: FAIL
+
+  [USBDevice interface: operation claimInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "opened" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "alternate" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBDevice interface: operation clearHalt(USBDirection, octet)]
+    expected: FAIL
+
+  [USBDevice interface: operation reset()]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "type" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConnectionEvent interface object length]
+    expected: FAIL
+
+  [USBDevice interface: operation selectAlternateInterface(octet, octet)]
+    expected: FAIL
+
+  [USBDevice interface: calling isochronousTransferIn(octet, [object Object\]) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBOutTransferResult interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USB interface: attribute ondisconnect]
+    expected: FAIL
+
+  [USBDevice interface object name]
+    expected: FAIL
+
+  [USBConfiguration interface: attribute configurationName]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMajor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling transferOut(octet, BufferSource) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute type]
+    expected: FAIL
+
+  [USBInTransferResult must be primary interface of new USBInTransferResult("ok")]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: calling controlTransferIn(USBControlTransferParameters, unsigned short) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USB interface object name]
+    expected: FAIL
+
+  [USBEndpoint interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USB interface: navigator.usb must inherit property "onconnect" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceProtocol]
+    expected: FAIL
+
+  [Stringification of new USBIsochronousOutTransferPacket("ok")]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface object name]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: new USBIsochronousInTransferResult([\]) must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceSubclass" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: attribute configurations]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "endpointNumber" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: new USBInTransferResult("ok") must inherit property "data" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute status]
+    expected: FAIL
+
+  [USBInterface interface: usbInterface must inherit property "interfaceNumber" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceProtocol]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "vendorId" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: attribute bytesWritten]
+    expected: FAIL
+
+  [USBEndpoint interface: attribute endpointNumber]
+    expected: FAIL
+
+  [USBDevice interface: operation releaseInterface(octet)]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceClass" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceSubclass]
+    expected: FAIL
+
+  [USBEndpoint interface object name]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceName" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface object length]
+    expected: FAIL
+
+  [WorkerNavigator interface: attribute usb]
+    expected: FAIL
+
+  [USBConnectionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "interfaceProtocol" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: operation open()]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: attribute packets]
+    expected: FAIL
+
+  [USBDevice interface: calling claimInterface(octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBAlternateInterface interface: attribute interfaceClass]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBAlternateInterface interface: usbAlternateInterface must inherit property "alternateSetting" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferOut(octet, BufferSource)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "transferIn(octet, unsigned long)" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: calling selectAlternateInterface(octet, octet) on usbDevice with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "configurations" with the proper type]
+    expected: FAIL
+
+  [USBConnectionEvent interface: attribute device]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceSubclass]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: new USBIsochronousOutTransferPacket("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint interface: usbEndpoint must inherit property "direction" with the proper type]
+    expected: FAIL
+
+  [USBOutTransferResult interface: new USBOutTransferResult("ok") must inherit property "bytesWritten" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "deviceVersionMinor" with the proper type]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "releaseInterface(octet)" with the proper type]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBDevice interface: attribute deviceVersionMinor]
+    expected: FAIL
+
+  [USBInTransferResult interface: attribute data]
+    expected: FAIL
+
+  [USBIsochronousInTransferResult must be primary interface of new USBIsochronousInTransferResult([\])]
+    expected: FAIL
+
+  [USB interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [WorkerNavigator interface: navigator must inherit property "usb" with the proper type]
+    expected: FAIL
+
+  [USBInTransferResult interface object name]
+    expected: FAIL
+
+  [USBInTransferResult interface object length]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket must be primary interface of new USBIsochronousInTransferPacket("ok")]
+    expected: FAIL
+
+  [USB device setup]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation controlTransferIn(USBControlTransferParameters, unsigned short)]
+    expected: FAIL
+
+  [USBOutTransferResult interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBInterface interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "usbVersionSubminor" with the proper type]
+    expected: FAIL
+
+  [USBConfiguration interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [USBDevice interface: operation close()]
+    expected: FAIL
+
+  [USBIsochronousInTransferPacket interface: new USBIsochronousInTransferPacket("ok") must inherit property "status" with the proper type]
+    expected: FAIL
+
+  [USBAlternateInterface interface object length]
+    expected: FAIL
+
+  [USBDevice interface: usbDevice must inherit property "close()" with the proper type]
+    expected: FAIL
+
+  [USBEndpoint must be primary interface of usbEndpoint]
+    expected: FAIL
+
+  [Stringification of usbEndpoint]
+    expected: FAIL
+
+  [USBInterface interface object length]
+    expected: FAIL
+
+  [USBAlternateInterface interface: existence and properties of interface object]
+    expected: FAIL
+
+  [USBDevice interface: operation isochronousTransferIn(octet, [object Object\])]
+    expected: FAIL
+
+  [USBIsochronousOutTransferPacket interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [USBIsochronousOutTransferResult interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [USBConfiguration interface object name]
     expected: FAIL
 
 
diff --git a/testing/web-platform/meta/webxr/idlharness.https.window.js.ini b/testing/web-platform/meta/webxr/idlharness.https.window.js.ini
new file mode 100644
index 000000000000..9857ee50aa04
--- /dev/null
+++ b/testing/web-platform/meta/webxr/idlharness.https.window.js.ini
@@ -0,0 +1,676 @@
+[idlharness.https.window.html]
+  [XRFrame interface: operation getDevicePose(XRCoordinateSystem)]
+    expected: FAIL
+
+  [XRInputPose interface: attribute targetRay]
+    expected: FAIL
+
+  [XR interface: attribute ondevicechange]
+    expected: FAIL
+
+  [XRSession interface: attribute environmentBlendMode]
+    expected: FAIL
+
+  [XRDevice interface: calling supportsSession(XRSessionCreationOptions) on device with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XR interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: attribute x]
+    expected: FAIL
+
+  [XRSession must be primary interface of session]
+    expected: FAIL
+
+  [XRFrame interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRSession interface: attribute depthFar]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "cancelAnimationFrame(long)" with the proper type]
+    expected: FAIL
+
+  [XRStageBounds interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRStageBounds interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRWebGLLayer interface object name]
+    expected: FAIL
+
+  [XRDevice interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRDevice interface: device must inherit property "requestSession(XRSessionCreationOptions)" with the proper type]
+    expected: FAIL
+
+  [XRViewport interface: attribute y]
+    expected: FAIL
+
+  [XRInputSource interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface object length]
+    expected: FAIL
+
+  [XRSession interface: operation cancelAnimationFrame(long)]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onresetpose" with the proper type]
+    expected: FAIL
+
+  [XRViewport interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Stringification of navigator.XR]
+    expected: FAIL
+
+  [XRDevicePose interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "immersive" with the proper type]
+    expected: FAIL
+
+  [XRSessionEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRWebGLLayer interface object length]
+    expected: FAIL
+
+  [XRFrameOfReference interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [Stringification of device]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute depth]
+    expected: FAIL
+
+  [XRView interface object name]
+    expected: FAIL
+
+  [XRSession interface: attribute immersive]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "depthFar" with the proper type]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onselectstart" with the proper type]
+    expected: FAIL
+
+  [XRPresentationContext interface: attribute canvas]
+    expected: FAIL
+
+  [XRSession interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRDevicePose interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRDevice interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRDevice interface: operation requestSession(XRSessionCreationOptions)]
+    expected: FAIL
+
+  [XRSession interface object name]
+    expected: FAIL
+
+  [XRPresentationContext interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRSession interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRInputSource interface object length]
+    expected: FAIL
+
+  [XRViewport interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRInputPose interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRSession interface object length]
+    expected: FAIL
+
+  [XRSession interface: operation getInputSources()]
+    expected: FAIL
+
+  [XRFrameOfReference interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Stringification of session]
+    expected: FAIL
+
+  [XRInputSource interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRPresentationContext interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute context]
+    expected: FAIL
+
+  [XRDevice interface object length]
+    expected: FAIL
+
+  [XRSession interface: attribute outputContext]
+    expected: FAIL
+
+  [XRView interface object length]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute multiview]
+    expected: FAIL
+
+  [XRSession interface: calling cancelAnimationFrame(long) on session with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XRFrame interface: attribute views]
+    expected: FAIL
+
+  [XRInputPose interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRSession interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRInputPose interface object length]
+    expected: FAIL
+
+  [XRWebGLLayer interface: operation getNativeFramebufferScaleFactor(XRSession)]
+    expected: FAIL
+
+  [XRDevicePose interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRFrameOfReference interface: attribute emulatedHeight]
+    expected: FAIL
+
+  [XRDevicePose interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRViewport interface: attribute height]
+    expected: FAIL
+
+  [XRFrame interface: attribute session]
+    expected: FAIL
+
+  [XRSession interface: attribute onselectend]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onselectend" with the proper type]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute framebuffer]
+    expected: FAIL
+
+  [XRDevicePose interface: operation getViewMatrix(XRView)]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "requestAnimationFrame(XRFrameRequestCallback)" with the proper type]
+    expected: FAIL
+
+  [XR interface: operation requestDevice()]
+    expected: FAIL
+
+  [XRDevice interface object name]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: attribute z]
+    expected: FAIL
+
+  [XRSession interface: attribute onselect]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface: attribute coordinateSystem]
+    expected: FAIL
+
+  [XR interface object length]
+    expected: FAIL
+
+  [XRSessionEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRDevice interface: device must inherit property "supportsSession(XRSessionCreationOptions)" with the proper type]
+    expected: FAIL
+
+  [XRWebGLLayer interface: operation requestViewportScaling(double)]
+    expected: FAIL
+
+  [XRSessionEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRInputPose interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRCoordinateSystem interface: operation getTransformTo(XRCoordinateSystem)]
+    expected: FAIL
+
+  [XRFrameOfReference interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XR interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XR interface: navigator.XR must inherit property "ondevicechange" with the proper type]
+    expected: FAIL
+
+  [XRViewport interface object length]
+    expected: FAIL
+
+  [XRDevice interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRStageBounds interface: attribute geometry]
+    expected: FAIL
+
+  [XRView interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRViewport interface: attribute x]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute framebufferHeight]
+    expected: FAIL
+
+  [XRWebGLLayer interface: operation getViewport(XRView)]
+    expected: FAIL
+
+  [XRView interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: attribute inputSource]
+    expected: FAIL
+
+  [XRSession interface: attribute baseLayer]
+    expected: FAIL
+
+  [XRFrameOfReference interface: attribute onboundschange]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XR interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRInputSourceEvent interface object name]
+    expected: FAIL
+
+  [XRPresentationContext interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface object name]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onblur" with the proper type]
+    expected: FAIL
+
+  [XRViewport interface object name]
+    expected: FAIL
+
+  [XRCoordinateSystem interface object length]
+    expected: FAIL
+
+  [XRSession interface: attribute onselectstart]
+    expected: FAIL
+
+  [XRDevicePose interface object length]
+    expected: FAIL
+
+  [XRView interface: attribute projectionMatrix]
+    expected: FAIL
+
+  [XRSession interface: attribute onblur]
+    expected: FAIL
+
+  [XRView interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface object name]
+    expected: FAIL
+
+  [XRCoordinateSystem interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface object length]
+    expected: FAIL
+
+  [XRSessionEvent interface: attribute session]
+    expected: FAIL
+
+  [XRInputPose interface: attribute emulatedPosition]
+    expected: FAIL
+
+  [XRSession interface: calling requestFrameOfReference(XRFrameOfReferenceType, XRFrameOfReferenceOptions) on session with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [Navigator interface: navigator must inherit property "xr" with the proper type]
+    expected: FAIL
+
+  [XRPresentationContext interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRPresentationContext interface object length]
+    expected: FAIL
+
+  [XRPresentationContext interface object name]
+    expected: FAIL
+
+  [XRRay interface: attribute direction]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute stencil]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onfocus" with the proper type]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRRay interface object name]
+    expected: FAIL
+
+  [XRDevice interface: operation supportsSession(XRSessionCreationOptions)]
+    expected: FAIL
+
+  [XRInputSource interface: attribute handedness]
+    expected: FAIL
+
+  [XRCoordinateSystem interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRLayer interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRDevice interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRLayer interface object name]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute alpha]
+    expected: FAIL
+
+  [XRCoordinateSystem interface object name]
+    expected: FAIL
+
+  [XRSessionEvent interface object length]
+    expected: FAIL
+
+  [XRSession interface: calling requestAnimationFrame(XRFrameRequestCallback) on session with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XRWebGLLayer interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRFrame interface object name]
+    expected: FAIL
+
+  [XRInputSource interface: attribute targetRayMode]
+    expected: FAIL
+
+  [XRViewport interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Test IDL implementation of WebXR API]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRRay interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRLayer interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRRay interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRFrameOfReference interface object name]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRFrame interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRFrameOfReference interface object length]
+    expected: FAIL
+
+  [XRStageBounds interface object name]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onselect" with the proper type]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "baseLayer" with the proper type]
+    expected: FAIL
+
+  [XRView interface: attribute eye]
+    expected: FAIL
+
+  [XRWebGLLayer interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "depthNear" with the proper type]
+    expected: FAIL
+
+  [XRWebGLLayer interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRViewport interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRInputPose interface object name]
+    expected: FAIL
+
+  [XRRay interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRFrameOfReference interface: attribute bounds]
+    expected: FAIL
+
+  [XRLayer interface object length]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "outputContext" with the proper type]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRSession interface: operation requestAnimationFrame(XRFrameRequestCallback)]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute antialias]
+    expected: FAIL
+
+  [XRInputSource interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Navigator interface: attribute xr]
+    expected: FAIL
+
+  [XRRay interface: attribute origin]
+    expected: FAIL
+
+  [XRDevice must be primary interface of device]
+    expected: FAIL
+
+  [XRCoordinateSystemEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRInputPose interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRDevice interface: calling requestSession(XRSessionCreationOptions) on device with too few arguments must throw TypeError]
+    expected: FAIL
+
+  [XRRay interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "environmentBlendMode" with the proper type]
+    expected: FAIL
+
+  [XRFrame interface: operation getInputPose(XRInputSource, XRCoordinateSystem)]
+    expected: FAIL
+
+  [XRStageBounds interface object length]
+    expected: FAIL
+
+  [XRInputSource interface object name]
+    expected: FAIL
+
+  [XRStageBounds interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRStageBoundsPoint interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "onend" with the proper type]
+    expected: FAIL
+
+  [XRRay interface: attribute transformMatrix]
+    expected: FAIL
+
+  [XR interface: navigator.XR must inherit property "requestDevice()" with the proper type]
+    expected: FAIL
+
+  [XRCoordinateSystem interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "end()" with the proper type]
+    expected: FAIL
+
+  [XRSession interface: operation requestFrameOfReference(XRFrameOfReferenceType, XRFrameOfReferenceOptions)]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "requestFrameOfReference(XRFrameOfReferenceType, XRFrameOfReferenceOptions)" with the proper type]
+    expected: FAIL
+
+  [XRSession interface: attribute depthNear]
+    expected: FAIL
+
+  [WebGLRenderingContext interface: operation setCompatibleXRDevice(XRDevice)]
+    expected: FAIL
+
+  [XRInputSource interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRSession interface: attribute onresetpose]
+    expected: FAIL
+
+  [XRDevicePose interface: attribute poseModelMatrix]
+    expected: FAIL
+
+  [XRInputPose interface: attribute gripMatrix]
+    expected: FAIL
+
+  [XRFrame interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRLayer interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRRay interface object length]
+    expected: FAIL
+
+  [XRSessionEvent interface object name]
+    expected: FAIL
+
+  [XRSession interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRFrameOfReference interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: existence and properties of interface object]
+    expected: FAIL
+
+  [XRViewport interface: attribute width]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "getInputSources()" with the proper type]
+    expected: FAIL
+
+  [XRLayer interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XR must be primary interface of navigator.XR]
+    expected: FAIL
+
+  [XRStageBounds interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRView interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRDevicePose interface object name]
+    expected: FAIL
+
+  [XRInputSourceEvent interface: attribute frame]
+    expected: FAIL
+
+  [XRWebGLLayer interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [XRFrame interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [XRSessionEvent interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRFrame interface object length]
+    expected: FAIL
+
+  [XR interface object name]
+    expected: FAIL
+
+  [XRSession interface: attribute device]
+    expected: FAIL
+
+  [XRSession interface: session must inherit property "device" with the proper type]
+    expected: FAIL
+
+  [XRWebGLLayer interface: attribute framebufferWidth]
+    expected: FAIL
+
+  [XRSession interface: attribute onend]
+    expected: FAIL
+
+  [XR interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [XRInputSourceEvent interface object length]
+    expected: FAIL
+
+  [XRSession interface: attribute onfocus]
+    expected: FAIL
+
+  [XRSession interface: operation end()]
+    expected: FAIL
+
+  [XRCoordinateSystem interface: existence and properties of interface object]
+    expected: FAIL
+
diff --git a/testing/web-platform/meta/workers/WorkerGlobalScope_requestAnimationFrame.htm.ini b/testing/web-platform/meta/workers/WorkerGlobalScope_requestAnimationFrame.htm.ini
index 5ec875349234..d5db973b5e20 100644
--- a/testing/web-platform/meta/workers/WorkerGlobalScope_requestAnimationFrame.htm.ini
+++ b/testing/web-platform/meta/workers/WorkerGlobalScope_requestAnimationFrame.htm.ini
@@ -1,5 +1,4 @@
 [WorkerGlobalScope_requestAnimationFrame.htm]
-  expected: ERROR
   [ WorkerGlobalScope API: requestAnimationFrame()]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini b/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini
index fbd3d1bcc397..afe8131ee054 100644
--- a/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini
+++ b/testing/web-platform/meta/workers/modules/dedicated-worker-import-blob-url.any.js.ini
@@ -1,10 +1,10 @@
 [dedicated-worker-import-blob-url.any.worker.html]
   expected: ERROR
   [Static import.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Nested static import.]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Static import and then dynamic import.]
     expected: NOTRUN
@@ -25,23 +25,23 @@
 [dedicated-worker-import-blob-url.any.html]
   expected: ERROR
   [Static import.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Nested static import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Static import and then dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Nested dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Dynamic import and then static import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [eval(import()).]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/testing/web-platform/meta/workers/modules/dedicated-worker-import-failure.html.ini b/testing/web-platform/meta/workers/modules/dedicated-worker-import-failure.html.ini
index c382640ac105..a796bcdd4c5c 100644
--- a/testing/web-platform/meta/workers/modules/dedicated-worker-import-failure.html.ini
+++ b/testing/web-platform/meta/workers/modules/dedicated-worker-import-failure.html.ini
@@ -4,7 +4,7 @@
     expected: FAIL
 
   [Dynamic import for non-existent script should throw an exception.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Worker construction for a file URL should throw an exception.]
     expected: FAIL
diff --git a/testing/web-platform/meta/workers/modules/dedicated-worker-import-meta.html.ini b/testing/web-platform/meta/workers/modules/dedicated-worker-import-meta.html.ini
index 3362697d228c..027af22a1063 100644
--- a/testing/web-platform/meta/workers/modules/dedicated-worker-import-meta.html.ini
+++ b/testing/web-platform/meta/workers/modules/dedicated-worker-import-meta.html.ini
@@ -1,11 +1,11 @@
 [dedicated-worker-import-meta.html]
   expected: ERROR
   [Test import.meta.url on the top-level module script.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Test import.meta.url on the imported module script.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Test import.meta.url on the imported module script with a fragment.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini b/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini
index 79c0cc75ffff..d6bf45ec84d7 100644
--- a/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini
+++ b/testing/web-platform/meta/workers/modules/dedicated-worker-import.any.js.ini
@@ -1,34 +1,34 @@
 [dedicated-worker-import.any.html]
   expected: ERROR
   [Static import.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Nested static import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Static import and then dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Nested dynamic import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [Dynamic import and then static import.]
-    expected: NOTRUN
+    expected: FAIL
 
   [eval(import()).]
-    expected: NOTRUN
+    expected: FAIL
 
 
 [dedicated-worker-import.any.worker.html]
   expected: ERROR
   [Static import.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Nested static import.]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Static import and then dynamic import.]
     expected: NOTRUN
diff --git a/testing/web-platform/mozilla/meta/MANIFEST.json b/testing/web-platform/mozilla/meta/MANIFEST.json
index f992ffa6cf3f..a01cd2520d04 100644
--- a/testing/web-platform/mozilla/meta/MANIFEST.json
+++ b/testing/web-platform/mozilla/meta/MANIFEST.json
@@ -298,11 +298,6 @@
      {}
     ]
    ],
-   "wasm/js/indexeddb.js": [
-    [
-     {}
-    ]
-   ],
    "wasm/js/int_exprs.wast.js": [
     [
      {}
@@ -868,12 +863,6 @@
      {}
     ]
    ],
-   "wasm/indexeddb.js.html": [
-    [
-     "/_mozilla/wasm/indexeddb.js.html",
-     {}
-    ]
-   ],
    "wasm/int_exprs.wast.js.html": [
     [
      "/_mozilla/wasm/int_exprs.wast.js.html",
@@ -1415,10 +1404,6 @@
    "d684d926f4328482dd5a41cee07ea2d4c472cdb2",
    "testharness"
   ],
-  "wasm/indexeddb.js.html": [
-   "f7f6d778cc350b5db5d938f0e276df8befbcb464",
-   "testharness"
-  ],
   "wasm/int_exprs.wast.js.html": [
    "b2fce1586af5a68d17a03e97a56595760a0b0fc2",
    "testharness"
@@ -1571,10 +1556,6 @@
    "ce2c6f93b8102fdd0d9fde9c038c1261858a3056",
    "support"
   ],
-  "wasm/js/indexeddb.js": [
-   "f6e18fb66be0fa51219f1759940fd66f913c0629",
-   "support"
-  ],
   "wasm/js/int_exprs.wast.js": [
    "c7b1a5cd565107a9d2ed860c88bbbda7f20c111f",
    "support"
diff --git a/testing/web-platform/mozilla/tests/wasm/indexeddb.js.html b/testing/web-platform/mozilla/tests/wasm/indexeddb.js.html
deleted file mode 100644
index f7f6d778cc35..000000000000
--- a/testing/web-platform/mozilla/tests/wasm/indexeddb.js.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-    <head>
-        <meta charset="UTF-8">
-        <title>WebAssembly Web Platform Test</title>
-    </head>
-    <body>
-
-        <script src=/resources/testharness.js></script>
-        <script src=/resources/testharnessreport.js></script>
-        <script src=./js/harness/index.js></script>
-        <script src=./js/harness/wasm-constants.js></script>
-        <script src=./js/harness/wasm-module-builder.js></script>
-
-        <div id=log></div>
-        <script src=./js/indexeddb.js></script>
-    </body>
-</html>
diff --git a/testing/web-platform/mozilla/tests/wasm/js/indexeddb.js b/testing/web-platform/mozilla/tests/wasm/js/indexeddb.js
deleted file mode 100644
index f6e18fb66be0..000000000000
--- a/testing/web-platform/mozilla/tests/wasm/js/indexeddb.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2017 WebAssembly Community Group participants
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
-
-(function testIndexedDB() {
-    const IDB_NAME = "spec-test";
-    const OBJECT_STORE_NAME = "wasm";
-
-    let db = null;
-
-    function openDB() {
-        console.log('Opening db...');
-        return new Promise((resolve, reject) => {
-            request = indexedDB.open(IDB_NAME, 1);
-            request.onerror = reject;
-            request.onsuccess = () => {
-                db = request.result;
-                console.log('Retrieved db:', db);
-                resolve();
-            };
-            request.onupgradeneeded = () => {
-                console.log('Creating object store...');
-                request.result.createObjectStore(OBJECT_STORE_NAME);
-                request.onerror = reject;
-                request.onupgradeneeded = reject;
-                request.onsuccess = () => {
-                    db = request.result;
-                    console.log('Created db:', db);
-                    resolve();
-                };
-            };
-        });
-    }
-
-    function getObjectStore() {
-        return db.transaction([OBJECT_STORE_NAME], "readwrite").objectStore(OBJECT_STORE_NAME);
-    }
-
-    function clearStore() {
-        console.log('Clearing store...');
-        return new Promise((resolve, reject) => {
-            var request = getObjectStore().clear();
-            request.onerror = reject;
-            request.onupgradeneeded = reject;
-            request.onsuccess = resolve;
-        });
-    }
-
-    function makeModule() {
-        return new Promise(resolve => {
-            let builder = new WasmModuleBuilder();
-            builder.addFunction('run', kSig_i_v)
-                .addBody([
-                    kExprI32Const,
-                    42,
-                    kExprReturn,
-                    kExprEnd
-                ])
-                .exportFunc();
-            let source = builder.toBuffer();
-
-            let module = new WebAssembly.Module(source);
-            let i = new WebAssembly.Instance(module);
-            assert_equals(i.exports.run(), 42);
-
-            resolve(module);
-        });
-    }
-
-    function storeWasm(module) {
-        console.log('Storing wasm object...', module);
-        return new Promise((resolve, reject) => {
-            request = getObjectStore().add(module, 1);
-            request.onsuccess = resolve;
-            request.onerror = reject;
-            request.onupgradeneeded = reject;
-        });
-    }
-
-    function loadWasm() {
-        console.log('Loading wasm object...');
-        return new Promise((resolve, reject) => {
-            var request = getObjectStore().get(1);
-            request.onsuccess = () => {
-                let i = new WebAssembly.Instance(request.result);
-                assert_equals(i.exports.run(), 42);
-                resolve();
-            }
-            request.onerror = reject;
-            request.onupgradeneeded = reject;
-        });
-    }
-
-    function run() {
-        return openDB()
-        .then(() => clearStore())
-        .then(() => makeModule())
-        .then(wasm => storeWasm(wasm))
-        .then(() => loadWasm());
-    }
-
-    promise_test(run, "store and load from indexeddb");
-})();
diff --git a/testing/web-platform/tests/IndexedDB/wasm-module-value.html b/testing/web-platform/tests/IndexedDB/wasm-module-value.html
deleted file mode 100644
index 9fcfd780b8e5..000000000000
--- a/testing/web-platform/tests/IndexedDB/wasm-module-value.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<meta name="timeout" content="long">
-<title>IndexedDB: WebAssembly module values</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/">
-<link rel="help" href="https://webassembly.github.io/spec/">
-<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="support-promises.js"></script>
-<script>
-'use strict';
-
-// Binary representation for a WASM module that exports an "inc" function.
-//
-// This test covers storing WASM modules in IndexedDB. Its failure should only
-// be debugged if WASM specification tests pass. To this end, the test does not
-// use the WASM module builder helpers, trading off WASM debuggability in return
-// for having the WASM wire bytes listed explicitly in the test body. Having the
-// wire bytes spelled out can be helpful when debugging IndexedDB failures.
-let wasm_module_bytes = new Uint8Array([
-  0x00, 0x61, 0x73, 0x6d,  // Magic.
-  0x01, 0x00, 0x00, 0x00,  // Version.
-  0x01, 0x06, 0x01,              // Type section - 6 bytes, 1 entry
-  0x60, 0x01, 0x7f, 0x01, 0x7f,  // Type 0. Function: (i32) -> (i32)
-  0x03, 0x02, 0x01,   // Function section - 2 bytes, 1 entry
-  0x00,               // Function 0: Type 0
-  0x07, 0x07, 0x01,              // Export section - 7 bytes, 1 entry
-  0x03, 0x69, 0x6e, 0x63,        // Export 1. { name: "inc"
-  0x00, 0x00,                    //             desc: function 0 }
-  0x0a, 0x09, 0x01,  // Code section: 9 bytes, 1 entry
-  0x07, 0x00,        // Function 1: 7 code bytes, 0 locals
-  0x20, 0x00,        //   getlocal 0
-  0x41, 0x01,        //   i32.const 1
-  0x6a,              //   i32.add
-  0x0b,              //   end
-]);
-
-promise_test(async testCase => {
-  const wasm_module = await WebAssembly.compile(wasm_module_bytes.buffer);
-
-  const database = await createDatabase(testCase, (database, transaction) => {
-    const store = database.createObjectStore('store');
-    store.put(wasm_module, 'key1');
-  });
-
-  const result = await new Promise((resolve, reject) => {
-    const transaction = database.transaction(['store'], 'readonly');
-    const store = transaction.objectStore('store');
-    const request = store.get('key1');
-    request.onsuccess = (event) => resolve(event.target.result);
-    request.onerror = (event) => reject(event.target.error);
-  });
-
-  database.close();
-
-  const instance = await WebAssembly.instantiate(result);
-  assert_equals(
-      instance.exports['inc'](42), 43, 'inc should increment its argument');
-}, 'WebAssembly module as an IndexedDB value');
-
-promise_test(async testCase => {
-  const wasm_module = await WebAssembly.compile(wasm_module_bytes.buffer);
-
-  const database = await createDatabase(testCase, (database, transaction) => {
-    const store = database.createObjectStore('store');
-    store.put({ module: wasm_module }, 'key1');
-  });
-
-  const result = await new Promise((resolve, reject) => {
-    const transaction = database.transaction(['store'], 'readonly');
-    const store = transaction.objectStore('store');
-    const request = store.get('key1');
-    request.onsuccess = (event) => resolve(event.target.result);
-    request.onerror = (event) => reject(event.target.error);
-  });
-
-  database.close();
-
-  const instance = await WebAssembly.instantiate(result.module);
-  assert_equals(
-      instance.exports['inc'](42), 43, 'inc should increment its argument');
-}, 'WebAssembly module in a JavaScript object IndexedDB value');
-
-promise_test(async testCase => {
-  const wasm_module = await WebAssembly.compile(wasm_module_bytes.buffer);
-
-  const database = await createDatabase(testCase, (database, transaction) => {
-    const store = database.createObjectStore('store', { keyPath: 'key' });
-    store.put({ key: 'key1', module: wasm_module });
-  });
-
-  const result = await new Promise((resolve, reject) => {
-    const transaction = database.transaction(['store'], 'readonly');
-    const store = transaction.objectStore('store');
-    const request = store.get('key1');
-    request.onsuccess = (event) => resolve(event.target.result);
-    request.onerror = (event) => reject(event.target.error);
-  });
-
-  database.close();
-
-  assert_equals('key1', result.key);
-  const instance = await WebAssembly.instantiate(result.module);
-  assert_equals(
-      instance.exports['inc'](42), 43, 'inc should increment its argument');
-}, 'WebAssembly module in an IndexedDB value with an inline key');
-
-</script>
diff --git a/testing/web-platform/tests/content-security-policy/META.yml b/testing/web-platform/tests/content-security-policy/META.yml
index 99c5a782cffc..ee8f1ea7e07b 100644
--- a/testing/web-platform/tests/content-security-policy/META.yml
+++ b/testing/web-platform/tests/content-security-policy/META.yml
@@ -1,3 +1,4 @@
 spec: https://w3c.github.io/webappsec-csp/
 suggested_reviewers:
+  - andypaicu
   - hillbrad
diff --git a/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js b/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
index 6d2e64f8f7e9..c1b2e673eced 100644
--- a/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
+++ b/testing/web-platform/tests/content-security-policy/embedded-enforcement/support/testharness-helper.sub.js
@@ -119,11 +119,11 @@ function assert_iframe_with_csp(t, url, csp, shouldBlock, urlId, blockedURI) {
 
   if (shouldBlock) {
     // Assert iframe does not load and is inaccessible.
-    window.onmessage = function (e) {
+    window.onmessage = t.step_func(function(e) {
       if (e.source != i.contentWindow)
           return;
-      t.assert_unreached('No message should be sent from the frame.');
-    }
+      assert_unreached('No message should be sent from the frame.');
+    });
     i.onload = t.step_func(function () {
       // Delay the check until after the postMessage has a chance to execute.
       setTimeout(t.step_func_done(function () {
diff --git a/testing/web-platform/tests/cookie-store/httponly_cookies.https.window.js b/testing/web-platform/tests/cookie-store/httponly_cookies.https.window.js
index 01239aec58fb..8a10e358ef6d 100644
--- a/testing/web-platform/tests/cookie-store/httponly_cookies.https.window.js
+++ b/testing/web-platform/tests/cookie-store/httponly_cookies.https.window.js
@@ -45,3 +45,25 @@ cookie_test(async t => {
     eventPromise, {changed: [{name: 'TEST', value: 'dummy'}]},
     'HttpOnly cookie deletion was not observed');
 }, 'HttpOnly cookies are not observed');
+
+
+cookie_test(async t => {
+  document.cookie = 'cookie1=value1; path=/';
+  document.cookie = 'cookie2=value2; path=/; httponly';
+  document.cookie = 'cookie3=value3; path=/';
+  assert_equals(
+    await getCookieStringHttp(), 'cookie1=value1; cookie3=value3',
+    'Trying to store an HttpOnly cookie with document.cookie fails');
+}, 'HttpOnly cookies can not be set by document.cookie');
+
+
+// Historical: Early iterations of the proposal included an httpOnly option.
+cookie_test(async t => {
+  await cookieStore.set('cookie1', 'value1');
+  await cookieStore.set('cookie2', 'value2', {httpOnly: true});
+  await cookieStore.set('cookie3', 'value3');
+  assert_equals(
+    await getCookieStringHttp(),
+    'cookie1=value1; cookie2=value2; cookie3=value3',
+    'httpOnly is not an option for CookieStore.set()');
+}, 'HttpOnly cookies can not be set by CookieStore');
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-001.html b/testing/web-platform/tests/css/css-contain/contain-layout-001.html
index c8895b9a6670..85b959da2b9a 100644
--- a/testing/web-platform/tests/css/css-contain/contain-layout-001.html
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-001.html
@@ -9,11 +9,15 @@
   <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-layout">
 
 <style>
-span {
+#pa {
   contain: layout;
   height: 100vh; /*If layout containment applies, the span becomes a BFC, height applies, and knocks SS off the page */
 }
+
+#ss {
+  vertical-align: bottom;
+}
 </style>
 
 <p>Test passes if there is the word "PASS" below.</p>
-<div><span>PA</span>SS</div>
+<div><span id="pa">PA</span><span id="ss">SS</span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-016.html b/testing/web-platform/tests/css/css-contain/contain-layout-016.html
new file mode 100644
index 000000000000..e8fdede27744
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-016.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Layout containment stacking context</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+<link rel="match" href="../reference/pass_if_pass_below.html">
+<meta name=assert content="Layout containment elements create a stacking context.">
+<style>
+div {
+  contain: layout;
+  background: white;
+}
+span {
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is the word "PASS" below.</p>
+<div><span>PASS</span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-017.html b/testing/web-platform/tests/css/css-contain/contain-layout-017.html
new file mode 100644
index 000000000000..c8118ad97484
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-017.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Layout containment stacking context</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+<link rel="match" href="../reference/nothing.html">
+<meta name=assert content="Elements in which layout containment doesn't apply, do not create a stacking context.">
+<style>
+div {
+  display: ruby-text;
+  contain: layout;
+  background: white;
+}
+span {
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>There should be nothing below.</p>
+<div><span>FAIL</span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-breaks-002.html b/testing/web-platform/tests/css/css-contain/contain-layout-breaks-002.html
index 4398387f26ca..fadb3c41c536 100644
--- a/testing/web-platform/tests/css/css-contain/contain-layout-breaks-002.html
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-breaks-002.html
@@ -1,34 +1,54 @@
-<!doctype html>
-<html lang=en>
-  <meta charset=utf-8>
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
   <title>CSS-contain test: layout containment and forced breaks</title>
-  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
-  <meta name=flags content="">
-  <meta name=assert content="forced breaks within layout containment do not propagate to the parent.">
-  <link rel="match" href="reference/contain-layout-breaks-002-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-layout">
-  <link rel=help href="https://drafts.csswg.org/css-break-3/#forced-break">
 
-<style>
-article {
-  columns: 2 20px;
-  float: left;
-  height: 50px;
-  column-fill: auto;
-}
-div > div {
-  border-top: 20px solid orange;
-  break-before: column;
-}
-article > div {
-  border-top: 20px solid orange;
-  contain: layout;
-}
-</style>
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <meta content="" name="flags">
+  <meta content="forced breaks within layout containment do not propagate to the parent." name="assert">
 
-<p>Test passes if there are two orange boxes below.
-<article>
-  <div>
-    <div></div>
-  </div>
-</article>
+  <link href="reference/contain-layout-breaks-002-ref.html" rel="match">
+
+  <link href="https://drafts.csswg.org/css-contain-1/#containment-layout" rel="help">
+  <link href="https://drafts.csswg.org/css-break-3/#forced-break" rel="help">
+
+  <style>
+  article
+    {
+      column-fill: auto; /* columns are filled sequentially */
+      column-gap: 0em;
+      columns: 2 100px; /* 2 columns each 100px wide */
+      float: left; /* to make multi-column element shrink-wrap */
+      height: 400px; /* give more than enough to go wrong */
+    }
+
+  div#yellow-normal
+    {
+      border-top: yellow solid 100px;
+    }
+
+  div#blue-parent
+    {
+      border-top: blue solid 100px;
+      contain: layout;
+    }
+
+  div#orange-child
+    {
+      border-top: orange solid 100px;
+      break-before: column;
+    }
+  </style>
+
+  <p>Test passes if there is a) a blue square below a yellow square and b) an orange square on the righthand side of the yellow square.
+
+  <article>
+
+    <div id="yellow-normal"></div>
+
+    <div id="blue-parent">
+      <div id="orange-child"></div>
+    </div>
+
+  </article>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-cell-001.html b/testing/web-platform/tests/css/css-contain/contain-layout-cell-001.html
new file mode 100644
index 000000000000..d0a2f2844b96
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-cell-001.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' applies to 'table-cell' elements</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-cell-001-ref.html">
+
+  <meta content="In this test, the div#contain should act as the containing block for div#abs-pos ." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#table
+    {
+      background-color: blue;
+      border-spacing: 2px;
+      display: table;
+      height: 206px;
+      table-layout: fixed;
+      width: 206px;
+    }
+
+  div.row
+    {
+      display: table-row;
+    }
+
+  div.cell
+    {
+      background-color: white;
+      display: table-cell;
+    }
+
+  div#contain
+    {
+      contain: layout;
+    }
+
+  span
+    {
+      background-color: red;
+      color: yellow;
+      font-family: monospace;
+    }
+
+  div#abs-pos
+    {
+      background-color: green;
+      color: white;
+      font-family: monospace;
+      left: 0px;
+      position: absolute;
+      top: 0px;
+    }
+  </style>
+
+  <p>Test passes if there is the word PASS and if there is <strong>no red</strong>.
+
+  <div id="table">
+
+    <div class="row"><div class="cell">&nbsp;</div><div class="cell">&nbsp;</div></div>
+
+    <div class="row"><div class="cell">&nbsp;</div><div class="cell" id="contain"><span>FAIL</span><div id="abs-pos">PASS</div></div></div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-cell-002.html b/testing/web-platform/tests/css/css-contain/contain-layout-cell-002.html
new file mode 100644
index 000000000000..5d4eff0c2bf5
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-cell-002.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' applies to 'table-cell' elements</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-cell-001-ref.html">
+
+  <meta content="In this test, the td#contain should act as the containing block for div#abs-pos ." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  table
+    {
+      background-color: blue;
+      border-spacing: 2px;
+      height: 206px;
+      table-layout: fixed;
+      width: 206px;
+    }
+
+  td
+    {
+      background-color: white;
+      padding: 0px;
+      vertical-align: baseline;
+    }
+
+  td#contain
+    {
+      contain: layout;
+    }
+
+  span
+    {
+      background-color: red;
+      color: yellow;
+      font-family: monospace;
+    }
+
+  div#abs-pos
+    {
+      background-color: green;
+      color: white;
+      font-family: monospace;
+      left: 0px;
+      position: absolute;
+      top: 0px;
+    }
+  </style>
+
+  <p>Test passes if there is the word PASS and if there is <strong>no red</strong>.
+
+  <table>
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+    <tr><td>&nbsp;<td id="contain"><span>FAIL</span><div id="abs-pos">PASS</div>
+
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ifc-022.html b/testing/web-platform/tests/css/css-contain/contain-layout-ifc-022.html
new file mode 100644
index 000000000000..3e4f3dafbf21
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ifc-022.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and creation of an independent formating context: text no longer flowing around a float</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ifc-022-ref.html">
+
+  <meta content="This test checks that an element with 'contain: layout' will make such element create its own formatting context. In this test, the element with 'contain: layout' acts as if it has its own formatting context independent from div#floated-left element. In other words, the div#with-contain-layout is no longer required to flow its content around the div#floated-left element and current line boxes next to the float are no longer shortened to make room for the margin box of the float." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: transparent;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#floated-left
+    {
+      background-color: blue;
+      float: left;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#with-contain-layout
+    {
+      background-color: orange;
+      contain: layout;
+      width: 12em;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <!--
+
+  or
+
+  <p>Test passes if the orange rectangle and blue rectangle are side by side.
+
+  or
+
+  <p>Test passes if the orange rectangle and blue rectangle are apart from each other.
+
+  -->
+
+  <div id="floated-left">Some text in a blue rectangle.</div>
+
+  <div id="with-contain-layout">Some text in an orange rectangle. Some text in an orange rectangle. Some text in an orange rectangle.</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-013.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-013.html
new file mode 100644
index 000000000000..d1431737352e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-013.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-013-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: scroll;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      width: 0;
+    }
+  </style>
+
+ <body onload="document.getElementById('outer').scrollLeft = 4000;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner">&nbsp;&nbsp;&nbsp;&nbsp;FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-014.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-014.html
new file mode 100644
index 000000000000..ad1c94e16105
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-014.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-013-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: scroll;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      height: 0;
+    }
+  </style>
+
+  <!--
+
+  150px : height of 1 line box
+
+  -->
+
+ <body onload="document.getElementById('outer').scrollLeft = 250; document.getElementById('outer').scrollTop = 150;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner">&nbsp;<br>FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-015.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-015.html
new file mode 100644
index 000000000000..0eaaf9ab436e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-015.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-015-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: auto;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      width: 0;
+    }
+  </style>
+
+ <body onload="document.getElementById('outer').scrollLeft = 4000;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner">&nbsp;&nbsp;&nbsp;&nbsp;FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-016.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-016.html
new file mode 100644
index 000000000000..e4ade9d7a46f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-016.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-015-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: auto;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      height: 0;
+    }
+  </style>
+
+  <!--
+
+  150px : height of 1 line box
+
+  -->
+
+ <body onload="document.getElementById('outer').scrollLeft = 250; document.getElementById('outer').scrollTop = 150;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner">&nbsp;<br>FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-017.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-017.html
new file mode 100644
index 000000000000..ebdcd04fcdbc
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-017.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-013-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: scroll;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      height: 0;
+      width: 0;
+    }
+  </style>
+
+  <!--
+
+  150px : height of 1 line box
+
+  -->
+
+ <body onload="document.getElementById('outer').scrollLeft = 4000; document.getElementById('outer').scrollTop = 150;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner"><br>FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-018.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-018.html
new file mode 100644
index 000000000000..bf00128bbb17
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-018.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: layout' and ink overflow</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-015-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its contents must be treated as ink overflow. In this test, the content overflows the div#inner. If such content was treated as 'overflow: visible', then the div#outer would 'pick up' such content and would make it reachable and accessible via its own generated scrollbar. But the overflowed content must be treated as ink overflow and is therefore treated as a graphical effect that is beyond the scrolling mechanism and outside the scrolling mechanism." name="assert">
+
+  <style>
+  div#outer
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      line-height: 1.5; /* computes to 150px */
+      width: 4ch;
+
+      overflow: auto;
+    }
+
+  div#inner
+    {
+      color: red;
+      contain: layout;
+      height: 0;
+      width: 0;
+    }
+  </style>
+
+  <!--
+
+  150px : height of 1 line box
+
+  -->
+
+ <body onload="document.getElementById('outer').scrollLeft = 4000; document.getElementById('outer').scrollTop = 150;">
+
+  <p>Test passes if there is no red.
+
+  <div id="outer">
+    <div id="inner"><br>FAIL</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-019.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-019.html
new file mode 100644
index 000000000000..d4909aa70f59
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-019.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Test: 'contain: layout' on element that overflows and its parent has 'overflow: scroll'</title>
+
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-019-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its overflowing content must be treated as ink overflow. Such overflowing content therefore can not be reached and can not be accessed by the scrollbars or by the scrolling mechanism of the parent of such element. In this test, the parent has 'overflow: scroll'." name="assert">
+
+  <style>
+  div
+    {
+      height: 100px;
+      width: 100px;
+    }
+
+    /* this means that each and all 4 div's use the same definite height and width */
+
+  div#parent-with-overflow-scroll
+    {
+      overflow: scroll;
+    }
+
+  div#contain
+    {
+      contain: layout;
+    }
+
+  div#pass
+    {
+      background-color: green;
+    }
+
+  div#fail
+    {
+      background-color: red;
+    }
+  </style>
+
+  <!--
+
+    25px  : height of a very tall horizontal scrollbar
+ +
+   100px  : height of div#fail
+  =======
+   125px
+
+  -->
+
+  <body onload="document.getElementById('parent-with-overflow-scroll').scrollLeft = 100; document.getElementById('parent-with-overflow-scroll').scrollTop = 125;">
+
+  <p>Test passes if there is a filled green square <strong>with 2 scroll bars</strong> and if there is <strong>no red</strong>.
+
+  <div id="parent-with-overflow-scroll">
+
+    <div id="contain">
+
+      <div id="pass"></div>
+
+      <div id="fail"></div>
+
+    </div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-020.html b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-020.html
new file mode 100644
index 000000000000..2ed9062eb462
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-ink-overflow-020.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Test: 'contain: layout' on element that overflows and its parent has 'overflow: auto'</title>
+
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-overflow-3/#ink-overflow">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-layout-ink-overflow-020-ref.html">
+
+  <meta content="This test checks that when the contents of an element with 'contain: layout' overflows, its overflowing content must be treated as ink overflow. Such overflowing content therefore can not be reached and can not be accessed by the scrollbars or by the scrolling mechanism of the parent of such element. In this test, the parent has 'overflow: auto' and therefore will not create scrollbars or a scrolling mechanism because the ink overflow is not a scrollable region for the parent." name="assert">
+
+  <style>
+  div
+    {
+      height: 100px;
+      width: 100px;
+    }
+
+    /* this means that each and all 4 div's use the same definite height and width */
+
+  div#parent-with-overflow-auto
+    {
+      overflow: auto;
+    }
+
+  div#contain
+    {
+      contain: layout;
+    }
+
+  div#pass
+    {
+      background-color: green;
+    }
+
+  div#fail
+    {
+      background-color: red;
+    }
+  </style>
+
+  <!--
+
+    25px  : height of a very tall horizontal scrollbar
+ +
+   100px  : height of div#fail
+  =======
+   125px
+
+  -->
+
+  <body onload="document.getElementById('parent-with-overflow-auto').scrollLeft = 100; document.getElementById('parent-with-overflow-auto').scrollTop = 125;">
+
+  <p>Test passes if there is a filled green square, <strong>no scrollbar around it</strong> and <strong>no red</strong>.
+
+  <div id="parent-with-overflow-auto">
+
+    <div id="contain">
+
+      <div id="pass"></div>
+
+      <div id="fail"></div>
+
+    </div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-layout-size-003.html b/testing/web-platform/tests/css/css-contain/contain-layout-size-003.html
new file mode 100644
index 000000000000..1abbe267bd9f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-layout-size-003.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: a block with 'contain: layout size' alongside a float</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-layout-size-003-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: transparent;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#floated-left
+    {
+      background-color: blue;
+      float: left;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#with-contain-layout-size
+    {
+      background-color: orange;
+      width: 12em;
+
+      contain: layout size;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="floated-left">Some text in a blue rectangle.</div>
+
+  <div id="with-contain-layout-size">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-001.html b/testing/web-platform/tests/css/css-contain/contain-paint-001.html
index 37609e616dec..ca2eb6e6f98f 100644
--- a/testing/web-platform/tests/css/css-contain/contain-paint-001.html
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-001.html
@@ -15,7 +15,6 @@ div {
   background: blue;
   padding: 50px;
   border-radius: 100px;
-  border: white 50px solid;
   contain: paint;
 }
 div::before {
@@ -31,9 +30,8 @@ div::after {
   background: red;
   width: 50px;
   height: 50px;
-  float: left;
-  margin-top: 36px;
-  margin-left: -86px;
+  margin-top: 38px;
+  margin-left: -50px;
 }
 </style>
 
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-003.html b/testing/web-platform/tests/css/css-contain/contain-paint-003.html
deleted file mode 100644
index ae9238d35bff..000000000000
--- a/testing/web-platform/tests/css/css-contain/contain-paint-003.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html lang=en>
-  <meta charset=utf-8>
-  <title>CSS-contain test: paint containment applies to the principal box for tables</title>
-  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
-  <meta name=flags content="">
-  <meta name=assert content="paint containment applies to the principal box, which is the table wrapper box for tables">
-  <link rel="match" href="../reference/pass_if_pass_below.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
-
-<style>
-table { contain: paint; }
-</style>
-
-<p>Test passes if there is the word "PASS" below.</p>
-<table>
-  <caption>PASS</caption>
-</table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-011.html b/testing/web-platform/tests/css/css-contain/contain-paint-011.html
index fdb2d2d2c8c9..d18a667025f4 100644
--- a/testing/web-platform/tests/css/css-contain/contain-paint-011.html
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-011.html
@@ -4,21 +4,17 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
-<meta name=assert content="Paint containment doesn't apply to inline elements so they don't act as containing block for absolutely positioned descendants.">
+<meta name=assert content="Paint containment doesn't apply to non-atomic inline elements so they don't act as containing block for absolutely positioned descendants.">
 <style>
 #containing-block {
   position: relative;
   background: red;
   width: 100px;
   height: 100px;
-  padding: 20px;
-  box-sizing: border-box;
 }
 
 #contain-paint {
   contain: paint;
-  width: 50px;
-  height: 50px;
 }
 
 #abspos {
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-012.html b/testing/web-platform/tests/css/css-contain/contain-paint-012.html
index f3c635191467..471726a99c65 100644
--- a/testing/web-platform/tests/css/css-contain/contain-paint-012.html
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-012.html
@@ -4,21 +4,17 @@
 <link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
-<meta name=assert content="Paint containment doesn't apply to inline elements so they don't act as containing block for fixed positioned descendants.">
+<meta name=assert content="Paint containment doesn't apply to non-atomic inline elements so they don't act as containing block for fixed positioned descendants.">
 <style>
 #containing-block {
   transform: translateX(0);
   background: red;
   width: 100px;
   height: 100px;
-  padding: 20px;
-  box-sizing: border-box;
 }
 
 #contain-paint {
   contain: paint;
-  width: 50px;
-  height: 50px;
 }
 
 #fixed {
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-020.html b/testing/web-platform/tests/css/css-contain/contain-paint-020.html
new file mode 100644
index 000000000000..44a62172ed64
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-020.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Paint containment stacking context</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
+<link rel="match" href="../reference/pass_if_pass_below.html">
+<meta name=assert content="Paint containment elements create a stacking context.">
+<style>
+div {
+  contain: paint;
+  background: white;
+}
+span {
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is the word "PASS" below.</p>
+<div><span>PASS</span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-021.html b/testing/web-platform/tests/css/css-contain/contain-paint-021.html
new file mode 100644
index 000000000000..a8ea1c8bfc2d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-021.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Paint containment stacking context</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
+<link rel="match" href="../reference/nothing.html">
+<meta name=assert content="Elements in which paint containment doesn't apply, do not create a stacking context.">
+<style>
+div {
+  display: ruby-text;
+  contain: paint;
+  background: white;
+}
+span {
+  position: relative;
+  z-index: -1;
+}
+</style>
+
+<p>There should be nothing below.</p>
+<div><span>FAIL</span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-022.html b/testing/web-platform/tests/css/css-contain/contain-paint-022.html
new file mode 100644
index 000000000000..6f7fecda8e83
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-022.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and absolutely positioned descendants</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-022-ref.html">
+
+  <meta content="This test checks that paint containment applies to atomic inline elements and then they act as containing block for absolutely positioned descendants." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#incorrect-containing-block
+    {
+      color: transparent;
+      font-family: Ahem;
+      font-size: 100px;
+      height: 2em;
+      line-height: 1;
+      position: relative;
+      width: 2em;
+    }
+
+  div#correct-containing-block
+    {
+      background-color: red;
+      contain: paint;
+      display: inline-block;
+      height: 1em;
+      width: 1em;
+    }
+
+  div#abspos
+    {
+      background-color: green;
+      height: 1em;
+      left: 0;
+      position: absolute;
+      top: 0;
+      width: 1em;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="incorrect-containing-block">
+
+  AB C<div id="correct-containing-block">
+
+      <div id="abspos"></div>
+
+    </div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-023.html b/testing/web-platform/tests/css/css-contain/contain-paint-023.html
new file mode 100644
index 000000000000..368f75f02497
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-023.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and absolutely positioned descendants</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that paint containment applies to atomic inline elements so that they can act as containing block for absolutely positioned descendants." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#rel-pos-red
+    {
+      background-image: url("support/pattern-gg-gr-100x100.png");
+      color: green;
+      font-family: Ahem;
+      font-size: 50px;
+      height: 2em;
+      line-height: 1;
+      position: relative;
+      width: 2em;
+    }
+
+  div#containing-block
+    {
+      contain: paint;
+      display: inline-block;
+      height: 50%;
+      vertical-align: top;
+      width: 50%;
+    }
+
+  div#abspos
+    {
+      background-color: green;
+      height: 50px;
+      position: absolute;
+      left: 0px;
+      width: 50px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="rel-pos-red">
+
+    AB C<div id="containing-block">
+
+      <div id="abspos"></div>
+
+    </div>
+
+  </div>
+
+  <!--
+
+    |--------|
+    |  A  B  |
+    |    .---|
+    |  C |c-b|
+    |----|---|
+
+  -->
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-024.html b/testing/web-platform/tests/css/css-contain/contain-paint-024.html
new file mode 100644
index 000000000000..79ef8a7cc084
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-024.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and absolutely positioned descendants</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that paint containment does not apply to non-atomic inline elements so they do not act as containing block for absolutely positioned descendants." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#correct-containing-block
+    {
+      background-color: red;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+
+  div#incorrect-containing-block
+    {
+      contain: paint;
+      display: inline;
+    }
+
+  div#abspos
+    {
+      background-color: green;
+      bottom: 0;
+      height: 100%;
+      position: absolute;
+      right: 0;
+      width: 100%;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="correct-containing-block">
+
+    <div id="incorrect-containing-block">
+
+      <div id="abspos"></div>
+
+    </div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-047.html b/testing/web-platform/tests/css/css-contain/contain-paint-047.html
new file mode 100644
index 000000000000..e4a0b28457c7
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-047.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-047-ref.html">
+
+  <meta content="This test checks that an element with 'contain: paint' that has its content overflowing will clip at padding edge." name="assert">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: green;
+      contain: paint;
+      font-family: monospace;
+      font-size: 100px;
+      width: 4ch;
+    }
+
+  span
+    {
+      background-color: red;
+      color: yellow;
+    }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div>PASS<span>FAIL</span></div>
+
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-048.html b/testing/web-platform/tests/css/css-contain/contain-paint-048.html
new file mode 100644
index 000000000000..e48fcb64a4ac
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-048.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/ref-if-there-is-no-red.xht">
+
+  <meta content="This test checks that an element with 'contain: paint' that has its content overflowing will clip at padding edge." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: red;
+      contain: paint;
+      font-size: 100px;
+      width: 0;
+    }
+
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div>FAIL</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-cell-001.html b/testing/web-platform/tests/css/css-contain/contain-paint-cell-001.html
new file mode 100644
index 000000000000..964f33a21969
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-cell-001.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' applies to 'table-cell' elements</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-layout">
+  <link rel="match" href="reference/contain-paint-047-ref.html">
+
+  <meta content="This test checks that the paint containment applies to table-cell elements. Therefore the content of the table-cell element should be clipped to the padding edge of its principal box." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#table
+    {
+      display: table;
+      font-family: monospace;
+      font-size: 100px;
+      table-layout: fixed;
+      width: 4ch;
+    }
+
+  div.column
+    {
+      display: table-column;
+    }
+
+  div#middle-column
+    {
+      width: 4ch;
+    }
+
+  div.row
+    {
+      display: table-row;
+    }
+
+  div.cell
+    {
+      background-color: white;
+      display: table-cell;
+    }
+
+  div#contain
+    {
+      color: green;
+      contain: paint;
+    }
+
+  span
+    {
+      background-color: red;
+      color: yellow;
+    }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div id="table">
+
+    <div class="column"></div><div class="column" id="middle-column"></div><div class="column"></div>
+
+    <div class="row"><div class="cell"></div><div class="cell"></div><div class="cell"></div></div>
+
+    <div class="row"><div class="cell"></div><div class="cell" id="contain">PASS<span>FAIL</span></div><div class="cell"></div></div>
+
+    <div class="row"><div class="cell"></div><div class="cell"></div><div class="cell"></div></div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-cell-002.html b/testing/web-platform/tests/css/css-contain/contain-paint-cell-002.html
new file mode 100644
index 000000000000..e486aa2c576a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-cell-002.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and table-cell elements</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-047-ref.html">
+
+  <meta content="This test checks that the paint containment applies to table-cell elements. Therefore the content of the table-cell element should be clipped to the padding edge of its principal box." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  table
+    {
+      border-spacing: 0px;
+      /* to help reuse an already created reference file */
+      font-family: monospace;
+      font-size: 100px;
+      table-layout: fixed;
+      width: 4ch;
+    }
+
+  td
+    {
+      padding: 0px;
+      /* to help reuse an already created reference file */
+    }
+
+  col#middle-column
+    {
+      width: 4ch;
+    }
+
+  td#test
+    {
+      color: green;
+      contain: paint;
+  }
+
+  span
+    {
+      background-color: red;
+      color: yellow;
+    }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <table>
+
+    <col><col id="middle-column"><col>
+
+    <tr><td><td><td>
+
+    <tr><td><td id="test">PASS<span>FAIL</span><td>
+
+    <tr><td><td><td>
+
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-011.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-011.html
new file mode 100644
index 000000000000..643133a4f42f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-011.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      width: 100px;
+    }
+
+  div#red-overlapped-test
+    {
+      background-color: red;
+      contain: paint;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      bottom: 100px;
+      height: 100px;
+      position: relative;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="red-overlapped-test"><img src="support/swatch-red.png" width="200" height="100" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-012.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-012.html
new file mode 100644
index 000000000000..7040d6452aa7
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-012.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      height: 100px;
+      width: 100px;
+    }
+
+  div#red-overlapped-test
+    {
+      background-color: red;
+      contain: paint;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      bottom: 100px;
+      position: relative;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="red-overlapped-test"><img src="support/swatch-red.png" width="100" height="200" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-013.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-013.html
new file mode 100644
index 000000000000..e6311303f417
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-013.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div#red-overlapped-test
+    {
+      background-color: red;
+      contain: paint;
+      padding: 0px 25px;
+      width: 50px;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      bottom: 100px;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="red-overlapped-test"><img src="support/swatch-red.png" width="175" height="100" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-014.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-014.html
new file mode 100644
index 000000000000..8fe1071764b4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-014.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div#red-overlapped-test
+    {
+      background-color: red;
+      contain: paint;
+      height: 50px;
+      padding: 25px 0px;
+      width: 100px;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      bottom: 100px;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div id="red-overlapped-test"><img src="support/swatch-red.png" width="100" height="175" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-015.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-015.html
new file mode 100644
index 000000000000..b78f0d8b40b6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-015.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-clip-015-ref.html">
+  <!--
+  This test fails in Chromium 66.0.3359.117
+  -->
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box, taking corner clipping into account." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      border-radius: 50%;
+      height: 50px;
+      width: 50px;
+    }
+
+  div#red-container-circle
+    {
+      background-color: red;
+      contain: paint;
+      padding: 25px;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      bottom: 100px;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div id="red-container-circle"><img src="support/swatch-red.png" width="175" height="100" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-016.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-016.html
new file mode 100644
index 000000000000..8203eea8691d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-016.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping descendants at padding edge</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-clip-015-ref.html">
+  <!--
+  This test fails in Chromium 66.0.3359.117
+  -->
+
+  <meta content="This test checks that the paint of the descendant (a red square image) and its geometry is clipped to the padding edge of the element's principal box, taking corner clipping into account." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta name="flags" content="">
+
+  <style>
+  div#red-container-circle
+    {
+      background-color: red;
+      border-radius: 50%;
+      contain: paint;
+      height: 50px;
+      padding: 25px 0px;
+      width: 100px;
+    }
+
+  img
+    {
+      vertical-align: bottom;
+    }
+
+  div#green-overlapping-reference
+    {
+      background-color: green;
+      border-radius: 50%;
+      bottom: 100px;
+      height: 100px;
+      position: relative;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div id="red-container-circle"><img src="support/swatch-red.png" width="100" height="175" alt="Image download support must be enabled"></div>
+
+  <div id="green-overlapping-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-017.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-017.html
new file mode 100644
index 000000000000..d8213a5a33cf
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-017.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+
+ <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping at padding edge (generated ::before content)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-clip-015-ref.html">
+
+  <meta content="This test checks that the paint containment of an element clips at its padding edge. In this test, the generated element (a red square image) is located outside the content edge, into what would have been the padding belt of the element." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta content="" name="flags">
+
+  <style>
+  div
+    {
+      background-color: green;
+      border-radius: 100px;
+      contain: paint;
+      height: 50px;
+      padding: 25px;
+      width: 50px;
+    }
+
+  div::before
+    {
+      background-color: red;
+      content: "";
+      display: block;
+      height: 18px;
+      margin-left: 61px;
+      margin-top: -28px;
+      width: 18px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-clip-018.html b/testing/web-platform/tests/css/css-contain/contain-paint-clip-018.html
new file mode 100644
index 000000000000..17bcccdeff53
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-clip-018.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+
+ <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and clipping at padding edge (generated ::after content)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-clip-015-ref.html">
+
+  <meta content="This test checks that the paint containment of an element clips at its padding edge. In this test, the generated element (a red square image) is located outside the content edge, into what would have been the padding belt of the element." name="assert">
+
+  <!--
+
+  contain-paint-clip-011: content overflows horizontally, principal box has no padding
+
+  contain-paint-clip-012: content overflows vertically, principal box has no padding
+
+  contain-paint-clip-013: content overflows horizontally, principal box has horizontal padding
+
+  contain-paint-clip-014: content overflows vertically, principal box has vertical padding
+
+  contain-paint-clip-015: content overflow horizontally, principal box has horizontal padding and corner clipping is involved
+
+  contain-paint-clip-016: content overflow vertically, principal box has vertical padding and corner clipping is involved
+
+  contain-paint-clip-017: principal box has horizontal and vertical padding, generated ::before content is inside top-right corner
+
+  contain-paint-clip-018: principal box has horizontal and vertical padding, generated ::after content is inside top-left corner
+
+  -->
+
+  <meta content="" name="flags">
+
+  <style>
+  div
+    {
+      background-color: green;
+      border-radius: 100px;
+      contain: paint;
+      height: 50px;
+      padding: 25px;
+      width: 50px;
+    }
+
+  div::after
+    {
+      background-color: red;
+      content: "";
+      display: block;
+      height: 18px;
+      margin-left: -29px;
+      margin-top: -28px;
+      width: 18px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-ifc-011.html b/testing/web-platform/tests/css/css-contain/contain-paint-ifc-011.html
new file mode 100644
index 000000000000..b8a03936cbcc
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-ifc-011.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint' and margin collapsing</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-paint">
+  <link rel="match" href="reference/contain-paint-ifc-011-ref.html">
+
+  <meta content="This test checks that a block element with 'contain: paint' establishes a new block formatting context which is independent and separate from others. This causes margin collapsing to be ineffective among vertically-adjacent boxes. In this test, the top margin of parent boxes and top margin of their respective first in-flow child do not collapse. Also, in this test, the bottom margin of the last in-flow child of boxes and bottom margin of their respective parent boxes do not collapse." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      contain: paint;
+      margin: 30px 0px;
+    }
+
+  div#grand-grand-parent-orange
+    {
+      background-color: orange;
+    }
+
+  div#grand-parent-blue
+    {
+      background-color: blue;
+    }
+
+  div#parent-lime
+    {
+      background-color: lime;
+    }
+
+  div#collapse-through-child  /* margin collapsing through element */
+    {
+      contain: none;
+    }
+  </style>
+
+  <p>Test passes if there are 5 horizontal stripes across the page in this order (from top to bottom): an orange stripe, a blue stripe, a bright green stripe, a blue stripe and then an orange stripe.
+
+  <div id="grand-grand-parent-orange">
+
+    <div id="grand-parent-blue">
+
+      <div id="parent-lime">
+
+        <div id="collapse-through-child"></div>
+
+      </div>
+
+    </div>
+
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-size-001.html b/testing/web-platform/tests/css/css-contain/contain-paint-size-001.html
new file mode 100644
index 000000000000..930429b7ecc5
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-size-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint size' and table caption</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-paint-size-001-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  table
+    {
+      table-layout: fixed;
+      width: 206px;
+    }
+
+  caption
+    {
+      background-color: red;
+      border: green solid 1em;
+      color: red;
+      contain: paint size;
+      font-size: 20px;
+    }
+  </style>
+
+  <p>Test passes if there is a short horizontal green stripe and <strong>no red</strong>.
+
+  <table>
+
+  <caption>FAIL FAIL FAIL FAIL FAIL FAIL</caption>
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-size-002.html b/testing/web-platform/tests/css/css-contain/contain-paint-size-002.html
new file mode 100644
index 000000000000..5af0d54cec3a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-size-002.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: paint size' and block box</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-paint-size-001-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      background-color: red;
+      border: green solid 1em;
+      color: red;
+      contain: paint size;
+      font-size: 20px;
+      width: 166px;
+    }
+  </style>
+
+  <p>Test passes if there is a short horizontal green stripe and <strong>no red</strong>.
+
+  <div>FAIL FAIL FAIL FAIL FAIL FAIL</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-paint-size-003.html b/testing/web-platform/tests/css/css-contain/contain-paint-size-003.html
new file mode 100644
index 000000000000..51459a53feb6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-paint-size-003.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: a block with 'contain: paint size' alongside a float</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-layout-size-003-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: transparent;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#floated-left
+    {
+      background-color: blue;
+      float: left;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#with-contain-paint-size
+    {
+      background-color: orange;
+      width: 12em;
+
+      contain: paint size;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="floated-left">Some text in a blue rectangle.</div>
+
+  <div id="with-contain-paint-size">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-021.html b/testing/web-platform/tests/css/css-contain/contain-size-021.html
new file mode 100644
index 000000000000..14bd8119a0e4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-021.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline-block (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-021-ref.html">
+
+  <meta content="This test checks that when laying out an inline-block element with 'contain: size', the inline-block element must be treated as if it would have no contents. In this test, the inline-block element has 1 image and no in-flow block descendant." name="assert">
+  <meta name="flags" content="">
+
+  <!--
+
+  contain-size-021: inline-block with 1 image and no in-flow block descendant: width comparison
+
+  contain-size-022: inline-block with 1 image and no in-flow block descendant: height comparison
+
+  contain-size-023: inline-block with text and no in-flow block descendant: width comparison
+
+  contain-size-024: inline-block with text and no in-flow block descendant: height comparison
+
+  contain-size-025: inline-block and 2 in-flow block descendants made of images: width comparison
+
+  contain-size-026: inline-block and 2 in-flow block descendants made of images: height comparison
+
+  contain-size-027: inline-block and 2 in-flow block descendants made of text: width comparison
+
+  contain-size-028: inline-block and 2 in-flow block descendants made of text: height comparison
+
+  -->
+
+  <style>
+  div#inline-block-blue-test
+    {
+      background-color: blue;
+      contain: size;
+      display: inline-block;
+      padding: 50px;
+    }
+
+  div#orange-reference
+    {
+      background-color: orange;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div>
+    <div id="inline-block-blue-test"><img src="support/blue50wBy46h.png" alt="Image download support must be enabled"></div>
+  </div>
+
+  <div id="orange-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-023.html b/testing/web-platform/tests/css/css-contain/contain-size-023.html
new file mode 100644
index 000000000000..ce795c6402da
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-023.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline-block (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-021-ref.html">
+
+  <meta content="This test checks that when laying out an inline-block element with 'contain: size', the inline-block element must be treated as if it would have no contents. In this test, the inline-block element has text and no in-flow block descendant." name="assert">
+  <meta name="flags" content="">
+
+  <!--
+
+  contain-size-021: inline-block with 1 image and no in-flow block descendant: width comparison
+
+  contain-size-022: inline-block with 1 image and no in-flow block descendant: height comparison
+
+  contain-size-023: inline-block with text and no in-flow block descendant: width comparison
+
+  contain-size-024: inline-block with text and no in-flow block descendant: height comparison
+
+  contain-size-025: inline-block and 2 in-flow block descendants made of images: width comparison
+
+  contain-size-026: inline-block and 2 in-flow block descendants made of images: height comparison
+
+  contain-size-027: inline-block and 2 in-flow block descendants made of text: width comparison
+
+  contain-size-028: inline-block and 2 in-flow block descendants made of text: height comparison
+
+  -->
+
+  <style>
+  div.inline-block
+    {
+      display: inline-block;
+    }
+
+  div#blue-test
+    {
+      background-color: blue;
+      color: transparent;
+      contain: size;
+      font-size: 100px;
+      padding: 50px;
+    }
+
+  div#orange-reference
+    {
+      background-color: orange;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div>
+    <div id="blue-test" class="inline-block">B</div>
+  </div>
+
+  <div>
+    <div id="orange-reference" class="inline-block"></div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-025.html b/testing/web-platform/tests/css/css-contain/contain-size-025.html
new file mode 100644
index 000000000000..700a681e8c05
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-025.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline-block</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-021-ref.html">
+
+  <meta content="This test checks that when laying out an inline-block element with 'contain: size', the inline-block element must be treated as if it would have no contents. In this test, the inline-block element has 2 in-flow block descendants made of images." name="assert">
+  <meta name="flags" content="">
+
+  <!--
+
+  contain-size-021: inline-block with 1 image and no in-flow block descendant: width comparison
+
+  contain-size-022: inline-block with 1 image and no in-flow block descendant: height comparison
+
+  contain-size-023: inline-block with text and no in-flow block descendant: width comparison
+
+  contain-size-024: inline-block with text and no in-flow block descendant: height comparison
+
+  contain-size-025: inline-block and 2 in-flow block descendants made of images: width comparison
+
+  contain-size-026: inline-block and 2 in-flow block descendants made of images: height comparison
+
+  contain-size-027: inline-block and 2 in-flow block descendants made of text: width comparison
+
+  contain-size-028: inline-block and 2 in-flow block descendants made of text: height comparison
+
+  -->
+
+  <style>
+  div.inline-block
+    {
+      display: inline-block;
+    }
+
+  div#blue-test
+    {
+      background-color: blue;
+      contain: size;
+      padding: 50px;
+    }
+
+  span.block-descendant
+    {
+      display: block;
+    }
+
+  div#orange-reference
+    {
+      background-color: orange;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div>
+    <div id="blue-test" class="inline-block">
+      <span class="block-descendant"><img src="support/blue50wBy23h.png" alt="Image download support must be enabled"></span>
+      <span id="last-line-box" class="block-descendant"><img src="support/blue50wBy23h.png" alt="Image download support must be enabled"></span>
+    </div>
+  </div>
+
+  <div id="orange-reference" class="inline-block"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-027.html b/testing/web-platform/tests/css/css-contain/contain-size-027.html
new file mode 100644
index 000000000000..266402cb3140
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-027.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline-block</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-021-ref.html">
+
+  <meta content="This test checks that when laying out an inline-block element with 'contain: size', the inline-block element must be treated as if it would have no contents. In this test, the inline-block element has 2 in-flow block descendants made of text." name="assert">
+  <meta name="flags" content="">
+
+  <!--
+
+  contain-size-021: inline-block with 1 image and no in-flow block descendant: width comparison
+
+  contain-size-022: inline-block with 1 image and no in-flow block descendant: height comparison
+
+  contain-size-023: inline-block with text and no in-flow block descendant: width comparison
+
+  contain-size-024: inline-block with text and no in-flow block descendant: height comparison
+
+  contain-size-025: inline-block and 2 in-flow block descendants made of images: width comparison
+
+  contain-size-026: inline-block and 2 in-flow block descendants made of images: height comparison
+
+  contain-size-027: inline-block and 2 in-flow block descendants made of text: width comparison
+
+  contain-size-028: inline-block and 2 in-flow block descendants made of text: height comparison
+
+  -->
+
+  <style>
+  div.inline-block
+    {
+      display: inline-block;
+    }
+
+  div#blue-test
+    {
+      background-color: blue;
+      color: transparent;
+      contain: size;
+      font-size: 50px;
+      line-height: 1;
+      padding: 50px;
+    }
+
+  span.block-descendant
+    {
+      display: block;
+    }
+
+  div#orange-reference
+    {
+      background-color: orange;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div>
+    <div id="blue-test" class="inline-block">
+      <span class="block-descendant">B</span>
+      <span id="last-line-box" class="block-descendant">L</span>
+    </div>
+  </div>
+
+  <div>
+    <div id="orange-reference" class="inline-block"></div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-041.html b/testing/web-platform/tests/css/css-contain/contain-size-041.html
new file mode 100644
index 000000000000..44069a0c69b4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-041.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline replaced element (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-021-ref.html">
+
+  <meta content="This test checks that when laying out an inline replaced element with 'contain: size', the inline replaced element must be treated as having an intrinsic width and height of 0." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  img#blue-test
+    {
+      background-color: blue;
+      contain: size;
+      padding: 50px;
+    }
+
+  div#orange-reference
+    {
+      background-color: orange;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div><img id="blue-test" src="support/blue-100x100.png" alt="Image download support must be enabled"></div>
+
+  <div id="orange-reference"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-042.html b/testing/web-platform/tests/css/css-contain/contain-size-042.html
new file mode 100644
index 000000000000..e1d6b3ddfcb1
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-042.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to inline replaced element (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-022-ref.html">
+
+  <meta content="This test checks that when laying out an inline replaced element with 'contain: size', the inline replaced element must be treated as having an intrinsic width and height of 0." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  img#blue-test
+    {
+      background-color: blue;
+      contain: size;
+      padding: 50px;
+    }
+  </style>
+
+  <p>This test passes if the painted blue area is <strong>exactly as tall as</strong> the orange square.
+
+  <div><img id="blue-test" src="support/blue-100x100.png" alt="Image download support must be enabled"> <img id="orange-reference" src="support/swatch-orange.png" width="100" height="100" alt="Image download support must be enabled"></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-051.html b/testing/web-platform/tests/css/css-contain/contain-size-051.html
new file mode 100644
index 000000000000..d529df9ff7e7
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-051.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' does not apply to table-cell element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-051-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  td
+    {
+      contain: size;
+      font-size: 50px;
+    }
+  </style>
+
+  <p>Test passes if "5678" (without quotes) is readable and if the digits do not overlap each other.
+
+  <table>
+    <tr>
+      <td>5<td>6<td>7<td>8
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-052.html b/testing/web-platform/tests/css/css-contain/contain-size-052.html
new file mode 100644
index 000000000000..d32d154e7528
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-052.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' does not apply to table-cell element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-051-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div#table
+    {
+      border-spacing: 2px;
+      display: table;
+    }
+
+  div#table-row
+    {
+      display: table-row;
+    }
+
+  div.table-cell
+    {
+      contain: size;
+      display: table-cell;
+      font-size: 50px;
+      padding: 1px;
+    }
+  </style>
+
+  <p>Test passes if "5678" (without quotes) is readable and if the digits do not overlap each other.
+
+  <div id="table">
+    <div id="table-row">
+      <div class="table-cell">5</div><div class="table-cell">6</div><div class="table-cell">7</div><div class="table-cell">8</div>
+    </div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-056.html b/testing/web-platform/tests/css/css-contain/contain-size-056.html
new file mode 100644
index 000000000000..fa0f98b6b02c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-056.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to caption element</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-056-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  table
+    {
+      width: 400px;
+    }
+
+  caption
+    {
+      border: orange solid 3px;
+      color: blue;
+      contain: size;
+      font-size: 32px;
+    }
+  </style>
+
+  <p>Test passes if the words "Table caption" are below a thick orange line. Test fails if, instead of a thick orange line, there is an orange rectangle with the words "Table caption" in it.
+
+  <table>
+    <caption>Table caption</caption>
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-061.html b/testing/web-platform/tests/css/css-contain/contain-size-061.html
new file mode 100644
index 000000000000..2af24fc24be0
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-061.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to block box (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-061-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      contain: size;
+      font-size: 100px;
+      overflow: hidden;
+    }
+  </style>
+
+  <p>Test passes if the word FAIL is absent.
+
+  <div>FAIL</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-062.html b/testing/web-platform/tests/css/css-contain/contain-size-062.html
new file mode 100644
index 000000000000..60cb19424289
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-062.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' applies to block box (basic)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-062-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      border: orange solid 3px;
+      color: blue;
+      contain: size;
+      font-size: 32px;
+      width: 400px;
+    }
+  </style>
+
+  <p>Test passes if the words "Text sample" are below a thick orange line. Test fails if, instead of a thick orange line, there is an orange rectangle with the words "Text sample" in it.
+
+  <div>Text sample</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-breaks-001.html b/testing/web-platform/tests/css/css-contain/contain-size-breaks-001.html
index d8538f65d876..453d56073ca1 100644
--- a/testing/web-platform/tests/css/css-contain/contain-size-breaks-001.html
+++ b/testing/web-platform/tests/css/css-contain/contain-size-breaks-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="size containment makes element monolithic">
   <link rel="match" href="reference/contain-size-breaks-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
   <link rel=help href="https://drafts.csswg.org/css-break-3/#monolithic">
 
 <style>
@@ -15,7 +15,6 @@ article {
   column-gap: 0;
   columns: 3 1em;
   width: 3em;
-  column-fill: auto;
 
   font-size: 40px;
   font-family: ahem;
@@ -31,18 +30,35 @@ div {
 <p>This test passes if there is an orange rectangle below. If the shape is not a rectangle, the test fails.
 
 <article>
-<div>A A A A A</div>
+<div>A B C D E</div>
 </article>
 
 <!--
-If the element is monolythic, it may:
-* overflow and be a 1x5 em rectangle
-* be sliced and be 2 contigious 1x2.5 em rectangles, appearing as a single
-  2x2.5 em rectangle.
+As the element is monolithic it should either:
+* Overflow vertically, appearing as a single 1x5 em rectangle:
+    -----
+    | A |
+    | B |
+    | C |
+    | D |
+    | E |
+    -----
+
+* Be sliced, with one slice in each column, appearing as a single 2x2.5 em rectangle:
+    ----------
+    | A |' ◟ '
+    | B || D |
+    ' ◜ '| E |
+    ----------
+
 Either way, it will always appear as a single rectangle.
 
-If the element is not monolithic, it will fit 2 As in the first column, 2 in
-the second column, and the fith will be overflowing the div, either into the
-thrid column, or into the bottom of the second one.
+If the element is not monolithic, it will fit 2 letters (A & B) in the first column,
+2 (C & D) in the second column, and the fifth (E) will be overflowing the div,
+either into the third column, or into the bottom of the second one.
 Either way, this will not look like a rectangle.
+
+Note: We use some UTF-8 characters to simulate the sliced C on the ASCII diagrams:
+* U+25DC: ◜ Upper left quadrant circular arc
+* U+25DF: ◟ Lower left quadrant circular arc
 -->
diff --git a/testing/web-platform/tests/css/css-contain/contain-size-monolithic-001.html b/testing/web-platform/tests/css/css-contain/contain-size-monolithic-001.html
new file mode 100644
index 000000000000..30f19b6cbbd6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-size-monolithic-001.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: size' element is monolithic</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-gaps-and-rules">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-size">
+  <link rel="match" href="reference/contain-size-monolithic-001-ref.html">
+
+  <meta content="This test checks that an element with size containment becomes monolithic. In this test, the only way to break the content of such monolithic element is to break (or slice) the content at each pair of characters. Since column rules are only drawn between two columns that both have content and since the test expects only 1 column filled with content, therefore the column rule should not be painted, thus the 'no red' test success condition." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#multi-column
+    {
+      column-count: 2;
+      column-fill: balance; /* balance is the initial column-fill value */
+      column-gap: 4ch;
+      column-rule: red solid 4ch;
+      column-width: 2ch;
+      font-family: monospace;
+      font-size: 20px;
+      width: 8ch;
+    }
+
+  div#size-contain
+    {
+      contain: size;
+    }
+  </style>
+
+  <p>Test passes if "AB", "CD", "EF" and "GH" are vertically aligned into 1 single column and if there is <strong>no red</strong>.
+
+  <div id="multi-column">
+    <div id="size-contain">AB CD EF GH</div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-strict-001.html b/testing/web-platform/tests/css/css-contain/contain-strict-001.html
new file mode 100644
index 000000000000..142730c5cd3a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-strict-001.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: strict' and table caption</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-paint-size-001-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  table
+    {
+      table-layout: fixed;
+      width: 206px;
+    }
+
+  caption
+    {
+      background-color: red;
+      border: green solid 1em;
+      color: red;
+      contain: strict;
+      font-size: 20px;
+    }
+  </style>
+
+  <p>Test passes if there is a short horizontal green stripe and <strong>no red</strong>.
+
+  <table>
+
+  <caption>FAIL FAIL FAIL FAIL FAIL FAIL</caption>
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/contain-strict-002.html b/testing/web-platform/tests/css/css-contain/contain-strict-002.html
new file mode 100644
index 000000000000..369275e1d91a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-strict-002.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: strict' and block box</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-paint-size-001-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      background-color: red;
+      border: green solid 1em;
+      color: red;
+      contain: strict;
+      font-size: 20px;
+      width: 166px;
+    }
+  </style>
+
+  <p>Test passes if there is a short horizontal green stripe and <strong>no red</strong>.
+
+  <div>FAIL FAIL FAIL FAIL FAIL FAIL</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-strict-003.html b/testing/web-platform/tests/css/css-contain/contain-strict-003.html
new file mode 100644
index 000000000000..792710cd87d8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-strict-003.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: a block with 'contain: strict' alongside a float</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#contain-property">
+  <link rel="match" href="reference/contain-layout-size-003-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  div
+    {
+      color: transparent;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#floated-left
+    {
+      background-color: blue;
+      float: left;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#with-contain-strict
+    {
+      background-color: orange;
+      width: 12em;
+
+      contain: strict;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="floated-left">Some text in a blue rectangle.</div>
+
+  <div id="with-contain-strict">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.</div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-style-counters-001.html b/testing/web-platform/tests/css/css-contain/contain-style-counters-001.html
new file mode 100644
index 000000000000..30a29d7c25a1
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-style-counters-001.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: style' and counter</title>
+
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
+  <link rel="match" href="reference/contain-style-counters-001-ref.html">
+
+  <meta content="This test checks that when an element has 'contain: style', then counters which may be affecting its subtree are reset to 0 for such scope." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#create-counter
+    {
+      counter-reset: counter-of-span 9;
+    }
+
+    /*
+    This creates a new counter identified as "counter-of-span"
+    and initially sets such counter to 9 (an entirely
+    arbitrary number).
+    */
+
+  div#test
+    {
+      contain: style;
+      font-size: 3em;
+    }
+
+  div#test span
+    {
+      counter-increment: counter-of-span 5;
+    }
+
+    /*
+    This increments the counter identified as "counter-of-span"
+    of the step value of 5 (an entirely arbitrary number) each
+    and every time there is a <span> descendant within the subtree
+    of div#test
+    */
+
+  div#test span::after
+    {
+      content: counter(counter-of-span);
+    }
+    /*
+    Now, the generated content after the span is set to the
+    current value of the counter identified as "counter-of-span"
+    */
+
+  </style>
+
+
+  <p>Test passes if there is the digit 5.
+
+  <div id="create-counter"></div>
+
+  <div id="test"><span></span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-style-counters-002.html b/testing/web-platform/tests/css/css-contain/contain-style-counters-002.html
new file mode 100644
index 000000000000..eeaac6ace694
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-style-counters-002.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: style' and counter (with 'display: contents')</title>
+
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
+  <link rel="match" href="reference/contain-style-counters-001-ref.html">
+
+  <meta content="This test checks that when an element has 'contain: style', then counters which may be affecting its subtree are reset to 0 for such scope. In this test, the div#test does not generate a principal box because of 'display: contents'. Despite that particular condition, 'contain: style' will have an effect on div#test." name="assert">
+  <meta name="flags" content="">
+
+  <style>
+  div#create-counter
+    {
+      counter-reset: counter-of-span 9;
+    }
+
+    /*
+    This creates a new counter identified as "counter-of-span"
+    and initially sets such counter to 9 (an entirely
+    arbitrary number).
+    */
+
+  div#test
+    {
+      contain: style;
+      display: contents;
+      font-size: 3em;
+    }
+
+    /*
+    Other types of containment (size, layout, paint) have no
+    effect on box that do not generate a principal box which
+    is the case here with div#test because of 'display: contents'.
+    But in this test, 'contain: style' will apply and will
+    have a rendering effect on the counter.
+    */
+
+  div#test span
+    {
+      counter-increment: counter-of-span 5;
+    }
+
+    /*
+    This increments the counter identified as "counter-of-span"
+    of the step value of 5 (an entirely arbitrary number) each
+    and every time there is a <span> descendant within the subtree
+    of div#test
+    */
+
+  div#test span::after
+    {
+      content: counter(counter-of-span);
+    }
+    /*
+    Now, the generated content after the span is set to the
+    current value of the counter identified as "counter-of-span"
+    */
+
+  </style>
+
+
+  <p>Test passes if there is the digit 5.
+
+  <div id="create-counter"></div>
+
+  <div id="test"><span></span></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-style-counters-003.html b/testing/web-platform/tests/css/css-contain/contain-style-counters-003.html
new file mode 100644
index 000000000000..d99f139c500e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-style-counters-003.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: style' for counters (span children of &lt;body&gt;)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
+  <link rel="match" href="reference/contain-style-counters-003-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  body
+    {
+      counter-reset: counter-of-span 17;
+    }
+
+    /*
+    This creates a new counter identified as "counter-of-span"
+    and initially sets such counter to 17 (an entirely
+    arbitrary number)
+    */
+
+  body
+    {
+      contain: style;
+    }
+
+    /*
+    This will reset the counter to 0.
+    */
+
+  body span
+    {
+      counter-increment: counter-of-span 4;
+    }
+
+    /*
+    This increments the counter identified as "counter-of-span"
+    of the step value of 4 (an entirely arbitrary number) each
+    and every time there is a <span> descendant within the subtree
+    of div#test
+    */
+
+  div
+    {
+      font-size: 3em;
+    }
+
+  div::after
+    {
+      content: counter(counter-of-span);
+    }
+
+    /*
+    Now, the generated content after the span is set to the
+    current value of the counter identified as "counter-of-span"
+    */
+  </style>
+
+  <body>
+
+  <span></span> <span></span> <span></span> <span></span> <span></span>
+
+  <!-- 5 span above -->
+
+  <p>Test passes if there is the number 20.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-style-counters-004.html b/testing/web-platform/tests/css/css-contain/contain-style-counters-004.html
new file mode 100644
index 000000000000..1e751d155204
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/contain-style-counters-004.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Containment Test: 'contain: style' for counters (span descendants of &lt;body&gt;)</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+  <link rel="help" href="https://www.w3.org/TR/css-contain-1/#containment-style">
+  <link rel="match" href="reference/contain-style-counters-003-ref.html">
+
+  <meta name="flags" content="">
+
+  <style>
+  body
+    {
+      counter-reset: counter-of-span 13;
+    }
+
+    /*
+    This creates a new counter identified as "counter-of-span"
+    and initially sets such counter to 13 (an entirely
+    arbitrary number)
+    */
+
+  body
+    {
+      contain: style;
+    }
+
+    /*
+    This will reset the counter to 0.
+    */
+
+  body span
+    {
+      counter-increment: counter-of-span 5;
+    }
+
+    /*
+    This increments the counter identified as "counter-of-span"
+    of the step value of 5 (an entirely arbitrary number) each
+    and every time there is a <span> descendant within the subtree
+    of div#test
+    */
+
+  div
+    {
+      font-size: 3em;
+    }
+
+  div::after
+    {
+      content: counter(counter-of-span);
+    }
+
+    /*
+    Now, the generated content after the span is set to the
+    current value of the counter identified as "counter-of-span"
+    */
+  </style>
+
+  <body>
+
+  <p> <span></span> <span></span> <span></span> <span></span>
+
+  <!-- 4 span inside the <p> -->
+
+  <p>Test passes if there is the number 20.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/contain-style-counters.html b/testing/web-platform/tests/css/css-contain/contain-style-counters.html
deleted file mode 100644
index 55bf97f9f2a2..000000000000
--- a/testing/web-platform/tests/css/css-contain/contain-style-counters.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<title>CSS Containment Test: contain:style for counters</title>
-<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-style">
-<link rel="match" href="contain-style-counters-ref.html">
-<style>
-    #t1 { contain: style }
-    #t1 span::after { content: counter(t1) }
-    .t1-reset { counter-reset: t1 5 }
-    #t1 span { counter-increment: t1 1 }
-
-    #t2 {
-        contain: style;
-        display: contents;
-    }
-    #t2 span::after { content: counter(t2) }
-    .t2-reset { counter-reset: t2 7; }
-    #t2 span { counter-increment: t2 4; }
-</style>
-<div class="t1-reset"></div>
-<div id="t1"><span>You should see the number 1 here: </span></div>
-<div class="t2-reset"></div>
-<div id="t2"><span>You should see the number 4 here: </span></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html
index 9ecc3d2fd4b3..c68bee1d0aa4 100644
--- a/testing/web-platform/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-breaks-002-ref.html
@@ -1,25 +1,25 @@
-<!doctype html>
-<html lang=en>
-  <meta charset=utf-8>
-  <title>CSS-contain test reference</title>
-  <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
-  <meta name=flags content="">
+<!DOCTYPE html>
 
-<style>
-article {
-  columns: 2 20px;
-  float: left;
-  height: 50px;
-  column-fill: auto;
-}
-article > div {
-  break-before: column;
-  border-top: 20px solid orange;
-}
-</style>
+  <meta charset="UTF-8">
 
-<p>Test passes if there are two orange boxes below.
-<article>
-    <div></div>
-    <div></div>
-</article>
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      float: left;
+    }
+
+  img
+    {
+      vertical-align: top;
+    }
+  </style>
+
+  <p>Test passes if there is a) a blue square below a yellow square and b) an orange square on the righthand side of the yellow square.
+
+  <div><img src="../support/swatch-yellow.png" width="100" height="100" alt="Image download support must be enabled"><br><img src="../support/swatch-blue.png" width="100" height="100" alt="Image download support must be enabled"></div>
+
+  <div><img src="../support/swatch-orange.png" width="100" height="100" alt="Image download support must be enabled"></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-cell-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-cell-001-ref.html
new file mode 100644
index 000000000000..093dd363392d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-cell-001-ref.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  table
+    {
+      background-color: blue;
+      border-spacing: 2px;
+      height: 206px;
+      table-layout: fixed;
+      width: 206px;
+    }
+
+  td
+    {
+      background-color: white;
+      padding: 0px;
+      vertical-align: baseline;
+    }
+
+  span
+    {
+      background-color: green;
+      color: white;
+      font-family: monospace;
+    }
+  </style>
+
+  <p>Test passes if there is the word PASS and if there is <strong>no red</strong>.
+
+  <table>
+
+    <tr><td>&nbsp;<td>&nbsp;
+
+    <tr><td>&nbsp;<td><span>PASS</span>
+
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-ifc-022-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ifc-022-ref.html
new file mode 100644
index 000000000000..682af7d4f44b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ifc-022-ref.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      color: transparent;
+      float: left;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#blue-rectangle
+    {
+      background-color: blue;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#orange-rectangle
+    {
+      background-color: orange;
+      width: 12em;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="blue-rectangle">Some text in a blue rectangle.</div>
+
+  <div id="orange-rectangle">Some text in an orange rectangle. Some text in an orange rectangle. Some text in an orange rectangle.</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html
new file mode 100644
index 000000000000..a2b75db3147c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-013-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-family: monospace;
+      font-size: 100px;
+      height: 2.8ch;
+      overflow: scroll;
+      width: 4ch;
+    }
+  </style>
+
+ <body>
+
+  <p>Test passes if there is no red.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html
new file mode 100644
index 000000000000..8dbbbbd3ec37
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-015-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+ <body>
+
+  <p>Test passes if there is no red.
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html
new file mode 100644
index 000000000000..7ec1d1bf8e99
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-019-ref.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div#parent
+    {
+      height: 100px;
+      width: 100px;
+      overflow: scroll;
+    }
+
+  div#child
+    {
+      background-color: green;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <body onload="document.getElementById('parent').scrollLeft = 100; document.getElementById('parent').scrollTop = 125;">
+
+  <p>Test passes if there is a filled green square <strong>with 2 scroll bars</strong> and if there is <strong>no red</strong>.
+
+  <div id="parent">
+    <div id="child"></div>
+  </div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html
new file mode 100644
index 000000000000..57a4e9c361d4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-ink-overflow-020-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: green;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green square, <strong>no scrollbar around it</strong> and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-layout-size-003-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-layout-size-003-ref.html
new file mode 100644
index 000000000000..e3932a9b05f2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-layout-size-003-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      color: transparent;
+      float: left;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#blue-rectangle
+    {
+      background-color: blue;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#orange-rectangle
+    {
+      background-color: orange;
+      height: 0px;
+      width: 12em;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="blue-rectangle">Some text in a blue rectangle.</div>
+
+  <div id="orange-rectangle">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-001-ref.html
index 1ed4eca63a97..639fbb2248af 100644
--- a/testing/web-platform/tests/css/css-contain/reference/contain-paint-001-ref.html
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-001-ref.html
@@ -11,7 +11,6 @@ div {
   background: blue;
   padding: 50px;
   border-radius: 100px;
-  border: white 50px solid;
   overflow: hidden
 }
 div::before {
@@ -21,16 +20,6 @@ div::before {
   width: 100px;
   height: 100px;
 }
-div::after {
-  content:"";
-  display: block;
-  background: red;
-  width: 50px;
-  height: 50px;
-  float: left;
-  margin-top: 36px;
-  margin-left: -86px;
-}
 </style>
 
 <p>Test passes if there is a green square in a rounded blue box, and no red.
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-022-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-022-ref.html
new file mode 100644
index 000000000000..b3bb7576f294
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-022-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: green;
+      height: 100px;
+      left: 100px;
+      position: relative;
+      top: 100px;
+      width: 100px;
+    }
+
+  </style>
+
+  <p>Test passes if there is a filled green square and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-047-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-047-ref.html
new file mode 100644
index 000000000000..f13649977fce
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-047-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      color: green;
+      font-family: monospace;
+      font-size: 100px;
+  }
+  </style>
+
+  <p>Test passes if there is <strong>no red</strong>.
+
+  <div>PASS</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-clip-015-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-clip-015-ref.html
new file mode 100644
index 000000000000..781a6d2f2f4e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-clip-015-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: green;
+      border-radius: 50%;
+      height: 100px;
+      width: 100px;
+    }
+  </style>
+
+  <p>Test passes if there is a filled green circle and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-ifc-011-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-ifc-011-ref.html
new file mode 100644
index 000000000000..229c8c2d74ba
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-ifc-011-ref.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  p
+    {
+      margin-bottom: 30px;
+    }
+
+  div
+    {
+      height: 30px;
+    }
+
+  div.orange
+    {
+      background-color: orange;
+    }
+
+  div.blue
+    {
+      background-color: blue;
+    }
+
+  div#lime
+    {
+      background-color: lime;
+    }
+  </style>
+
+  <p>Test passes if there are 5 horizontal stripes across the page in this order (from top to bottom): an orange stripe, a blue stripe, a bright green stripe, a blue stripe and then an orange stripe.
+
+  <div class="orange"></div>
+
+  <div class="blue"></div>
+
+  <div id="lime"></div>
+
+  <div class="blue"></div>
+
+  <div class="orange"></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-001-ref.html
new file mode 100644
index 000000000000..9aad8a490b4b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-001-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      background-color: green;
+      height: 40px;
+      width: 206px;
+    }
+  </style>
+
+  <p>Test passes if there is a short horizontal green stripe and <strong>no red</strong>.
+
+  <div></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-003-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-003-ref.html
new file mode 100644
index 000000000000..27820fae7616
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-paint-size-003-ref.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      color: transparent;
+      float: left;
+      font-size: 16px;
+      padding: 8px;
+    }
+
+  div#blue-rectangle
+    {
+      background-color: blue;
+      margin: 8px;
+      width: 6em;
+    }
+
+  div#orange-rectangle
+    {
+      background-color: orange;
+      height: 0px;
+      overflow: hidden;
+      width: 12em;
+    }
+  </style>
+
+  <p>Test passes if the orange rectangle and blue rectangle do not overlap.
+
+  <div id="blue-rectangle">Some text in a blue rectangle.</div>
+
+  <div id="orange-rectangle">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore.</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-021-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-021-ref.html
new file mode 100644
index 000000000000..de9cea10501b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-021-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <p>This test passes if the painted blue area is <strong>exactly as wide as</strong> the orange square.
+
+  <div><img src="../support/swatch-blue.png" width="100" height="100" alt="Image download support must be enabled"></div>
+
+  <div><img src="../support/swatch-orange.png" width="100" height="100" alt="Image download support must be enabled"></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-022-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-022-ref.html
new file mode 100644
index 000000000000..3ca9ac9ee4d4
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-022-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <p>This test passes if the painted blue area is <strong>exactly as tall as</strong> the orange square.
+
+  <div><img src="../support/swatch-blue.png" width="100" height="100" alt="Image download support must be enabled"> <img src="../support/swatch-orange.png" width="100" height="100" alt="Image download support must be enabled"></div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-051-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-051-ref.html
new file mode 100644
index 000000000000..07455aaed22a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-051-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  td
+    {
+      font-size: 50px;
+    }
+  </style>
+
+  <p>Test passes if "5678" (without quotes) is readable and if the digits do not overlap each other.
+
+  <table>
+    <tr>
+      <td>5<td>6<td>7<td>8
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-056-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-056-ref.html
new file mode 100644
index 000000000000..2e73f0e42b77
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-056-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  table
+    {
+      width: 400px;
+    }
+
+  caption
+    {
+      border-top: orange solid 6px;
+      color: blue;
+      font-size: 32px;
+    }
+
+  span
+    {
+      bottom: 3px;
+      position: relative;
+    }
+  </style>
+
+  <p>Test passes if the words "Table caption" are below a thick orange line. Test fails if, instead of a thick orange line, there is an orange rectangle with the words "Table caption" in it.
+
+  <table>
+    <caption><span>Table caption</span></caption>
+  </table>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-061-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-061-ref.html
new file mode 100644
index 000000000000..756c20d40eb8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-061-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <p>Test passes if the word FAIL is absent.
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-062-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-062-ref.html
new file mode 100644
index 000000000000..dbfa77f6ac0d
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-062-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      border: orange solid 3px;
+      color: blue;
+      font-size: 32px;
+      height: 0px;
+      width: 400px;
+    }
+  </style>
+
+  <p>Test passes if the words "Text sample" are below a thick orange line. Test fails if, instead of a thick orange line, there is an orange rectangle with the words "Text sample" in it.
+
+  <div>Text sample</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-size-monolithic-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-size-monolithic-001-ref.html
new file mode 100644
index 000000000000..2e8f1ba70aae
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-size-monolithic-001-ref.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-family: monospace;
+      font-size: 20px;
+      width: 8ch;
+    }
+  </style>
+
+  <p>Test passes if "AB", "CD", "EF" and "GH" are vertically aligned into 1 single column and if there is <strong>no red</strong>.
+
+
+  <div>AB<br>CD<br>EF<br>GH</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-001-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-001-ref.html
new file mode 100644
index 000000000000..c0c652b33519
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-001-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-size: 3em;
+    }
+  </style>
+
+  <p>Test passes if there is the digit 5.
+
+  <div>5</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-003-ref.html b/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-003-ref.html
new file mode 100644
index 000000000000..8eb67b5943fa
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/contain-style-counters-003-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+
+  <meta charset="UTF-8">
+
+  <title>CSS Reference Test</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
+
+  <style>
+  div
+    {
+      font-size: 3em;
+    }
+  </style>
+
+  <p>Test passes if there is the digit 20.
+
+  <div>20</div>
diff --git a/testing/web-platform/tests/css/css-contain/reference/ref-if-there-is-no-red.xht b/testing/web-platform/tests/css/css-contain/reference/ref-if-there-is-no-red.xht
new file mode 100644
index 000000000000..a5b4e9f47a8e
--- /dev/null
+++ b/testing/web-platform/tests/css/css-contain/reference/ref-if-there-is-no-red.xht
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+
+  <title>CSS Reftest Reference</title>
+
+  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
+
+ </head>
+
+ <body>
+
+  <p>Test passes if there is <strong>no red</strong>.</p>
+
+ </body>
+</html>
\ No newline at end of file
diff --git a/testing/web-platform/tests/css/css-contain/support/blue-100x100.png b/testing/web-platform/tests/css/css-contain/support/blue-100x100.png
new file mode 100644
index 000000000000..3b72d5ce53c0
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/blue-100x100.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/blue50wBy23h.png b/testing/web-platform/tests/css/css-contain/support/blue50wBy23h.png
new file mode 100644
index 000000000000..d20129cc215d
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/blue50wBy23h.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/blue50wBy46h.png b/testing/web-platform/tests/css/css-contain/support/blue50wBy46h.png
new file mode 100644
index 000000000000..303d04045487
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/blue50wBy46h.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/pattern-gg-gr-100x100.png b/testing/web-platform/tests/css/css-contain/support/pattern-gg-gr-100x100.png
new file mode 100644
index 000000000000..fd9b7e1ef20c
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/pattern-gg-gr-100x100.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/swatch-blue.png b/testing/web-platform/tests/css/css-contain/support/swatch-blue.png
new file mode 100644
index 000000000000..bf2759634d45
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/swatch-blue.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/swatch-orange.png b/testing/web-platform/tests/css/css-contain/support/swatch-orange.png
new file mode 100644
index 000000000000..d3cd498b52bd
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/swatch-orange.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/swatch-red.png b/testing/web-platform/tests/css/css-contain/support/swatch-red.png
new file mode 100644
index 000000000000..1caf25c992aa
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/swatch-red.png differ
diff --git a/testing/web-platform/tests/css/css-contain/support/swatch-yellow.png b/testing/web-platform/tests/css/css-contain/support/swatch-yellow.png
new file mode 100644
index 000000000000..1591aa0e2e27
Binary files /dev/null and b/testing/web-platform/tests/css/css-contain/support/swatch-yellow.png differ
diff --git a/testing/web-platform/tests/css/css-pseudo/idlharness.html b/testing/web-platform/tests/css/css-pseudo/idlharness.html
new file mode 100644
index 000000000000..4c113fc9091f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-pseudo/idlharness.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<title>CSS Pseudo Element API IDL tests</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script>
+'use strict';
+
+idl_test(
+  ['css-pseudo'],
+  ['cssom', 'html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      Window: ['window'],
+      CSSPseudoElementList: ['beforeElements'],
+      CSSPseudoElement: ['beforeElements.item(0)'],
+    });
+
+    window.beforeElements =
+      window.getPseudoElements(document.body, 'before');
+  }
+);
+</script>
diff --git a/testing/web-platform/tests/css/css-pseudo/interfaces.html b/testing/web-platform/tests/css/css-pseudo/interfaces.html
deleted file mode 100644
index 572f87f62910..000000000000
--- a/testing/web-platform/tests/css/css-pseudo/interfaces.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<link rel="help" href="https://drafts.csswg.org/css-pseudo-4"/>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-
-<h1>CSS Pseudo-Elements IDL tests</h1>
-<div id=log></div>
-
-<script>
-'use strict';
-
-idl_test(
-  ['css-pseudo'],
-  ['cssom', 'html', 'dom'],
-  async idlArray => {
-    idlArray.add_objects({
-      Window: ['window'],
-      // TODO: CSSPseudoElement + CSSPseudoElementList
-    });
-  },
-  'CSS Pseudo-Elements interfaces'
-);
-</script>
diff --git a/testing/web-platform/tests/css/css-typed-om/interfaces.html b/testing/web-platform/tests/css/css-typed-om/interfaces.html
index e5a3638b8e6a..d21f3f469840 100644
--- a/testing/web-platform/tests/css/css-typed-om/interfaces.html
+++ b/testing/web-platform/tests/css/css-typed-om/interfaces.html
@@ -6,23 +6,73 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/WebIDLParser.js"></script>
 <script src="/resources/idlharness.js"></script>
+
+<style>
+  body {
+    font-size: normal;
+  }
+</style>
+
 <script>
 'use strict';
 
-promise_test(t => {
-  return fetch('/interfaces/css-typed-om.idl')
-    .then(response => response.text())
-    .then(idls => {
-      var idl_array = new IdlArray();
-      idl_array.add_idls(idls);
-      idl_array.add_untested_idls('interface Element {};');
-      idl_array.add_untested_idls('interface CSSStyleRule {};');
-      idl_array.add_untested_idls('interface ElementCSSInlineStyle {};');
-      idl_array.add_objects({
-        // TODO: Add more objects.
-      });
-      idl_array.test();
-      t.done();
+idl_test(
+  ['css-typed-om'],
+  ['cssom', 'SVG', 'geometry', 'html', 'dom'],
+  idl_array => {
+    try {
+      self.styleMap = document.styleSheets[0].rules[0].styleMap;
+    } catch (e) {}
+
+    try {
+      self.unitValue = CSSStyleValue.parse('height', '10px');
+    } catch (e) {}
+
+    try {
+      self.mathSum = CSSStyleValue.parse('width', 'calc(100% - 32px)');
+    } catch (e) {}
+
+    try {
+      self.transformValue = CSSStyleValue.parse('transform', 'translateX(0)');
+    } catch (e) {}
+
+    try {
+      self.rotate = CSSStyleValue.parse('transform', 'rotateX(0)')[0];
+    } catch (e) {}
+
+    try {
+      self.scale = CSSStyleValue.parse('transform', 'scale(1)')[0];
+    } catch (e) {}
+
+    try {
+      self.skew = CSSStyleValue.parse('transform', 'skew(0,0)')[0];
+      self.skewX = CSSStyleValue.parse('transform', 'skewX(0)')[0];
+      self.skewY = CSSStyleValue.parse('transform', 'skewY(0)')[0];
+    } catch (e) {}
+
+    try {
+      self.perspective = CSSStyleValue.parse('transform', 'perspective(0)')[0];
+    } catch (e) {}
+
+    try {
+      self.matrix = CSSStyleValue.parse('transform', 'matrix(0, 0, 0, 0, 0, 0)')[0];
+    } catch (e) {}
+
+    idl_array.add_objects({
+      StylePropertyMap: ['styleMap'],
+      CSSUnitValue: ['unitValue'],
+      CSSMathSum: ['mathSum'],
+      CSSTransformValue: ['transformValue'],
+      CSSTranslate: ['transformValue[0]'],
+      CSSRotate: ['rotate'],
+      CSSScale: ['scale'],
+      CSSSkew: ['skew'],
+      CSSSkewX: ['skewX'],
+      CSSSkewY: ['skewY'],
+      CSSPerspective: ['perspective'],
+      CSSMatrixComponent: ['matrix'],
     });
-}, 'CSS Typed OM IDL test');
+  },
+  'CSS Typed OM IDL test'
+);
 </script>
diff --git a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/color-rendering.html b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/color-rendering.html
index 3c47e3e47a9a..e6abf50f16a1 100644
--- a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/color-rendering.html
+++ b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/color-rendering.html
@@ -15,8 +15,8 @@
 
 runPropertyTests('color-rendering', [
   { syntax: 'auto' },
-  { syntax: 'optimizeSpeed' },
-  { syntax: 'optimizeQuality' },
+  { syntax: 'optimizespeed' },
+  { syntax: 'optimizequality' },
 ]);
 
 </script>
diff --git a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html
index 28ecdabf4026..f7cb4199a5b6 100644
--- a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html
+++ b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/shape-rendering.html
@@ -15,9 +15,9 @@
 
 runPropertyTests('shape-rendering', [
   { syntax: 'auto' },
-  { syntax: 'optimizeSpeed' },
-  { syntax: 'crispEdges' },
-  { syntax: 'geometricPrecision' },
+  { syntax: 'optimizespeed' },
+  { syntax: 'crispedges' },
+  { syntax: 'geometricprecision' },
 ]);
 
 </script>
diff --git a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html
index 13d2e3bc755d..88ef17da0e36 100644
--- a/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html
+++ b/testing/web-platform/tests/css/css-typed-om/the-stylepropertymap/properties/text-rendering.html
@@ -15,9 +15,9 @@
 
 runPropertyTests('text-rendering', [
   { syntax: 'auto' },
-  { syntax: 'optimizeSpeed' },
-  { syntax: 'optimizeLegibility' },
-  { syntax: 'geometricPrecision' },
+  { syntax: 'optimizespeed' },
+  { syntax: 'optimizelegibility' },
+  { syntax: 'geometricprecision' },
 ]);
 
 </script>
diff --git a/testing/web-platform/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png b/testing/web-platform/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png
index b14c75ea2c0d..fd9b7e1ef20c 100644
Binary files a/testing/web-platform/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png and b/testing/web-platform/tests/css/css-writing-modes/support/pattern-gg-gr-100x100.png differ
diff --git a/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md b/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md
index 2318e0e2e03f..7bf9e9aa9e6c 100644
--- a/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md
+++ b/testing/web-platform/tests/docs/_writing-tests/testdriver-tutorial.md
@@ -1,3 +1,9 @@
+---
+layout: page
+title: testdriver.js Tutorial
+order: 8.6
+---
+
 # Adding new commands to testdriver.js
 
 ## Assumptions
diff --git a/testing/web-platform/tests/domparsing/interfaces.any.js b/testing/web-platform/tests/domparsing/interfaces.any.js
index 4eaeabea85dd..f01aff013e80 100644
--- a/testing/web-platform/tests/domparsing/interfaces.any.js
+++ b/testing/web-platform/tests/domparsing/interfaces.any.js
@@ -5,12 +5,15 @@
 
 // https://w3c.github.io/DOM-Parsing/
 
-promise_test(async () => {
-  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
-  const idl = await fetch('/interfaces/DOM-Parsing.idl').then(r => r.text());
-  const idlArray = new IdlArray();
-  idlArray.add_untested_idls(dom);
-  idlArray.add_idls(idl);
-  idlArray.test();
-  done();
-}, 'Test driver');
+idl_test(
+  ['DOM-Parsing'],
+  ['dom'],
+  idlArray => {
+    idlArray.add_objects({
+      DOMParser: ['new DOMParser()'],
+      Element: ['document.createElement("div")'],
+      Range: ['new Range()'],
+      XMLSerializer: ['new XMLSerializer()'],
+    })
+  },
+  'DOM-Parsing interfaces');
diff --git a/testing/web-platform/tests/hr-time/idlharness.any.js b/testing/web-platform/tests/hr-time/idlharness.any.js
new file mode 100644
index 000000000000..4e266c09e335
--- /dev/null
+++ b/testing/web-platform/tests/hr-time/idlharness.any.js
@@ -0,0 +1,22 @@
+// META: global=window,worker
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://w3c.github.io/hr-time/
+
+idl_test(
+  ['hr-time'],
+  ['html', 'dom'],
+  async idl_array => {
+    if (self.GLOBAL.isWorker()) {
+      idl_array.add_objects({ WorkerGlobalScope: ['self'] });
+    } else {
+      idl_array.add_objects({ Window: ['self'] });
+    }
+    idl_array.add_objects({
+      Performance: ['performance'],
+    });
+  }
+);
diff --git a/testing/web-platform/tests/hr-time/idlharness.html b/testing/web-platform/tests/hr-time/idlharness.html
deleted file mode 100644
index d28cee3a7001..000000000000
--- a/testing/web-platform/tests/hr-time/idlharness.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-<title>High Resolution Time IDL tests</title>
-<link rel="author" title="W3C" href="http://www.w3.org/" />
-<link rel="help" href="http://www.w3.org/TR/hr-time/#sec-extenstions-performance-interface"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-</head>
-<body>
-<h1>High Resolution Time IDL tests</h1>
-<div id="log"></div>
-<script>
-'use strict';
-
-function doTest([dom, html, hr_time]) {
-  var idl_array = new IdlArray();
-  idl_array.add_untested_idls(dom, { only: ['EventTarget'] });
-  idl_array.add_untested_idls(html, { only: ['WindowOrWorkerGlobalScope'] });
-  idl_array.add_idls(hr_time);
-  idl_array.add_objects({
-    Performance: ["window.performance"],
-    Window: ["window"],
-  });
-  idl_array.test();
-}
-
-function fetchText(url) {
-  return fetch(url).then((response) => response.text());
-}
-
-promise_test(() => {
-  return Promise.all(['/interfaces/dom.idl',
-                      '/interfaces/html.idl',
-                      '/interfaces/hr-time.idl'].map(fetchText))
-                .then(doTest);
-}, 'Test driver');
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/html-media-capture/idlharness.html b/testing/web-platform/tests/html-media-capture/idlharness.html
deleted file mode 100644
index 93014f36f53c..000000000000
--- a/testing/web-platform/tests/html-media-capture/idlharness.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset='utf-8'>
-    <title>HTML Media Capture IDL tests</title>
-    <link rel='author' title='Intel' href='http://www.intel.com/'>
-    <link rel='help' href='https://w3c.github.io/html-media-capture'>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-    <script src='/resources/WebIDLParser.js'></script>
-    <script src='/resources/idlharness.js'></script>
-  </head>
-  <body>
-    <h1>HTML Media Capture IDL tests</h1>
-    <div id='log'></div>
-
-    <pre id='untested_idl' style='display:none'>
-      interface HTMLInputElement {
-      };
-      interface HTMLElement {
-      };
-      interface Element{
-      };
-    </pre>
-
-    <pre id='idl' style='display:none'>
-      partial interface HTMLInputElement {
-          [CEReactions]
-          attribute DOMString capture;
-      };
-    </pre>
-
-    <form style='display:none'>
-      <input id='testElement' type='file' accept='image/*' capture="user">
-    </form>
-
-    <script>
-      (function() {
-        let idl_array = new IdlArray();
-
-        idl_array.add_untested_idls(document.getElementById('untested_idl').textContent);
-        idl_array.add_idls(document.getElementById('idl').textContent);
-
-        let testElement = document.getElementById('testElement');
-        idl_array.add_objects({HTMLInputElement: [testElement]});
-        idl_array.test();
-      })();
-    </script>
-  </body>
-</html>
diff --git a/testing/web-platform/tests/html-media-capture/idlharness.window.js b/testing/web-platform/tests/html-media-capture/idlharness.window.js
new file mode 100644
index 000000000000..5382f53b4880
--- /dev/null
+++ b/testing/web-platform/tests/html-media-capture/idlharness.window.js
@@ -0,0 +1,18 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://w3c.github.io/html-media-capture/
+
+idl_test(
+  ['html-media-capture'],
+  ['html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      HTMLInputElement: ['input'],
+    });
+
+    self.input = document.createElement('input');
+  },
+  'html-media-capture interfaces.');
diff --git a/testing/web-platform/tests/html/browsers/the-window-object/window-open-noopener.html b/testing/web-platform/tests/html/browsers/the-window-object/window-open-noopener.html
index 7d1d430c0def..525605375374 100644
--- a/testing/web-platform/tests/html/browsers/the-window-object/window-open-noopener.html
+++ b/testing/web-platform/tests/html/browsers/the-window-object/window-open-noopener.html
@@ -6,6 +6,7 @@
 <meta name="variant" content="?_self">
 <meta name="variant" content="?_parent">
 <meta name="variant" content="?_top">
+<meta name=timeout content=long>
 
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
diff --git a/testing/web-platform/tests/html/dom/interfaces.worker.js b/testing/web-platform/tests/html/dom/interfaces.worker.js
index 9fc3dccc66bd..8bf24b51b083 100644
--- a/testing/web-platform/tests/html/dom/interfaces.worker.js
+++ b/testing/web-platform/tests/html/dom/interfaces.worker.js
@@ -28,7 +28,7 @@ promise_test(function() {
   return Promise.all([fetchData("/interfaces/html.idl"),
                       fetchData("/interfaces/dom.idl"),
                       fetchData("/interfaces/cssom.idl"),
-                      fetchData("/interfaces/touchevents.idl"),
+                      fetchData("/interfaces/touch-events.idl"),
                       fetchData("/interfaces/uievents.idl")])
                 .then(doTest);
 }, "Test driver");
diff --git a/testing/web-platform/tests/interfaces/META.yml b/testing/web-platform/tests/interfaces/META.yml
index e9ce8729d717..6895a5fc5674 100644
--- a/testing/web-platform/tests/interfaces/META.yml
+++ b/testing/web-platform/tests/interfaces/META.yml
@@ -1,3 +1,3 @@
 suggested_reviewers:
-  - jensl
-  - yuki3
+  - foolip
+  - lukebjerring
diff --git a/testing/web-platform/tests/interfaces/cookie-store.idl b/testing/web-platform/tests/interfaces/cookie-store.idl
index 4f53dbf0a47c..454da38b1824 100644
--- a/testing/web-platform/tests/interfaces/cookie-store.idl
+++ b/testing/web-platform/tests/interfaces/cookie-store.idl
@@ -69,7 +69,6 @@ dictionary CookieStoreSetOptions {
   USVString? domain = null;
   USVString path = "/";
   boolean secure = true;
-  boolean httpOnly = false;
   CookieSameSite sameSite = "strict";
 };
 
diff --git a/testing/web-platform/tests/interfaces/css-conditional.idl b/testing/web-platform/tests/interfaces/css-conditional.idl
index 6671de2960aa..bfc384db3e68 100644
--- a/testing/web-platform/tests/interfaces/css-conditional.idl
+++ b/testing/web-platform/tests/interfaces/css-conditional.idl
@@ -1,6 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the CSS Conditional Rules spec.
-// See https://drafts.csswg.org/css-conditional/
+// Content of this file was automatically extracted from the
+// "CSS Conditional Rules Module Level 3" spec.
+// See: https://drafts.csswg.org/css-conditional-3/
 
 partial interface CSSRule {
     const unsigned short SUPPORTS_RULE = 12;
@@ -27,7 +28,7 @@ interface CSSMediaRule : CSSConditionRule {
 interface CSSSupportsRule : CSSConditionRule {
 };
 
-partial interface CSS {
-  static boolean supports(CSSOMString property, CSSOMString value);
-  static boolean supports(CSSOMString conditionText);
+partial namespace CSS {
+  boolean supports(CSSOMString property, CSSOMString value);
+  boolean supports(CSSOMString conditionText);
 };
diff --git a/testing/web-platform/tests/interfaces/css-typed-om.idl b/testing/web-platform/tests/interfaces/css-typed-om.idl
index 45df5205d9a0..fa20d2d9bb80 100644
--- a/testing/web-platform/tests/interfaces/css-typed-om.idl
+++ b/testing/web-platform/tests/interfaces/css-typed-om.idl
@@ -1,6 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the CSS Typed OM spec.
-// See https://drafts.css-houdini.org/css-typed-om/
+// Content of this file was automatically extracted from the
+// "CSS Typed OM Level 1" spec.
+// See: https://drafts.css-houdini.org/css-typed-om-1/
 
 [Exposed=(Window, Worker, PaintWorklet, LayoutWorklet)]
 interface CSSStyleValue {
@@ -153,6 +154,14 @@ interface CSSMathMax : CSSMathValue {
     readonly attribute CSSNumericArray values;
 };
 
+[Exposed=(Window, Worker, PaintWorklet, LayoutWorklet),
+ Constructor(CSSNumberish min, CSSNumberish val, CSSNumberish max)]
+interface CSSMathClamp : CSSMathValue {
+    readonly attribute CSSNumericValue min;
+    readonly attribute CSSNumericValue val;
+    readonly attribute CSSNumericValue max;
+};
+
 [Exposed=(Window, Worker, PaintWorklet, LayoutWorklet)]
 interface CSSNumericArray {
     iterable<CSSNumericValue>;
@@ -167,11 +176,9 @@ enum CSSMathOperator {
     "invert",
     "min",
     "max",
+    "clamp",
 };
 
-// FIXME: Uncomment this when IDLHarness supports CSS namespaces:
-// https://github.com/web-platform-tests/wpt/issues/7583
-/*
 partial namespace CSS {
     CSSUnitValue number(double value);
     CSSUnitValue percent(double value);
@@ -220,7 +227,6 @@ partial namespace CSS {
     // <flex>
     CSSUnitValue fr(double value);
 };
-*/
 
 [Exposed=(Window, Worker, PaintWorklet, LayoutWorklet),
  Constructor(sequence<CSSTransformComponent> transforms)]
diff --git a/testing/web-platform/tests/interfaces/filter-effects.idl b/testing/web-platform/tests/interfaces/filter-effects.idl
index d2d7b3538b45..8ea9a86ba279 100644
--- a/testing/web-platform/tests/interfaces/filter-effects.idl
+++ b/testing/web-platform/tests/interfaces/filter-effects.idl
@@ -1,6 +1,7 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the Filter Effects spec.
-// See https://drafts.fxtf.org/filter-effects/
+// Content of this file was automatically extracted from the
+// "Filter Effects Module Level 1" spec.
+// See: https://drafts.fxtf.org/filter-effects/
 
 interface SVGFilterElement : SVGElement {
   readonly attribute SVGAnimatedEnumeration filterUnits;
@@ -30,6 +31,17 @@ interface SVGFEBlendElement : SVGElement {
   const unsigned short SVG_FEBLEND_MODE_SCREEN = 3;
   const unsigned short SVG_FEBLEND_MODE_DARKEN = 4;
   const unsigned short SVG_FEBLEND_MODE_LIGHTEN = 5;
+  const unsigned short SVG_FEBLEND_MODE_OVERLAY = 6;
+  const unsigned short SVG_FEBLEND_MODE_COLOR_DODGE = 7;
+  const unsigned short SVG_FEBLEND_MODE_COLOR_BURN = 8;
+  const unsigned short SVG_FEBLEND_MODE_HARD_LIGHT = 9;
+  const unsigned short SVG_FEBLEND_MODE_SOFT_LIGHT = 10;
+  const unsigned short SVG_FEBLEND_MODE_DIFFERENCE = 11;
+  const unsigned short SVG_FEBLEND_MODE_EXCLUSION = 12;
+  const unsigned short SVG_FEBLEND_MODE_HUE = 13;
+  const unsigned short SVG_FEBLEND_MODE_SATURATION = 14;
+  const unsigned short SVG_FEBLEND_MODE_COLOR = 15;
+  const unsigned short SVG_FEBLEND_MODE_LUMINOSITY = 16;
 
   readonly attribute SVGAnimatedString in1;
   readonly attribute SVGAnimatedString in2;
@@ -132,6 +144,7 @@ interface SVGFEConvolveMatrixElement : SVGElement {
   readonly attribute SVGAnimatedEnumeration edgeMode;
   readonly attribute SVGAnimatedNumber kernelUnitLengthX;
   readonly attribute SVGAnimatedNumber kernelUnitLengthY;
+  readonly attribute SVGAnimatedBoolean preserveAlpha;
 };
 
 SVGFEConvolveMatrixElement includes SVGFilterPrimitiveStandardAttributes;
diff --git a/testing/web-platform/tests/interfaces/hr-time.idl b/testing/web-platform/tests/interfaces/hr-time.idl
index 3c793c328c61..ca15cf8c4437 100644
--- a/testing/web-platform/tests/interfaces/hr-time.idl
+++ b/testing/web-platform/tests/interfaces/hr-time.idl
@@ -1,17 +1,18 @@
 // GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the High Resolution Time spec.
-// See https://w3c.github.io/hr-time/
+// Content of this file was automatically extracted from the
+// "High Resolution Time Level 2" spec.
+// See: https://w3c.github.io/hr-time/
 
 typedef double DOMHighResTimeStamp;
 
 [Exposed=(Window,Worker)]
 interface Performance : EventTarget {
-    DOMHighResTimeStamp now ();
+    DOMHighResTimeStamp now();
     readonly attribute DOMHighResTimeStamp timeOrigin;
     [Default] object toJSON();
 };
 
-partial interface WindowOrWorkerGlobalScope {
+partial interface mixin WindowOrWorkerGlobalScope {
     [Replaceable]
     readonly    attribute Performance performance;
 };
diff --git a/testing/web-platform/tests/interfaces/html-media-capture.idl b/testing/web-platform/tests/interfaces/html-media-capture.idl
new file mode 100644
index 000000000000..a398330775cf
--- /dev/null
+++ b/testing/web-platform/tests/interfaces/html-media-capture.idl
@@ -0,0 +1,8 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "HTML Media Capture" spec.
+// See: https://w3c.github.io/html-media-capture/
+
+partial interface HTMLInputElement {
+    [CEReactions] attribute DOMString capture;
+};
diff --git a/testing/web-platform/tests/interfaces/intersection-observer.idl b/testing/web-platform/tests/interfaces/intersection-observer.idl
new file mode 100644
index 000000000000..83c5d90d6e2c
--- /dev/null
+++ b/testing/web-platform/tests/interfaces/intersection-observer.idl
@@ -0,0 +1,45 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "Intersection Observer" spec.
+// See: https://w3c.github.io/IntersectionObserver/
+
+callback IntersectionObserverCallback = void (sequence<IntersectionObserverEntry> entries, IntersectionObserver observer);
+
+[Constructor(IntersectionObserverCallback callback, optional IntersectionObserverInit options),
+ Exposed=Window]
+interface IntersectionObserver {
+  readonly attribute Element? root;
+  readonly attribute DOMString rootMargin;
+  readonly attribute FrozenArray<double> thresholds;
+  void observe(Element target);
+  void unobserve(Element target);
+  void disconnect();
+  sequence<IntersectionObserverEntry> takeRecords();
+};
+
+[Constructor(IntersectionObserverEntryInit intersectionObserverEntryInit)]
+interface IntersectionObserverEntry {
+  readonly attribute DOMHighResTimeStamp time;
+  readonly attribute DOMRectReadOnly rootBounds;
+  readonly attribute DOMRectReadOnly boundingClientRect;
+  readonly attribute DOMRectReadOnly intersectionRect;
+  readonly attribute boolean isIntersecting;
+  readonly attribute double intersectionRatio;
+  readonly attribute Element target;
+};
+
+dictionary IntersectionObserverEntryInit {
+  required DOMHighResTimeStamp time;
+  required DOMRectInit rootBounds;
+  required DOMRectInit boundingClientRect;
+  required DOMRectInit intersectionRect;
+  required boolean isIntersecting;
+  required double intersectionRatio;
+  required Element target;
+};
+
+dictionary IntersectionObserverInit {
+  Element?  root = null;
+  DOMString rootMargin = "0px";
+  (double or sequence<double>) threshold = 0;
+};
diff --git a/testing/web-platform/tests/notifications/interfaces.html b/testing/web-platform/tests/interfaces/notifications.idl
similarity index 62%
rename from testing/web-platform/tests/notifications/interfaces.html
rename to testing/web-platform/tests/interfaces/notifications.idl
index a348450e5fe4..2524933dfd49 100644
--- a/testing/web-platform/tests/notifications/interfaces.html
+++ b/testing/web-platform/tests/interfaces/notifications.idl
@@ -1,22 +1,8 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>Notification interface IDL tests</title>
-<div id=log></div>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=/resources/WebIDLParser.js></script>
-<script src=/resources/idlharness.js></script>
-<script type=text/plain class=untested>
-interface EventTarget {
-  void addEventListener(DOMString type, EventListener? callback, optional boolean capture /* = false */);
-  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture /* = false */);
-  boolean dispatchEvent(Event event);
-};
-[TreatNonCallableAsNull]
-callback EventHandlerNonNull = any (Event event);
-typedef EventHandlerNonNull? EventHandler;
-</script>
-<script type=text/plain>
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "Notifications API Standard" spec.
+// See: https://notifications.spec.whatwg.org/
+
 [Constructor(DOMString title, optional NotificationOptions options),
  Exposed=(Window,Worker)]
 interface Notification : EventTarget {
@@ -85,19 +71,29 @@ dictionary NotificationAction {
 };
 
 callback NotificationPermissionCallback = void (NotificationPermission permission);
-</script>
-<script>
-"use strict";
-var idlArray = new IdlArray();
-[].forEach.call(document.querySelectorAll("script[type=text\\/plain]"), function(node) {
-  if (node.className == "untested") {
-    idlArray.add_untested_idls(node.textContent);
-  } else {
-    idlArray.add_idls(node.textContent);
-  }
-});
-idlArray.add_objects({
-  Notification: ['new Notification("Running idlharness.")'],
-});
-idlArray.test();
-</script>
+
+dictionary GetNotificationOptions {
+  DOMString tag = "";
+};
+
+partial interface ServiceWorkerRegistration {
+  Promise<void> showNotification(DOMString title, optional NotificationOptions options);
+  Promise<sequence<Notification>> getNotifications(optional GetNotificationOptions filter);
+};
+
+[Constructor(DOMString type, NotificationEventInit eventInitDict),
+ Exposed=ServiceWorker]
+interface NotificationEvent : ExtendableEvent {
+  readonly attribute Notification notification;
+  readonly attribute DOMString action;
+};
+
+dictionary NotificationEventInit : ExtendableEventInit {
+  required Notification notification;
+  DOMString action = "";
+};
+
+partial interface ServiceWorkerGlobalScope {
+  attribute EventHandler onnotificationclick;
+  attribute EventHandler onnotificationclose;
+};
diff --git a/testing/web-platform/tests/interfaces/payment-handler.idl b/testing/web-platform/tests/interfaces/payment-handler.idl
index e14a54bb0317..a9e3525ba4ae 100644
--- a/testing/web-platform/tests/interfaces/payment-handler.idl
+++ b/testing/web-platform/tests/interfaces/payment-handler.idl
@@ -4,83 +4,87 @@
 // See: https://w3c.github.io/payment-handler/
 
 partial interface ServiceWorkerRegistration {
-    [SameObject]
-    readonly attribute PaymentManager paymentManager;
+  [SameObject] readonly attribute PaymentManager paymentManager;
 };
-[SecureContext,
- Exposed=(Window,Worker)]
+
+[SecureContext, Exposed=(Window,Worker)]
 interface PaymentManager {
-    [SameObject]
-    readonly attribute PaymentInstruments instruments;
-    [Exposed=Window] static Promise<PermissionState> requestPermission();
-             attribute DOMString          userHint;
+  [SameObject] readonly attribute PaymentInstruments instruments;
+  [Exposed=Window] static Promise<PermissionState> requestPermission();
+  attribute DOMString userHint;
 };
-[SecureContext,
- Exposed=(Window,Worker)]
+
+[SecureContext, Exposed=(Window,Worker)]
 interface PaymentInstruments {
-    Promise<boolean>             delete(DOMString instrumentKey);
-    Promise<any>                 get(DOMString instrumentKey);
+    Promise<boolean> delete(DOMString instrumentKey);
+    Promise<any> get(DOMString instrumentKey);
     Promise<sequence<DOMString>> keys();
-    Promise<boolean>             has(DOMString instrumentKey);
-    Promise<void>                set(DOMString instrumentKey,
-                                     PaymentInstrument details);
-    Promise<void>                clear();
+    Promise<boolean> has(DOMString instrumentKey);
+    Promise<void> set(DOMString instrumentKey, PaymentInstrument details);
+    Promise<void> clear();
 };
+
 dictionary PaymentInstrument {
-    required DOMString             name;
-             sequence<ImageObject> icons;
-             DOMString             method;
-             object                capabilities;
+  required DOMString name;
+  sequence<ImageObject> icons;
+  DOMString method;
+  object capabilities;
 };
+
 dictionary ImageObject {
     required USVString src;
-             DOMString sizes;
-             DOMString type;
+    DOMString sizes;
+    DOMString type;
 };
+
 partial interface ServiceWorkerGlobalScope {
-    attribute EventHandler oncanmakepayment;
+  attribute EventHandler oncanmakepayment;
 };
-[Constructor(DOMString type, CanMakePaymentEventInit eventInitDict),
- Exposed=ServiceWorker]
+
+[Constructor(DOMString type, CanMakePaymentEventInit eventInitDict), Exposed=ServiceWorker]
 interface CanMakePaymentEvent : ExtendableEvent {
-    readonly attribute USVString                           topOrigin;
-    readonly attribute USVString                           paymentRequestOrigin;
-    readonly attribute FrozenArray<PaymentMethodData>      methodData;
-    readonly attribute FrozenArray<PaymentDetailsModifier> modifiers;
-    void respondWith(Promise<boolean> canMakePaymentResponse);
+  readonly attribute USVString topOrigin;
+  readonly attribute USVString paymentRequestOrigin;
+  readonly attribute FrozenArray<PaymentMethodData> methodData;
+  readonly attribute FrozenArray<PaymentDetailsModifier> modifiers;
+  void respondWith(Promise<boolean> canMakePaymentResponse);
 };
+
 dictionary CanMakePaymentEventInit : ExtendableEventInit {
-    USVString                        topOrigin;
-    USVString                        paymentRequestOrigin;
-    sequence<PaymentMethodData>      methodData;
-    sequence<PaymentDetailsModifier> modifiers;
+  USVString topOrigin;
+  USVString paymentRequestOrigin;
+  sequence<PaymentMethodData> methodData;
+  sequence<PaymentDetailsModifier> modifiers;
 };
+
 partial interface ServiceWorkerGlobalScope {
-    attribute EventHandler onpaymentrequest;
+  attribute EventHandler onpaymentrequest;
 };
-[Constructor(DOMString type, PaymentRequestEventInit eventInitDict),
- Exposed=ServiceWorker]
+
+[Constructor(DOMString type, PaymentRequestEventInit eventInitDict), Exposed=ServiceWorker]
 interface PaymentRequestEvent : ExtendableEvent {
-    readonly attribute USVString                           topOrigin;
-    readonly attribute USVString                           paymentRequestOrigin;
-    readonly attribute DOMString                           paymentRequestId;
-    readonly attribute FrozenArray<PaymentMethodData>      methodData;
-    readonly attribute object                              total;
-    readonly attribute FrozenArray<PaymentDetailsModifier> modifiers;
-    readonly attribute DOMString                           instrumentKey;
-    Promise<WindowClient?> openWindow(USVString url);
-    void                   respondWith(Promise<PaymentHandlerResponse> handlerResponsePromise);
+  readonly attribute USVString topOrigin;
+  readonly attribute USVString paymentRequestOrigin;
+  readonly attribute DOMString paymentRequestId;
+  readonly attribute FrozenArray<PaymentMethodData> methodData;
+  readonly attribute object total;
+  readonly attribute FrozenArray<PaymentDetailsModifier> modifiers;
+  readonly attribute DOMString instrumentKey;
+  Promise<WindowClient?> openWindow(USVString url);
+  void respondWith(Promise<PaymentHandlerResponse> handlerResponsePromise);
 };
+
 dictionary PaymentRequestEventInit : ExtendableEventInit {
-    USVString                        topOrigin;
-    USVString                        paymentRequestOrigin;
-    DOMString                        paymentRequestId;
-    sequence<PaymentMethodData>      methodData;
-    PaymentCurrencyAmount            total;
-    sequence<PaymentDetailsModifier> modifiers;
-    DOMString                        instrumentKey;
+  USVString topOrigin;
+  USVString paymentRequestOrigin;
+  DOMString paymentRequestId;
+  sequence<PaymentMethodData> methodData;
+  PaymentCurrencyAmount total;
+  sequence<PaymentDetailsModifier> modifiers;
+  DOMString instrumentKey;
 };
+
 dictionary PaymentHandlerResponse {
-    DOMString methodName;
-    object    details;
+DOMString methodName;
+object details;
 };
diff --git a/testing/web-platform/tests/interfaces/push-api.idl b/testing/web-platform/tests/interfaces/push-api.idl
index 9047d9785ed3..fe7331d68e47 100644
--- a/testing/web-platform/tests/interfaces/push-api.idl
+++ b/testing/web-platform/tests/interfaces/push-api.idl
@@ -5,92 +5,89 @@
 
 [SecureContext]
 partial interface ServiceWorkerRegistration {
-    readonly attribute PushManager pushManager;
+  readonly attribute PushManager pushManager;
 };
-[Exposed=(Window,Worker),
- SecureContext]
+
+[Exposed=(Window,Worker), SecureContext]
 interface PushManager {
-    [SameObject]
-    static readonly attribute FrozenArray<DOMString> supportedContentEncodings;
+  [SameObject] static readonly attribute FrozenArray<DOMString> supportedContentEncodings;
 
-    Promise<PushSubscription>    subscribe(optional PushSubscriptionOptionsInit options);
-    Promise<PushSubscription?>   getSubscription();
-    Promise<PushPermissionState> permissionState(optional PushSubscriptionOptionsInit options);
+  Promise<PushSubscription> subscribe(optional PushSubscriptionOptionsInit options);
+  Promise<PushSubscription?> getSubscription();
+  Promise<PushPermissionState> permissionState(optional PushSubscriptionOptionsInit options);
 };
+
 dictionary PushSubscriptionOptionsInit {
-    boolean                      userVisibleOnly = false;
-    (BufferSource or DOMString)? applicationServerKey = null;
+  boolean userVisibleOnly = false;
+  (BufferSource or DOMString)? applicationServerKey = null;
 };
 
-[Exposed=(Window,Worker),
- SecureContext]
+[Exposed=(Window,Worker), SecureContext]
 interface PushSubscriptionOptions {
-    readonly attribute boolean      userVisibleOnly;
-    [SameObject]
-    readonly attribute ArrayBuffer? applicationServerKey;
+  readonly attribute boolean userVisibleOnly;
+  [SameObject] readonly attribute ArrayBuffer? applicationServerKey;
 };
-[Exposed=(Window,Worker),
- SecureContext]
-interface PushSubscription {
-    readonly attribute USVString               endpoint;
-    readonly attribute DOMTimeStamp?           expirationTime;
-    [SameObject]
-    readonly attribute PushSubscriptionOptions options;
-    ArrayBuffer?         getKey(PushEncryptionKeyName name);
-    Promise<boolean>     unsubscribe();
 
-    PushSubscriptionJSON toJSON();
+[Exposed=(Window,Worker), SecureContext]
+interface PushSubscription {
+  readonly attribute USVString endpoint;
+  readonly attribute DOMTimeStamp? expirationTime;
+  [SameObject] readonly attribute PushSubscriptionOptions options;
+  ArrayBuffer? getKey(PushEncryptionKeyName name);
+  Promise<boolean> unsubscribe();
+
+  PushSubscriptionJSON toJSON();
 };
 
 dictionary PushSubscriptionJSON {
-    USVString                    endpoint;
-    DOMTimeStamp?                expirationTime;
-    record<DOMString, USVString> keys;
+  USVString endpoint;
+  DOMTimeStamp? expirationTime;
+  record<DOMString, USVString> keys;
 };
+
 enum PushEncryptionKeyName {
-    "p256dh",
-    "auth"
+  "p256dh",
+  "auth"
 };
-[Exposed=ServiceWorker,
- SecureContext]
+
+[Exposed=ServiceWorker, SecureContext]
 interface PushMessageData {
-    ArrayBuffer arrayBuffer();
-    Blob        blob();
-    any         json();
-    USVString   text();
+  ArrayBuffer arrayBuffer();
+  Blob blob();
+  any json();
+  USVString text();
 };
-[Exposed=ServiceWorker,
- SecureContext]
+
+[Exposed=ServiceWorker, SecureContext]
 partial interface ServiceWorkerGlobalScope {
-    attribute EventHandler onpush;
-    attribute EventHandler onpushsubscriptionchange;
+  attribute EventHandler onpush;
+  attribute EventHandler onpushsubscriptionchange;
 };
+
 typedef (BufferSource or USVString) PushMessageDataInit;
 
 dictionary PushEventInit : ExtendableEventInit {
-    PushMessageDataInit data;
+  PushMessageDataInit data;
 };
 
-[Constructor(DOMString type, optional PushEventInit eventInitDict),
- Exposed=ServiceWorker,
- SecureContext]
+[Constructor(DOMString type, optional PushEventInit eventInitDict), Exposed=ServiceWorker, SecureContext]
 interface PushEvent : ExtendableEvent {
-    readonly attribute PushMessageData? data;
-};
-dictionary PushSubscriptionChangeInit : ExtendableEventInit {
-    PushSubscription newSubscription = null;
-    PushSubscription oldSubscription = null;
+  readonly attribute PushMessageData? data;
 };
 
-[Constructor(DOMString type, optional PushSubscriptionChangeInit eventInitDict),
- Exposed=ServiceWorker,
- SecureContext]
+dictionary PushSubscriptionChangeInit : ExtendableEventInit {
+  PushSubscription newSubscription = null;
+  PushSubscription oldSubscription = null;
+};
+
+[Constructor(DOMString type, optional PushSubscriptionChangeInit eventInitDict), Exposed=ServiceWorker, SecureContext]
 interface PushSubscriptionChangeEvent : ExtendableEvent {
-    readonly attribute PushSubscription? newSubscription;
-    readonly attribute PushSubscription? oldSubscription;
+  readonly attribute PushSubscription? newSubscription;
+  readonly attribute PushSubscription? oldSubscription;
 };
+
 enum PushPermissionState {
-    "denied",
-    "granted",
-    "prompt",
+  "denied",
+  "granted",
+  "prompt",
 };
diff --git a/testing/web-platform/tests/interfaces/touchevents.idl b/testing/web-platform/tests/interfaces/touchevents.idl
deleted file mode 100644
index 81eec0185c25..000000000000
--- a/testing/web-platform/tests/interfaces/touchevents.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-interface Touch {
-    readonly    attribute long        identifier;
-    readonly    attribute EventTarget target;
-    readonly    attribute long        screenX;
-    readonly    attribute long        screenY;
-    readonly    attribute long        clientX;
-    readonly    attribute long        clientY;
-    readonly    attribute long        pageX;
-    readonly    attribute long        pageY;
-};
diff --git a/testing/web-platform/tests/interfaces/webmidi.idl b/testing/web-platform/tests/interfaces/webmidi.idl
new file mode 100644
index 000000000000..eb7ed6befcc4
--- /dev/null
+++ b/testing/web-platform/tests/interfaces/webmidi.idl
@@ -0,0 +1,70 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "Web MIDI API" spec.
+// See: http://webaudio.github.io/web-midi-api/
+
+partial interface Navigator {
+    Promise<MIDIAccess> requestMIDIAccess(optional MIDIOptions options);
+};
+dictionary MIDIOptions {
+    boolean sysex;
+    boolean software;
+};
+interface MIDIInputMap {
+    readonly maplike<DOMString, MIDIInput>;
+};
+interface MIDIOutputMap {
+    readonly maplike<DOMString, MIDIOutput>;
+};
+interface MIDIAccess : EventTarget {
+    readonly attribute MIDIInputMap  inputs;
+    readonly attribute MIDIOutputMap outputs;
+             attribute EventHandler  onstatechange;
+    readonly attribute boolean       sysexEnabled;
+};
+interface MIDIPort : EventTarget {
+    readonly attribute DOMString               id;
+    readonly attribute DOMString?              manufacturer;
+    readonly attribute DOMString?              name;
+    readonly attribute MIDIPortType            type;
+    readonly attribute DOMString?              version;
+    readonly attribute MIDIPortDeviceState     state;
+    readonly attribute MIDIPortConnectionState connection;
+             attribute EventHandler            onstatechange;
+    Promise<MIDIPort> open();
+    Promise<MIDIPort> close();
+};
+interface MIDIInput : MIDIPort {
+    attribute EventHandler onmidimessage;
+};
+interface MIDIOutput : MIDIPort {
+    void send(sequence<octet> data, optional DOMHighResTimeStamp timestamp = 0);
+    void clear();
+};
+enum MIDIPortType {
+    "input",
+    "output",
+};
+enum MIDIPortDeviceState {
+    "disconnected",
+    "connected",
+};
+enum MIDIPortConnectionState {
+    "open",
+    "closed",
+    "pending",
+};
+[Constructor(DOMString type, optional MIDIMessageEventInit eventInitDict)]
+interface MIDIMessageEvent : Event {
+    readonly attribute Uint8Array data;
+};
+dictionary MIDIMessageEventInit : EventInit {
+    Uint8Array data;
+};
+[Constructor(DOMString type, optional MIDIConnectionEventInit eventInitDict)]
+interface MIDIConnectionEvent : Event {
+    readonly attribute MIDIPort port;
+};
+dictionary MIDIConnectionEventInit : EventInit {
+    MIDIPort port;
+};
diff --git a/testing/web-platform/tests/interfaces/webrtc-pc.idl b/testing/web-platform/tests/interfaces/webrtc-pc.idl
deleted file mode 100644
index fde2ba02f801..000000000000
--- a/testing/web-platform/tests/interfaces/webrtc-pc.idl
+++ /dev/null
@@ -1,681 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the WebRTC spec.
-// See https://w3c.github.io/webrtc-pc/
-
-dictionary RTCConfiguration {
-             sequence<RTCIceServer>   iceServers;
-             RTCIceTransportPolicy    iceTransportPolicy = "all";
-             RTCBundlePolicy          bundlePolicy = "balanced";
-             RTCRtcpMuxPolicy         rtcpMuxPolicy = "require";
-             DOMString                peerIdentity;
-             sequence<RTCCertificate> certificates;
-             [EnforceRange]
-             octet                    iceCandidatePoolSize = 0;
-};
-
-enum RTCIceCredentialType {
-    "password",
-    "oauth"
-};
-
-dictionary RTCOAuthCredential {
-    required DOMString        macKey;
-    required DOMString        accessToken;
-};
-
-dictionary RTCIceServer {
-    required (DOMString or sequence<DOMString>) urls;
-             DOMString                          username;
-             (DOMString or RTCOAuthCredential)     credential;
-             RTCIceCredentialType               credentialType = "password";
-};
-
-enum RTCIceTransportPolicy {
-    "relay",
-    "all"
-};
-
-enum RTCBundlePolicy {
-    "balanced",
-    "max-compat",
-    "max-bundle"
-};
-
-enum RTCRtcpMuxPolicy {
-    // At risk due to lack of implementers' interest.
-    "negotiate",
-    "require"
-};
-
-dictionary RTCOfferAnswerOptions {
-             boolean voiceActivityDetection = true;
-};
-
-dictionary RTCOfferOptions : RTCOfferAnswerOptions {
-             boolean iceRestart = false;
-};
-
-          dictionary RTCAnswerOptions : RTCOfferAnswerOptions {
-};
-
-enum RTCSignalingState {
-    "stable",
-    "have-local-offer",
-    "have-remote-offer",
-    "have-local-pranswer",
-    "have-remote-pranswer",
-    "closed"
-};
-
-enum RTCIceGatheringState {
-    "new",
-    "gathering",
-    "complete"
-};
-
-enum RTCPeerConnectionState {
-    "new",
-    "connecting",
-    "connected",
-    "disconnected",
-    "failed",
-    "closed"
-};
-
-enum RTCIceConnectionState {
-    "new",
-    "checking",
-    "connected",
-    "completed",
-    "disconnected",
-    "failed",
-    "closed"
-};
-
-          [ Constructor (optional RTCConfiguration configuration), Exposed=Window]
-interface RTCPeerConnection : EventTarget  {
-    Promise<RTCSessionDescriptionInit> createOffer (optional RTCOfferOptions options);
-    Promise<RTCSessionDescriptionInit> createAnswer (optional RTCAnswerOptions options);
-    Promise<void>                      setLocalDescription (RTCSessionDescriptionInit description);
-    readonly        attribute RTCSessionDescription?    localDescription;
-    readonly        attribute RTCSessionDescription?    currentLocalDescription;
-    readonly        attribute RTCSessionDescription?    pendingLocalDescription;
-    Promise<void>                      setRemoteDescription (RTCSessionDescriptionInit description);
-    readonly        attribute RTCSessionDescription?    remoteDescription;
-    readonly        attribute RTCSessionDescription?    currentRemoteDescription;
-    readonly        attribute RTCSessionDescription?    pendingRemoteDescription;
-    Promise<void>                      addIceCandidate ((RTCIceCandidateInit or RTCIceCandidate) candidate);
-    readonly        attribute RTCSignalingState         signalingState;
-    readonly        attribute RTCIceGatheringState      iceGatheringState;
-    readonly        attribute RTCIceConnectionState     iceConnectionState;
-    readonly        attribute RTCPeerConnectionState    connectionState;
-    readonly        attribute boolean?                  canTrickleIceCandidates;
-    static sequence<RTCIceServer>      getDefaultIceServers ();
-    RTCConfiguration                   getConfiguration ();
-    void                               setConfiguration (RTCConfiguration configuration);
-    void                               close ();
-                    attribute EventHandler              onnegotiationneeded;
-                    attribute EventHandler              onicecandidate;
-                    attribute EventHandler              onicecandidateerror;
-                    attribute EventHandler              onsignalingstatechange;
-                    attribute EventHandler              oniceconnectionstatechange;
-                    attribute EventHandler              onicegatheringstatechange;
-                    attribute EventHandler              onconnectionstatechange;
-};
-
-partial interface RTCPeerConnection {
-    Promise<void> createOffer (RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback, optional RTCOfferOptions options);
-    Promise<void> setLocalDescription (RTCSessionDescriptionInit description, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
-    Promise<void> createAnswer (RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
-    Promise<void> setRemoteDescription (RTCSessionDescriptionInit description, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
-    Promise<void> addIceCandidate ((RTCIceCandidateInit or RTCIceCandidate) candidate, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
-};
-
-                callback RTCPeerConnectionErrorCallback = void (DOMException error);
-
-                callback RTCSessionDescriptionCallback = void (RTCSessionDescriptionInit description);
-
-partial dictionary RTCOfferOptions {
-            boolean offerToReceiveAudio;
-            boolean offerToReceiveVideo;
-          };
-
-enum RTCSdpType {
-    "offer",
-    "pranswer",
-    "answer",
-    "rollback"
-};
-
-          [ Constructor (RTCSessionDescriptionInit descriptionInitDict), Exposed=Window]
-interface RTCSessionDescription {
-    readonly        attribute RTCSdpType type;
-    readonly        attribute DOMString  sdp;
-    [Default] object toJSON();
-};
-
-dictionary RTCSessionDescriptionInit {
-    required RTCSdpType type;
-             DOMString  sdp = "";
-};
-
-          [ Constructor (optional RTCIceCandidateInit candidateInitDict), Exposed=Window]
-interface RTCIceCandidate {
-    readonly        attribute DOMString               candidate;
-    readonly        attribute DOMString?              sdpMid;
-    readonly        attribute unsigned short?         sdpMLineIndex;
-    readonly        attribute DOMString?              foundation;
-    readonly        attribute RTCIceComponent?        component;
-    readonly        attribute unsigned long?          priority;
-    readonly        attribute DOMString?              ip;
-    readonly        attribute RTCIceProtocol?         protocol;
-    readonly        attribute unsigned short?         port;
-    readonly        attribute RTCIceCandidateType?    type;
-    readonly        attribute RTCIceTcpCandidateType? tcpType;
-    readonly        attribute DOMString?              relatedAddress;
-    readonly        attribute unsigned short?         relatedPort;
-    readonly        attribute DOMString?              usernameFragment;
-    RTCIceCandidateInit toJSON();
-};
-
-dictionary RTCIceCandidateInit {
-             DOMString       candidate = "";
-             DOMString?      sdpMid = null;
-             unsigned short? sdpMLineIndex = null;
-             DOMString       usernameFragment;
-};
-
-enum RTCIceProtocol {
-    "udp",
-    "tcp"
-};
-
-enum RTCIceTcpCandidateType {
-    "active",
-    "passive",
-    "so"
-};
-
-enum RTCIceCandidateType {
-    "host",
-    "srflx",
-    "prflx",
-    "relay"
-};
-
-          [ Constructor (DOMString type, optional RTCPeerConnectionIceEventInit eventInitDict), Exposed=Window]
-interface RTCPeerConnectionIceEvent : Event {
-    readonly        attribute RTCIceCandidate? candidate;
-    readonly        attribute DOMString?       url;
-};
-
-          dictionary RTCPeerConnectionIceEventInit : EventInit {
-             RTCIceCandidate? candidate;
-             DOMString?       url;
-};
-
-          [ Constructor (DOMString type, RTCPeerConnectionIceErrorEventInit eventInitDict), Exposed=Window]
-interface RTCPeerConnectionIceErrorEvent : Event {
-    readonly        attribute DOMString      hostCandidate;
-    readonly        attribute DOMString      url;
-    readonly        attribute unsigned short errorCode;
-    readonly        attribute USVString      errorText;
-};
-
-          dictionary RTCPeerConnectionIceErrorEventInit : EventInit {
-             DOMString      hostCandidate;
-             DOMString      url;
-             required unsigned short errorCode;
-             USVString      statusText;
-};
-
-enum RTCPriorityType {
-    "very-low",
-    "low",
-    "medium",
-    "high"
-};
-
-partial interface RTCPeerConnection {
-    static Promise<RTCCertificate> generateCertificate (AlgorithmIdentifier keygenAlgorithm);
-};
-
-dictionary RTCCertificateExpiration {
-    [EnforceRange]
-    DOMTimeStamp expires;
-};
-
-[Exposed=Window] interface RTCCertificate {
-    readonly        attribute DOMTimeStamp expires;
-    static sequence<AlgorithmIdentifier> getSupportedAlgorithms();
-    sequence<RTCDtlsFingerprint> getFingerprints ();
-};
-
-partial interface RTCPeerConnection {
-    sequence<RTCRtpSender>      getSenders ();
-    sequence<RTCRtpReceiver>    getReceivers ();
-    sequence<RTCRtpTransceiver> getTransceivers ();
-    RTCRtpSender                addTrack (MediaStreamTrack track, MediaStream... streams);
-    void                        removeTrack (RTCRtpSender sender);
-    RTCRtpTransceiver           addTransceiver ((MediaStreamTrack or DOMString) trackOrKind, optional RTCRtpTransceiverInit init);
-                    attribute EventHandler ontrack;
-};
-
-dictionary RTCRtpTransceiverInit {
-             RTCRtpTransceiverDirection         direction = "sendrecv";
-             sequence<MediaStream>              streams = [];
-             sequence<RTCRtpEncodingParameters> sendEncodings = [];
-};
-
-enum RTCRtpTransceiverDirection {
-    "sendrecv",
-    "sendonly",
-    "recvonly",
-    "inactive"
-};
-
-[Exposed=Window] interface RTCRtpSender {
-    readonly        attribute MediaStreamTrack? track;
-    readonly        attribute RTCDtlsTransport?  transport;
-    readonly        attribute RTCDtlsTransport? rtcpTransport;
-    static RTCRtpCapabilities getCapabilities (DOMString kind);
-    Promise<void>             setParameters (optional RTCRtpParameters parameters);
-    RTCRtpParameters          getParameters ();
-    Promise<void>             replaceTrack (MediaStreamTrack? withTrack);
-    Promise<RTCStatsReport>   getStats();
-};
-
-dictionary RTCRtpParameters {
-             DOMString                                 transactionId;
-             sequence<RTCRtpEncodingParameters>        encodings;
-             sequence<RTCRtpHeaderExtensionParameters> headerExtensions;
-             RTCRtcpParameters                         rtcp;
-             sequence<RTCRtpCodecParameters>           codecs;
-             RTCDegradationPreference                  degradationPreference;
-};
-
-dictionary RTCRtpEncodingParameters {
-             octet               codecPayloadType;
-             RTCDtxStatus        dtx;
-             boolean             active = true;
-             RTCPriorityType     priority = "low";
-             unsigned long       ptime;
-             unsigned long       maxBitrate;
-             double              maxFramerate;
-             DOMString           rid;
-             double              scaleResolutionDownBy;
-};
-
-enum RTCDtxStatus {
-         "disabled",
-         "enabled"
-         };
-
-enum RTCDegradationPreference {
-    "maintain-framerate",
-    "maintain-resolution",
-    "balanced"
-};
-
-dictionary RTCRtcpParameters {
-             DOMString cname;
-             boolean   reducedSize;
-};
-
-dictionary RTCRtpHeaderExtensionParameters {
-             DOMString      uri;
-             unsigned short id;
-             boolean        encrypted;
-};
-
-dictionary RTCRtpCodecParameters {
-             octet          payloadType;
-             DOMString      mimeType;
-             unsigned long  clockRate;
-             unsigned short channels;
-             DOMString      sdpFmtpLine;
-};
-
-dictionary RTCRtpCapabilities {
-             sequence<RTCRtpCodecCapability>           codecs;
-             sequence<RTCRtpHeaderExtensionCapability> headerExtensions;
-};
-
-dictionary RTCRtpCodecCapability {
-             DOMString mimeType;
-             unsigned long  clockRate;
-             unsigned short channels;
-             DOMString      sdpFmtpLine;
-};
-
-dictionary RTCRtpHeaderExtensionCapability {
-             DOMString uri;
-};
-
-[Exposed=Window] interface RTCRtpReceiver {
-    readonly        attribute MediaStreamTrack  track;
-    readonly        attribute RTCDtlsTransport? transport;
-    readonly        attribute RTCDtlsTransport? rtcpTransport;
-    static RTCRtpCapabilities          getCapabilities (DOMString kind);
-    RTCRtpParameters                   getParameters ();
-    sequence<RTCRtpContributingSource>    getContributingSources ();
-    sequence<RTCRtpSynchronizationSource> getSynchronizationSources ();
-    Promise<RTCStatsReport>   getStats();
-};
-
-dictionary RTCRtpContributingSource {
-    required DOMHighResTimeStamp timestamp;
-    required unsigned long       source;
-             double              audioLevel;
-};
-
-dictionary RTCRtpSynchronizationSource : RTCRtpContributingSource {
-    boolean voiceActivityFlag;
-};
-
-[Exposed=Window] interface RTCRtpTransceiver {
-    readonly        attribute DOMString?                  mid;
-    [SameObject]
-    readonly        attribute RTCRtpSender                sender;
-    [SameObject]
-    readonly        attribute RTCRtpReceiver              receiver;
-    readonly        attribute boolean                     stopped;
-                    attribute RTCRtpTransceiverDirection  direction;
-    readonly        attribute RTCRtpTransceiverDirection? currentDirection;
-    void stop ();
-    void setCodecPreferences (sequence<RTCRtpCodecCapability> codecs);
-};
-
-[Exposed=Window] interface RTCDtlsTransport : EventTarget {
-    readonly        attribute RTCIceTransport       transport;
-    readonly        attribute RTCDtlsTransportState state;
-    sequence<ArrayBuffer> getRemoteCertificates ();
-                    attribute EventHandler          onstatechange;
-                    attribute EventHandler          onerror;
-};
-
-enum RTCDtlsTransportState {
-    "new",
-    "connecting",
-    "connected",
-    "closed",
-    "failed"
-};
-
-dictionary RTCDtlsFingerprint {
-             DOMString algorithm;
-             DOMString value;
-};
-
-[Exposed=Window] interface RTCIceTransport : EventTarget {
-    readonly        attribute RTCIceRole           role;
-    readonly        attribute RTCIceComponent      component;
-    readonly        attribute RTCIceTransportState state;
-    readonly        attribute RTCIceGathererState gatheringState;
-    sequence<RTCIceCandidate> getLocalCandidates ();
-    sequence<RTCIceCandidate> getRemoteCandidates ();
-    RTCIceCandidatePair?      getSelectedCandidatePair ();
-    RTCIceParameters?         getLocalParameters ();
-    RTCIceParameters?         getRemoteParameters ();
-                    attribute EventHandler         onstatechange;
-                    attribute EventHandler         ongatheringstatechange;
-                    attribute EventHandler         onselectedcandidatepairchange;
-};
-
-dictionary RTCIceParameters {
-             DOMString usernameFragment;
-             DOMString password;
-};
-
-dictionary RTCIceCandidatePair {
-             RTCIceCandidate local;
-             RTCIceCandidate remote;
-};
-
-enum RTCIceGathererState {
-    "new",
-    "gathering",
-    "complete"
-};
-
-enum RTCIceTransportState {
-    "new",
-    "checking",
-    "connected",
-    "completed",
-    "disconnected",
-    "failed",
-    "closed"
-};
-
-enum RTCIceRole {
-    "controlling",
-    "controlled"
-};
-
-enum RTCIceComponent {
-    "rtp",
-    "rtcp"
-};
-
-        [ Constructor (DOMString type, RTCTrackEventInit eventInitDict), Exposed=Window]
-interface RTCTrackEvent : Event {
-    readonly        attribute RTCRtpReceiver           receiver;
-    readonly        attribute MediaStreamTrack         track;
-    [SameObject]
-    readonly        attribute FrozenArray<MediaStream> streams;
-    readonly        attribute RTCRtpTransceiver        transceiver;
-};
-
-dictionary RTCTrackEventInit : EventInit {
-    required RTCRtpReceiver        receiver;
-    required MediaStreamTrack      track;
-             sequence<MediaStream> streams = [];
-    required RTCRtpTransceiver     transceiver;
-};
-
-partial interface RTCPeerConnection {
-    readonly        attribute RTCSctpTransport? sctp;
-    RTCDataChannel createDataChannel (USVString label, optional RTCDataChannelInit dataChannelDict);
-                    attribute EventHandler      ondatachannel;
-};
-
-[Exposed=Window] interface RTCSctpTransport {
-    readonly        attribute RTCDtlsTransport transport;
-    readonly        attribute RTCSctpTransportState state;
-    readonly        attribute unrestricted double maxMessageSize;
-                    attribute EventHandler     onstatechange;
-};
-
-enum RTCSctpTransportState {
-    "new",
-    "connecting",
-    "connected",
-    "closed"
-};
-
-[Exposed=Window] interface RTCDataChannel : EventTarget {
-    readonly        attribute USVString           label;
-    readonly        attribute boolean             ordered;
-    readonly        attribute unsigned short?     maxPacketLifeTime;
-    readonly        attribute unsigned short?     maxRetransmits;
-    readonly        attribute USVString           protocol;
-    readonly        attribute boolean             negotiated;
-    readonly        attribute unsigned short?     id;
-    readonly        attribute RTCPriorityType     priority;
-    readonly        attribute RTCDataChannelState readyState;
-    readonly        attribute unsigned long       bufferedAmount;
-                    attribute unsigned long       bufferedAmountLowThreshold;
-                    attribute EventHandler        onopen;
-                    attribute EventHandler        onbufferedamountlow;
-                    attribute EventHandler        onerror;
-                    attribute EventHandler        onclose;
-    void close ();
-                    attribute EventHandler        onmessage;
-                    attribute DOMString           binaryType;
-    void send (USVString data);
-    void send (Blob data);
-    void send (ArrayBuffer data);
-    void send (ArrayBufferView data);
-};
-
-dictionary RTCDataChannelInit {
-             boolean         ordered = true;
-             unsigned short  maxPacketLifeTime;
-             unsigned short  maxRetransmits;
-             USVString       protocol = "";
-             boolean         negotiated = false;
-             [EnforceRange]
-             unsigned short  id;
-             RTCPriorityType priority = "low";
-};
-
-enum RTCDataChannelState {
-    "connecting",
-    "open",
-    "closing",
-    "closed"
-};
-
-        [ Constructor (DOMString type, RTCDataChannelEventInit eventInitDict), Exposed=Window]
-interface RTCDataChannelEvent : Event {
-    readonly        attribute RTCDataChannel channel;
-};
-
-dictionary RTCDataChannelEventInit : EventInit {
-             required RTCDataChannel channel;
-};
-
-partial interface RTCRtpSender {
-    readonly        attribute RTCDTMFSender? dtmf;
-};
-
-[Exposed=Window] interface RTCDTMFSender : EventTarget {
-    void insertDTMF (DOMString tones, optional unsigned long duration = 100, optional unsigned long interToneGap = 70);
-                    attribute EventHandler ontonechange;
-    readonly        attribute boolean      canInsertDTMF;
-    readonly        attribute DOMString    toneBuffer;
-};
-
-        [ Constructor (DOMString type, RTCDTMFToneChangeEventInit eventInitDict), Exposed=Window]
-interface RTCDTMFToneChangeEvent : Event {
-    readonly        attribute DOMString tone;
-};
-
-dictionary RTCDTMFToneChangeEventInit : EventInit {
-             required DOMString tone;
-};
-
-partial interface RTCPeerConnection {
-    Promise<RTCStatsReport> getStats (optional MediaStreamTrack? selector = null);
-    attribute EventHandler onstatsended;
-          };
-
-[Exposed=Window] interface RTCStatsReport {
-    readonly maplike<DOMString, object>;
-};
-
-dictionary RTCStats {
-             required DOMHighResTimeStamp timestamp;
-             required RTCStatsType        type;
-             required DOMString           id;
-};
-
-[ Constructor (DOMString type, RTCStatsEventInit
-          eventInitDict), Exposed=Window]
-          interface RTCStatsEvent : Event {
-            readonly attribute RTCStatsReport report;
-          };
-
-[Global, Exposed=RTCIdentityProviderGlobalScope]
-interface RTCIdentityProviderGlobalScope : WorkerGlobalScope {
-    readonly        attribute RTCIdentityProviderRegistrar rtcIdentityProvider;
-};
-
-[Exposed=RTCIdentityProviderGlobalScope]
-interface RTCIdentityProviderRegistrar {
-    void register (RTCIdentityProvider idp);
-};
-
-dictionary RTCIdentityProvider {
-    required GenerateAssertionCallback generateAssertion;
-    required ValidateAssertionCallback validateAssertion;
-};
-
-          callback GenerateAssertionCallback = Promise<RTCIdentityAssertionResult>
-          (DOMString contents, DOMString origin, RTCIdentityProviderOptions options);
-
-          callback ValidateAssertionCallback = Promise<RTCIdentityValidationResult>
-          (DOMString assertion, DOMString origin);
-
-dictionary RTCIdentityAssertionResult {
-    required RTCIdentityProviderDetails idp;
-    required DOMString                  assertion;
-};
-
-dictionary RTCIdentityProviderDetails {
-    required DOMString domain;
-             DOMString protocol = "default";
-};
-
-dictionary RTCIdentityValidationResult {
-    required DOMString identity;
-    required DOMString contents;
-};
-
-partial interface RTCPeerConnection {
-    void               setIdentityProvider (DOMString provider, optional RTCIdentityProviderOptions options);
-    Promise<DOMString> getIdentityAssertion ();
-    readonly        attribute Promise<RTCIdentityAssertion> peerIdentity;
-    readonly        attribute DOMString?                    idpLoginUrl;
-    readonly        attribute DOMString?                    idpErrorInfo;
-};
-
-dictionary RTCIdentityProviderOptions {
-    DOMString protocol = "default";
-    DOMString usernameHint;
-    DOMString peerIdentity;
-};
-
-[Constructor(DOMString idp, DOMString name), Exposed=Window]
-interface RTCIdentityAssertion {
-    attribute DOMString idp;
-    attribute DOMString name;
-};
-
-partial dictionary MediaStreamConstraints {
-             DOMString peerIdentity;
-};
-
-partial interface MediaStreamTrack {
-    readonly        attribute boolean      isolated;
-                    attribute EventHandler onisolationchange;
-};
-
-enum RTCErrorDetailType {
-              "data-channel-failure",
-              "dtls-failure",
-              "fingerprint-failure",
-              "idp-bad-script-failure",
-              "idp-execution-failure",
-              "idp-load-failure",
-              "idp-need-login",
-              "idp-timeout",
-              "idp-tls-failure",
-              "idp-token-expired",
-              "idp-token-invalid",
-              "sctp-failure",
-              "sdp-syntax-error",
-              "hardware-encoder-not-available",
-              "hardware-encoder-error"
-          };
-
-[Exposed=Window,
- Constructor (DOMString type, RTCErrorEventInit eventInitDict)]
-interface RTCErrorEvent : Event {
-    readonly        attribute RTCError? error;
-};
-
-dictionary RTCErrorEventInit : EventInit {
-             RTCError? error = null;
-};
diff --git a/testing/web-platform/tests/interfaces/webrtc.idl b/testing/web-platform/tests/interfaces/webrtc.idl
new file mode 100644
index 000000000000..8d949cabbdd3
--- /dev/null
+++ b/testing/web-platform/tests/interfaces/webrtc.idl
@@ -0,0 +1,635 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "WebRTC 1.0: Real-time Communication Between Browsers" spec.
+// See: https://w3c.github.io/webrtc-pc/
+
+dictionary RTCConfiguration {
+             sequence<RTCIceServer> iceServers;
+             RTCIceTransportPolicy iceTransportPolicy = "all";
+             RTCBundlePolicy bundlePolicy = "balanced";
+             RTCRtcpMuxPolicy rtcpMuxPolicy = "require";
+             DOMString peerIdentity;
+             sequence<RTCCertificate> certificates;
+             [EnforceRange]
+             octet iceCandidatePoolSize = 0;
+};
+
+enum RTCIceCredentialType {
+    "password",
+    "oauth"
+};
+
+dictionary RTCOAuthCredential {
+    required DOMString macKey;
+    required DOMString accessToken;
+};
+
+dictionary RTCIceServer {
+    required (DOMString or sequence<DOMString>) urls;
+             DOMString username;
+             (DOMString or RTCOAuthCredential) credential;
+             RTCIceCredentialType credentialType = "password";
+};
+
+enum RTCIceTransportPolicy {
+    "relay",
+    "all"
+};
+
+enum RTCBundlePolicy {
+    "balanced",
+    "max-compat",
+    "max-bundle"
+};
+
+enum RTCRtcpMuxPolicy {
+    // At risk due to lack of implementers' interest.
+    "negotiate",
+    "require"
+};
+
+dictionary RTCOfferAnswerOptions {
+             boolean voiceActivityDetection = true;
+};
+
+dictionary RTCOfferOptions : RTCOfferAnswerOptions {
+             boolean iceRestart = false;
+};
+
+dictionary RTCAnswerOptions : RTCOfferAnswerOptions {
+};
+
+enum RTCSignalingState {
+    "stable",
+    "have-local-offer",
+    "have-remote-offer",
+    "have-local-pranswer",
+    "have-remote-pranswer",
+    "closed"
+};
+
+enum RTCIceGatheringState {
+    "new",
+    "gathering",
+    "complete"
+};
+
+enum RTCPeerConnectionState {
+    "new",
+    "connecting",
+    "connected",
+    "disconnected",
+    "failed",
+    "closed"
+};
+
+enum RTCIceConnectionState {
+    "new",
+    "checking",
+    "connected",
+    "completed",
+    "disconnected",
+    "failed",
+    "closed"
+};
+
+[ Constructor(optional RTCConfiguration configuration), Exposed=Window]
+interface RTCPeerConnection : EventTarget {
+    Promise<RTCSessionDescriptionInit> createOffer(optional RTCOfferOptions options);
+    Promise<RTCSessionDescriptionInit> createAnswer(optional RTCAnswerOptions options);
+    Promise<void> setLocalDescription(RTCSessionDescriptionInit description);
+    readonly        attribute RTCSessionDescription? localDescription;
+    readonly        attribute RTCSessionDescription? currentLocalDescription;
+    readonly        attribute RTCSessionDescription? pendingLocalDescription;
+    Promise<void> setRemoteDescription(RTCSessionDescriptionInit description);
+    readonly        attribute RTCSessionDescription? remoteDescription;
+    readonly        attribute RTCSessionDescription? currentRemoteDescription;
+    readonly        attribute RTCSessionDescription? pendingRemoteDescription;
+    Promise<void> addIceCandidate((RTCIceCandidateInit or RTCIceCandidate) candidate);
+    readonly        attribute RTCSignalingState signalingState;
+    readonly        attribute RTCIceGatheringState iceGatheringState;
+    readonly        attribute RTCIceConnectionState iceConnectionState;
+    readonly        attribute RTCPeerConnectionState connectionState;
+    readonly        attribute boolean? canTrickleIceCandidates;
+    static sequence<RTCIceServer> getDefaultIceServers();
+    RTCConfiguration getConfiguration();
+    void setConfiguration(RTCConfiguration configuration);
+    void close();
+                    attribute EventHandler onnegotiationneeded;
+                    attribute EventHandler onicecandidate;
+                    attribute EventHandler onicecandidateerror;
+                    attribute EventHandler onsignalingstatechange;
+                    attribute EventHandler oniceconnectionstatechange;
+                    attribute EventHandler onicegatheringstatechange;
+                    attribute EventHandler onconnectionstatechange;
+};
+
+partial interface RTCPeerConnection {
+    Promise<void> createOffer(RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback, optional RTCOfferOptions options);
+    Promise<void> setLocalDescription(RTCSessionDescriptionInit description, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
+    Promise<void> createAnswer(RTCSessionDescriptionCallback successCallback, RTCPeerConnectionErrorCallback failureCallback);
+    Promise<void> setRemoteDescription(RTCSessionDescriptionInit description, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
+    Promise<void> addIceCandidate((RTCIceCandidateInit or RTCIceCandidate) candidate, VoidFunction successCallback, RTCPeerConnectionErrorCallback failureCallback);
+};
+
+callback RTCPeerConnectionErrorCallback = void (DOMException error);
+
+callback RTCSessionDescriptionCallback = void (RTCSessionDescriptionInit description);
+
+partial dictionary RTCOfferOptions {
+            boolean offerToReceiveAudio;
+            boolean offerToReceiveVideo;
+          };
+
+enum RTCSdpType {
+    "offer",
+    "pranswer",
+    "answer",
+    "rollback"
+};
+
+[ Constructor(RTCSessionDescriptionInit descriptionInitDict), Exposed=Window]
+interface RTCSessionDescription {
+    readonly        attribute RTCSdpType type;
+    readonly        attribute DOMString sdp;
+    [Default] object toJSON();
+};
+
+dictionary RTCSessionDescriptionInit {
+    required RTCSdpType type;
+             DOMString sdp = "";
+};
+
+[ Constructor(optional RTCIceCandidateInit candidateInitDict), Exposed=Window]
+interface RTCIceCandidate {
+    readonly        attribute DOMString candidate;
+    readonly        attribute DOMString? sdpMid;
+    readonly        attribute unsigned short? sdpMLineIndex;
+    readonly        attribute DOMString? foundation;
+    readonly        attribute RTCIceComponent? component;
+    readonly        attribute unsigned long? priority;
+    readonly        attribute DOMString? ip;
+    readonly        attribute RTCIceProtocol? protocol;
+    readonly        attribute unsigned short? port;
+    readonly        attribute RTCIceCandidateType? type;
+    readonly        attribute RTCIceTcpCandidateType? tcpType;
+    readonly        attribute DOMString? relatedAddress;
+    readonly        attribute unsigned short? relatedPort;
+    readonly        attribute DOMString? usernameFragment;
+    RTCIceCandidateInit toJSON();
+};
+
+dictionary RTCIceCandidateInit {
+             DOMString candidate = "";
+             DOMString? sdpMid = null;
+             unsigned short? sdpMLineIndex = null;
+             DOMString usernameFragment;
+};
+
+enum RTCIceProtocol {
+    "udp",
+    "tcp"
+};
+
+enum RTCIceTcpCandidateType {
+    "active",
+    "passive",
+    "so"
+};
+
+enum RTCIceCandidateType {
+    "host",
+    "srflx",
+    "prflx",
+    "relay"
+};
+
+[ Constructor(DOMString type, optional RTCPeerConnectionIceEventInit eventInitDict), Exposed=Window]
+interface RTCPeerConnectionIceEvent : Event {
+    readonly        attribute RTCIceCandidate? candidate;
+    readonly        attribute DOMString? url;
+};
+
+dictionary RTCPeerConnectionIceEventInit : EventInit {
+             RTCIceCandidate? candidate;
+             DOMString? url;
+};
+
+[ Constructor(DOMString type, RTCPeerConnectionIceErrorEventInit eventInitDict), Exposed=Window]
+interface RTCPeerConnectionIceErrorEvent : Event {
+    readonly        attribute DOMString hostCandidate;
+    readonly        attribute DOMString url;
+    readonly        attribute unsigned short errorCode;
+    readonly        attribute USVString errorText;
+};
+
+dictionary RTCPeerConnectionIceErrorEventInit : EventInit {
+             DOMString hostCandidate;
+             DOMString url;
+             required unsigned short errorCode;
+             USVString statusText;
+};
+
+enum RTCPriorityType {
+    "very-low",
+    "low",
+    "medium",
+    "high"
+};
+
+partial interface RTCPeerConnection {
+    static Promise<RTCCertificate> generateCertificate(AlgorithmIdentifier keygenAlgorithm);
+};
+
+dictionary RTCCertificateExpiration {
+    [EnforceRange]
+    DOMTimeStamp expires;
+};
+
+[Exposed=Window, Serializable] interface RTCCertificate {
+    readonly        attribute DOMTimeStamp expires;
+    static sequence<AlgorithmIdentifier> getSupportedAlgorithms();
+    sequence<RTCDtlsFingerprint> getFingerprints();
+};
+
+partial interface RTCPeerConnection {
+    sequence<RTCRtpSender> getSenders();
+    sequence<RTCRtpReceiver> getReceivers();
+    sequence<RTCRtpTransceiver> getTransceivers();
+    RTCRtpSender addTrack(MediaStreamTrack track, MediaStream... streams);
+    void removeTrack(RTCRtpSender sender);
+    RTCRtpTransceiver addTransceiver((MediaStreamTrack or DOMString) trackOrKind, optional RTCRtpTransceiverInit init);
+                    attribute EventHandler ontrack;
+};
+
+dictionary RTCRtpTransceiverInit {
+             RTCRtpTransceiverDirection direction = "sendrecv";
+             sequence<MediaStream> streams = [];
+             sequence<RTCRtpEncodingParameters> sendEncodings = [];
+};
+
+enum RTCRtpTransceiverDirection {
+    "sendrecv",
+    "sendonly",
+    "recvonly",
+    "inactive"
+};
+
+[Exposed=Window] interface RTCRtpSender {
+    readonly        attribute MediaStreamTrack? track;
+    readonly        attribute RTCDtlsTransport? transport;
+    readonly        attribute RTCDtlsTransport? rtcpTransport;
+    static RTCRtpCapabilities? getCapabilities(DOMString kind);
+    Promise<void> setParameters(RTCRtpSendParameters parameters);
+    RTCRtpSendParameters getParameters();
+    Promise<void> replaceTrack(MediaStreamTrack? withTrack);
+    void setStreams(MediaStream... streams);
+    Promise<RTCStatsReport> getStats();
+};
+
+dictionary RTCRtpParameters {
+             required sequence<RTCRtpHeaderExtensionParameters> headerExtensions;
+             required RTCRtcpParameters rtcp;
+             required sequence<RTCRtpCodecParameters> codecs;
+};
+
+dictionary RTCRtpSendParameters : RTCRtpParameters {
+             required DOMString transactionId;
+             required sequence<RTCRtpEncodingParameters> encodings;
+             RTCDegradationPreference degradationPreference = "balanced";
+};
+
+dictionary RTCRtpReceiveParameters : RTCRtpParameters {
+             required sequence<RTCRtpDecodingParameters> encodings;
+};
+
+dictionary RTCRtpCodingParameters {
+             DOMString rid;
+};
+
+dictionary RTCRtpDecodingParameters : RTCRtpCodingParameters {
+};
+
+dictionary RTCRtpEncodingParameters : RTCRtpCodingParameters {
+             octet codecPayloadType;
+             RTCDtxStatus dtx;
+             boolean active = true;
+             RTCPriorityType priority = "low";
+             unsigned long ptime;
+             unsigned long maxBitrate;
+             double maxFramerate;
+             double scaleResolutionDownBy;
+};
+
+enum RTCDtxStatus {
+         "disabled",
+         "enabled"
+         };
+
+enum RTCDegradationPreference {
+    "maintain-framerate",
+    "maintain-resolution",
+    "balanced"
+};
+
+dictionary RTCRtcpParameters {
+             DOMString cname;
+             boolean reducedSize;
+};
+
+dictionary RTCRtpHeaderExtensionParameters {
+             required DOMString uri;
+             required unsigned short id;
+             boolean encrypted = false;
+};
+
+dictionary RTCRtpCodecParameters {
+             required octet payloadType;
+             required DOMString mimeType;
+             required unsigned long clockRate;
+             unsigned short channels;
+             DOMString sdpFmtpLine;
+};
+
+dictionary RTCRtpCapabilities {
+             required sequence<RTCRtpCodecCapability> codecs;
+             required sequence<RTCRtpHeaderExtensionCapability> headerExtensions;
+};
+
+dictionary RTCRtpCodecCapability {
+             required DOMString mimeType;
+             required unsigned long clockRate;
+             unsigned short channels;
+             DOMString sdpFmtpLine;
+};
+
+dictionary RTCRtpHeaderExtensionCapability {
+             DOMString uri;
+};
+
+[Exposed=Window] interface RTCRtpReceiver {
+    readonly        attribute MediaStreamTrack track;
+    readonly        attribute RTCDtlsTransport? transport;
+    readonly        attribute RTCDtlsTransport? rtcpTransport;
+    static RTCRtpCapabilities? getCapabilities(DOMString kind);
+    RTCRtpReceiveParameters getParameters();
+    sequence<RTCRtpContributingSource> getContributingSources();
+    sequence<RTCRtpSynchronizationSource> getSynchronizationSources();
+    Promise<RTCStatsReport> getStats();
+};
+
+dictionary RTCRtpContributingSource {
+    required DOMHighResTimeStamp timestamp;
+    required unsigned long source;
+             double audioLevel;
+};
+
+dictionary RTCRtpSynchronizationSource : RTCRtpContributingSource {
+    boolean voiceActivityFlag;
+};
+
+[Exposed=Window] interface RTCRtpTransceiver {
+    readonly        attribute DOMString? mid;
+    [SameObject]
+    readonly        attribute RTCRtpSender sender;
+    [SameObject]
+    readonly        attribute RTCRtpReceiver receiver;
+    readonly        attribute boolean stopped;
+                    attribute RTCRtpTransceiverDirection direction;
+    readonly        attribute RTCRtpTransceiverDirection? currentDirection;
+    void stop();
+    void setCodecPreferences(sequence<RTCRtpCodecCapability> codecs);
+};
+
+[Exposed=Window] interface RTCDtlsTransport : EventTarget {
+    readonly        attribute RTCIceTransport transport;
+    readonly        attribute RTCDtlsTransportState state;
+    sequence<ArrayBuffer> getRemoteCertificates();
+                    attribute EventHandler onstatechange;
+                    attribute EventHandler onerror;
+};
+
+enum RTCDtlsTransportState {
+    "new",
+    "connecting",
+    "connected",
+    "closed",
+    "failed"
+};
+
+dictionary RTCDtlsFingerprint {
+             DOMString algorithm;
+             DOMString value;
+};
+
+[Exposed=Window] interface RTCIceTransport : EventTarget {
+    readonly        attribute RTCIceRole role;
+    readonly        attribute RTCIceComponent component;
+    readonly        attribute RTCIceTransportState state;
+    readonly        attribute RTCIceGathererState gatheringState;
+    sequence<RTCIceCandidate> getLocalCandidates();
+    sequence<RTCIceCandidate> getRemoteCandidates();
+    RTCIceCandidatePair? getSelectedCandidatePair();
+    RTCIceParameters? getLocalParameters();
+    RTCIceParameters? getRemoteParameters();
+                    attribute EventHandler onstatechange;
+                    attribute EventHandler ongatheringstatechange;
+                    attribute EventHandler onselectedcandidatepairchange;
+};
+
+dictionary RTCIceParameters {
+             DOMString usernameFragment;
+             DOMString password;
+};
+
+dictionary RTCIceCandidatePair {
+             RTCIceCandidate local;
+             RTCIceCandidate remote;
+};
+
+enum RTCIceGathererState {
+    "new",
+    "gathering",
+    "complete"
+};
+
+enum RTCIceTransportState {
+    "new",
+    "checking",
+    "connected",
+    "completed",
+    "disconnected",
+    "failed",
+    "closed"
+};
+
+enum RTCIceRole {
+    "controlling",
+    "controlled"
+};
+
+enum RTCIceComponent {
+    "rtp",
+    "rtcp"
+};
+
+[ Constructor(DOMString type, RTCTrackEventInit eventInitDict), Exposed=Window]
+interface RTCTrackEvent : Event {
+    readonly        attribute RTCRtpReceiver receiver;
+    readonly        attribute MediaStreamTrack track;
+    [SameObject]
+    readonly        attribute FrozenArray<MediaStream> streams;
+    readonly        attribute RTCRtpTransceiver transceiver;
+};
+
+dictionary RTCTrackEventInit : EventInit {
+    required RTCRtpReceiver receiver;
+    required MediaStreamTrack track;
+             sequence<MediaStream> streams = [];
+    required RTCRtpTransceiver transceiver;
+};
+
+partial interface RTCPeerConnection {
+    readonly        attribute RTCSctpTransport? sctp;
+    RTCDataChannel createDataChannel(USVString label, optional RTCDataChannelInit dataChannelDict);
+                    attribute EventHandler ondatachannel;
+};
+
+[Exposed=Window] interface RTCSctpTransport {
+    readonly        attribute RTCDtlsTransport transport;
+    readonly        attribute RTCSctpTransportState state;
+    readonly        attribute unrestricted double maxMessageSize;
+    readonly        attribute unsigned short? maxChannels;
+                    attribute EventHandler onstatechange;
+};
+
+enum RTCSctpTransportState {
+    "connecting",
+    "connected",
+    "closed"
+};
+
+[Exposed=Window] interface RTCDataChannel : EventTarget {
+    readonly        attribute USVString label;
+    readonly        attribute boolean ordered;
+    readonly        attribute unsigned short? maxPacketLifeTime;
+    readonly        attribute unsigned short? maxRetransmits;
+    readonly        attribute USVString protocol;
+    readonly        attribute boolean negotiated;
+    readonly        attribute unsigned short? id;
+    readonly        attribute RTCPriorityType priority;
+    readonly        attribute RTCDataChannelState readyState;
+    readonly        attribute unsigned long bufferedAmount;
+                    attribute unsigned long bufferedAmountLowThreshold;
+                    attribute EventHandler onopen;
+                    attribute EventHandler onbufferedamountlow;
+                    attribute EventHandler onerror;
+                    attribute EventHandler onclose;
+    void close();
+                    attribute EventHandler onmessage;
+                    attribute DOMString binaryType;
+    void send(USVString data);
+    void send(Blob data);
+    void send(ArrayBuffer data);
+    void send(ArrayBufferView data);
+};
+
+dictionary RTCDataChannelInit {
+             boolean ordered = true;
+             unsigned short maxPacketLifeTime;
+             unsigned short maxRetransmits;
+             USVString protocol = "";
+             boolean negotiated = false;
+             [EnforceRange]
+             unsigned short id;
+             RTCPriorityType priority = "low";
+};
+
+enum RTCDataChannelState {
+    "connecting",
+    "open",
+    "closing",
+    "closed"
+};
+
+[ Constructor(DOMString type, RTCDataChannelEventInit eventInitDict), Exposed=Window]
+interface RTCDataChannelEvent : Event {
+    readonly        attribute RTCDataChannel channel;
+};
+
+dictionary RTCDataChannelEventInit : EventInit {
+             required RTCDataChannel channel;
+};
+
+partial interface RTCRtpSender {
+    readonly        attribute RTCDTMFSender? dtmf;
+};
+
+[Exposed=Window] interface RTCDTMFSender : EventTarget {
+    void insertDTMF(DOMString tones, optional unsigned long duration = 100, optional unsigned long interToneGap = 70);
+                    attribute EventHandler ontonechange;
+    readonly        attribute boolean canInsertDTMF;
+    readonly        attribute DOMString toneBuffer;
+};
+
+[ Constructor(DOMString type, RTCDTMFToneChangeEventInit eventInitDict), Exposed=Window]
+interface RTCDTMFToneChangeEvent : Event {
+    readonly        attribute DOMString tone;
+};
+
+dictionary RTCDTMFToneChangeEventInit : EventInit {
+             required DOMString tone;
+};
+
+partial interface RTCPeerConnection {
+    Promise<RTCStatsReport> getStats(optional MediaStreamTrack? selector = null);
+    attribute EventHandler onstatsended;
+          };
+
+[Exposed=Window] interface RTCStatsReport {
+
+    readonly maplike<DOMString, object>;
+};
+
+dictionary RTCStats {
+             required DOMHighResTimeStamp timestamp;
+             required RTCStatsType type;
+             required DOMString id;
+};
+
+[ Constructor(DOMString type, RTCStatsEventInit eventInitDict), Exposed=Window]
+          interface RTCStatsEvent : Event {
+            readonly attribute RTCStatsReport report;
+          };
+
+dictionary RTCStatsEventInit : EventInit {
+            required RTCStatsReport report;
+          };
+
+enum RTCErrorDetailType {
+              "data-channel-failure",
+              "dtls-failure",
+              "fingerprint-failure",
+              "idp-bad-script-failure",
+              "idp-execution-failure",
+              "idp-load-failure",
+              "idp-need-login",
+              "idp-timeout",
+              "idp-tls-failure",
+              "idp-token-expired",
+              "idp-token-invalid",
+              "sctp-failure",
+              "sdp-syntax-error",
+              "hardware-encoder-not-available",
+              "hardware-encoder-error"
+          };
+
+[Exposed=Window,
+ Constructor(DOMString type, RTCErrorEventInit eventInitDict)]
+interface RTCErrorEvent : Event {
+    readonly        attribute RTCError? error;
+};
+
+dictionary RTCErrorEventInit : EventInit {
+             RTCError? error = null;
+};
diff --git a/testing/web-platform/tests/interfaces/webxr.idl b/testing/web-platform/tests/interfaces/webxr.idl
index ca6d3fc7843b..2b90859ee659 100644
--- a/testing/web-platform/tests/interfaces/webxr.idl
+++ b/testing/web-platform/tests/interfaces/webxr.idl
@@ -1,3 +1,8 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the
+// "WebXR Device API" spec.
+// See: https://immersive-web.github.io/webxr/
+
 [SecureContext, Exposed=Window] interface XR : EventTarget {
   // Methods
   Promise<XRDevice?> requestDevice();
@@ -22,11 +27,18 @@ dictionary XRSessionCreationOptions {
   XRPresentationContext outputContext;
 };
 
+enum XREnvironmentBlendMode {
+  "opaque",
+  "additive",
+  "alpha-blend",
+};
+
 [SecureContext, Exposed=Window] interface XRSession : EventTarget {
   // Attributes
   readonly attribute XRDevice device;
   readonly attribute boolean immersive;
   readonly attribute XRPresentationContext outputContext;
+  readonly attribute XREnvironmentBlendMode environmentBlendMode;
 
   attribute double depthNear;
   attribute double depthFar;
@@ -35,6 +47,8 @@ dictionary XRSessionCreationOptions {
   // Methods
   Promise<XRFrameOfReference> requestFrameOfReference(XRFrameOfReferenceType type, optional XRFrameOfReferenceOptions options);
 
+  FrozenArray<XRInputSource> getInputSources();
+
   long requestAnimationFrame(XRFrameRequestCallback callback);
   void cancelAnimationFrame(long handle);
 
@@ -45,14 +59,19 @@ dictionary XRSessionCreationOptions {
   attribute EventHandler onfocus;
   attribute EventHandler onresetpose;
   attribute EventHandler onend;
+  attribute EventHandler onselect;
+  attribute EventHandler onselectstart;
+  attribute EventHandler onselectend;
 };
 
 callback XRFrameRequestCallback = void (DOMHighResTimeStamp time, XRFrame frame);
 
 [SecureContext, Exposed=Window] interface XRFrame {
+  readonly attribute XRSession session;
   readonly attribute FrozenArray<XRView> views;
 
   XRDevicePose? getDevicePose(XRCoordinateSystem coordinateSystem);
+  XRInputPose? getInputPose(XRInputSource inputSource, XRCoordinateSystem coordinateSystem);
 };
 
 [SecureContext, Exposed=Window] interface XRCoordinateSystem : EventTarget {
@@ -109,6 +128,38 @@ enum XREye {
   Float32Array getViewMatrix(XRView view);
 };
 
+enum XRHandedness {
+  "",
+  "left",
+  "right"
+};
+
+enum XRTargetRayMode {
+  "gaze",
+  "tracked-pointer",
+  "screen"
+};
+
+[SecureContext, Exposed=Window]
+interface XRInputSource {
+  readonly attribute XRHandedness handedness;
+  readonly attribute XRTargetRayMode targetRayMode;
+};
+
+[SecureContext, Exposed=Window]
+interface XRRay {
+  readonly attribute DOMPointReadOnly origin;
+  readonly attribute DOMPointReadOnly direction;
+  readonly attribute Float32Array transformMatrix;
+};
+
+[SecureContext, Exposed=Window]
+interface XRInputPose {
+  readonly attribute boolean emulatedPosition;
+  readonly attribute XRRay targetRay;
+  readonly attribute Float32Array? gripMatrix;
+};
+
 [SecureContext, Exposed=Window] interface XRLayer {};
 
 typedef (WebGLRenderingContext or
@@ -120,7 +171,7 @@ dictionary XRWebGLLayerInit {
   boolean stencil = false;
   boolean alpha = true;
   boolean multiview = false;
-  double framebufferScaleFactor;
+  double framebufferScaleFactor = 1.0;
 };
 
 [SecureContext, Exposed=Window, Constructor(XRSession session,
@@ -143,6 +194,9 @@ interface XRWebGLLayer : XRLayer {
   // Methods
   XRViewport? getViewport(XRView view);
   void requestViewportScaling(double viewportScaleFactor);
+
+  // Static Methods
+  static double getNativeFramebufferScaleFactor(XRSession session);
 };
 
 partial dictionary WebGLContextAttributes {
@@ -166,6 +220,17 @@ dictionary XRSessionEventInit : EventInit {
   required XRSession session;
 };
 
+[SecureContext, Exposed=Window, Constructor(DOMString type, XRInputSourceEventInit eventInitDict)]
+interface XRInputSourceEvent : Event {
+  readonly attribute XRFrame frame;
+  readonly attribute XRInputSource inputSource;
+};
+
+dictionary XRInputSourceEventInit : EventInit {
+  required XRFrame frame;
+  required XRInputSource inputSource;
+};
+
 [SecureContext, Exposed=Window, Constructor(DOMString type, XRCoordinateSystemEventInit eventInitDict)]
 interface XRCoordinateSystemEvent : Event {
   readonly attribute XRCoordinateSystem coordinateSystem;
diff --git a/testing/web-platform/tests/intersection-observer/idlharness.window.js b/testing/web-platform/tests/intersection-observer/idlharness.window.js
new file mode 100644
index 000000000000..2059e1ce638b
--- /dev/null
+++ b/testing/web-platform/tests/intersection-observer/idlharness.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://w3c.github.io/IntersectionObserver/
+
+idl_test(
+  ['intersection-observer'],
+  ['dom'],
+  idl_array => {
+    idl_array.add_objects({
+      IntersectionObserver: ['observer'],
+    });
+    var options = {
+      root: document.body,
+      rootMargin: '0px',
+      threshold: 1.0
+    }
+    self.observer = new IntersectionObserver(() => {}, options);
+  }
+);
diff --git a/testing/web-platform/tests/media-capabilities/idlharness.any.js b/testing/web-platform/tests/media-capabilities/idlharness.any.js
index 41ede3d06f96..0be4674f5973 100644
--- a/testing/web-platform/tests/media-capabilities/idlharness.any.js
+++ b/testing/web-platform/tests/media-capabilities/idlharness.any.js
@@ -36,7 +36,7 @@ promise_test(async () => {
         idl_array.add_objects({ Navigator: ['navigator'] });
       }
       idl_array.add_objects({
-        MediaCapabilities: ['navigatior.mediaCapabilities'],
+        MediaCapabilities: ['navigator.mediaCapabilities'],
         MediaCapabilitiesInfo: ['decodingInfo', 'encodingInfo'],
         Screen: ['screen'],
         ScreenLuminance: ['screen.luminance'],
diff --git a/testing/web-platform/tests/mediacapture-streams/MediaStream-removetrack.https.html b/testing/web-platform/tests/mediacapture-streams/MediaStream-removetrack.https.html
index 787af0bbe52f..b934397914f3 100644
--- a/testing/web-platform/tests/mediacapture-streams/MediaStream-removetrack.https.html
+++ b/testing/web-platform/tests/mediacapture-streams/MediaStream-removetrack.https.html
@@ -10,36 +10,117 @@
 <p class="instructions">When prompted, accept to share your audio stream, then your video stream.</p>
 <h1 class="instructions">Description</h1>
 <p class="instructions">This test checks that removinging a track from a MediaStream works as expected.</p>
-
+<video id="video" height="120" width="160" autoplay muted></video>
+<audio id="audio" autoplay muted></audio>
 <div id='log'></div>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script>
-var t = async_test("Tests that a removal from a MediaStream works as expected", {timeout:10000});
-t.step(function () {
-  var audio;
-  navigator.mediaDevices.getUserMedia({audio:true}).then(gotAudio);
-  function gotAudio(stream) {
-     audio = stream;
-     navigator.mediaDevices.getUserMedia({video:true}).then(gotVideo);
-  }
 
-  function gotVideo(stream) {
-    var video = stream;
-    video.onremovetrack = function () {
-       assert_unreached("onremovetrack is not triggered when removal of track is triggered by the script itself");
-    };
-    t.step(function () {
-       assert_equals(video.getVideoTracks().length, 1, "video mediastream starts with one video track");
-       video.removeTrack(video.getVideoTracks()[0]);
-       assert_equals(video.getVideoTracks().length, 0, "video mediastream has no video track left");
-       video.removeTrack(audio.getAudioTracks()[0]); // should not throw
-    });
-    t.step(function() {
-       t.done();
-   });
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video: true, audio: true});
+  const tracks = stream.getTracks();
+  t.add_cleanup(() => tracks.forEach(track => track.stop()));
+  const stream2 = await navigator.mediaDevices.getUserMedia({audio: true});
+  tracks.push(...stream2.getTracks());
+
+  stream.onremovetrack = stream2.onremovetrack = t.step_func(() =>
+    assert_unreached("onremovetrack is not triggered by script itself"));
+
+  assert_equals(stream.getTracks().length, 2, "mediastream starts with 2 tracks");
+  stream.removeTrack(stream.getVideoTracks()[0]);
+  assert_equals(stream.getTracks().length, 1, "mediastream has 1 track left");
+  stream.removeTrack(stream.getAudioTracks()[0]);
+  assert_equals(stream.getTracks().length, 0, "mediastream has no tracks left");
+  stream.removeTrack(stream2.getTracks()[0]); // should not throw
+
+  // Allow time to verify no events fire.
+  await new Promise(r => t.step_timeout(r, 1));
+
+}, "Tests that a removal from a MediaStream works as expected");
+
+async function doesEventFire(t, target, name, ms = 1) {
+  const cookie = {};
+  const value = await Promise.race([
+    new Promise(r => target.addEventListener(name, r, {once: true})),
+    new Promise(r => t.step_timeout(r, ms)).then(() => cookie)
+  ]);
+  return value !== cookie;
+}
+
+const doEventsFire = (t, target1, target2, name, ms = 1) => Promise.all([
+  doesEventFire(t, target1, "ended", ms),
+  doesEventFire(t, target2, "ended", ms)
+]);
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video: true, audio: true});
+  const tracks = stream.getTracks();
+  t.add_cleanup(() => tracks.forEach(track => track.stop()));
+
+  audio.srcObject = video.srcObject = stream;
+  t.add_cleanup(() => audio.srcObject = video.srcObject = null);
+
+  await Promise.all([
+    new Promise(r => audio.onloadedmetadata = r),
+    new Promise(r => video.onloadedmetadata = r)
+  ]);
+
+  assert_equals(audio.ended, false, "audio element starts out not ended");
+  assert_equals(video.ended, false, "video element starts out not ended");
+
+  stream.removeTrack(stream.getVideoTracks()[0]);
+  {
+    const [audioDidEnd, videoDidEnd] = await doEventsFire(t, audio, video, "ended");
+    assert_equals(audio.ended, false, "audio element unaffected");
+    assert_equals(audioDidEnd, false, "no audio ended event should fire yet");
+    assert_equals(video.ended, false, "video element keeps going with audio track");
+    assert_equals(videoDidEnd, false, "no video ended event should fire yet");
   }
-});
+  stream.removeTrack(stream.getAudioTracks()[0]);
+  {
+    const [audioDidEnd, videoDidEnd] = await doEventsFire(t, audio, video, "ended");
+    assert_equals(audio.ended, true, "audio element ended because no more audio tracks");
+    assert_equals(audioDidEnd, true, "go audio ended event");
+    assert_equals(video.ended, true, "video element ended because no more tracks");
+    assert_equals(videoDidEnd, true, "got video ended event");
+  }
+}, "Test that removal from a MediaStream fires ended on media elements (video first)");
+
+promise_test(async t => {
+  const stream = await navigator.mediaDevices.getUserMedia({video: true, audio: true});
+  const tracks = stream.getTracks();
+  t.add_cleanup(() => tracks.forEach(track => track.stop()));
+
+  audio.srcObject = video.srcObject = stream;
+  t.add_cleanup(() => audio.srcObject = video.srcObject = null);
+
+  await Promise.all([
+    new Promise(r => audio.onloadedmetadata = r),
+    new Promise(r => video.onloadedmetadata = r)
+  ]);
+
+  assert_equals(audio.ended, false, "audio element starts out not ended");
+  assert_equals(video.ended, false, "video element starts out not ended");
+
+  stream.removeTrack(stream.getAudioTracks()[0]);
+  {
+    const [audioDidEnd, videoDidEnd] = await doEventsFire(t, audio, video, "ended");
+    assert_equals(audio.ended, true, "audio element ended because no more audio tracks");
+    assert_equals(audioDidEnd, true, "got audio ended event");
+    assert_equals(video.ended, false, "video element keeps going with video track");
+    assert_equals(videoDidEnd, false, "no video ended event should fire yet");
+  }
+  stream.removeTrack(stream.getVideoTracks()[0]);
+  {
+    const [audioDidEnd, videoDidEnd] = await doEventsFire(t, audio, video, "ended");
+    assert_equals(audio.ended, true, "audio element remains ended from before");
+    assert_equals(audioDidEnd, false, "no second audio ended event should fire");
+    assert_equals(video.ended, true, "video element ended because no more tracks");
+    assert_equals(videoDidEnd, true, "got video ended event");
+  }
+}, "Test that removal from a MediaStream fires ended on media elements (audio first)");
+
 </script>
 </body>
 </html>
diff --git a/testing/web-platform/tests/notifications/idlharness.any.js b/testing/web-platform/tests/notifications/idlharness.any.js
new file mode 100644
index 000000000000..e2907f318373
--- /dev/null
+++ b/testing/web-platform/tests/notifications/idlharness.any.js
@@ -0,0 +1,27 @@
+// META: global=window,worker
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://notifications.spec.whatwg.org/
+
+idl_test(
+  ['notifications'],
+  ['service-workers', 'html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      Notification: ['notification'],
+    });
+    if (self.ServiceWorkerGlobalScope) {
+      idl_array.add_objects({
+        NotificationEvent: ['notificationEvent'],
+        ServiceWorkerGlobalScope: ['self'],
+      });
+    }
+    self.notification = new Notification("Running idlharness.");
+    if (self.ServiceWorkerGlobalScope) {
+      self.notificationEvent = new NotificationEvent("type", { notification: notification });
+    }
+  }
+);
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm
index 69150236ec76..1286493a3e0a 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm
@@ -2,39 +2,28 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Remove the element containing the selection</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var div1 = document.getElementById("div1");
-                    var span1 = document.getElementById("span1");
-                    var range = document.createRange();
-                    range.selectNode(span1);
-                    selection.addRange(range);
-                    
-                    document.body.removeChild(div1);
-                    
-                    if ("" == selection.toString())
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var div1 = document.getElementById("div1");
+                var span1 = document.getElementById("span1");
+                var range = document.createRange();
+                range.selectNode(span1);
+                selection.addRange(range);
+
+                assert_equals(selection.toString(), span1.textContent);
+                document.body.removeChild(div1);
+                assert_equals(selection.toString(), "");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <div id="div1">some text
             <span id="span1">aaaaaaaa</span>
         </div>
         <div id="div2">Remove the element containing the selection</div>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm
index 2f68ec6554b7..3a93d52ce07e 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToEnd.htm
@@ -2,74 +2,30 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Collapse the selection with collapseToEnd()</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkSelectionAttributes(anchorNode, anchorOffset, focusNode, focusOffset, collapsed, rangeCount)
-            {
-                var selection = window.getSelection();
-                if (anchorNode != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (anchorOffset != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (focusNode != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (focusOffset != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (collapsed != selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (rangeCount != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p1 = document.getElementById("p1");
-                    
-                    var range = document.createRange();
-                    range.selectNode(p1);
-                    selection.addRange(range);
-                    selection.collapseToEnd();
-                    
-                    range.collapse(false);
-                    
-                    checkSelectionAttributes(range.startContainer, range.startOffset, range.endContainer, range.endOffset, true, 1);
-                    if ("" != selection.toString())
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p1 = document.getElementById("p1");
+
+                var range = document.createRange();
+                range.selectNode(p1);
+                selection.addRange(range);
+
+                checkSelectionAttributes(document.body, 1, document.body, 2, false, 1);
+                assert_equals(selection.toString(), p1.textContent);
+
+                selection.collapseToEnd();
+
+                checkSelectionAttributes(document.body, 2, document.body, 2, true, 1);
+                assert_equals(selection.toString(), "");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Collapse the selection with collapseToEnd()</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm
index da9676d57b84..d24cbae8f525 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/collapseToStart.htm
@@ -2,74 +2,30 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Collapse the selection with collapseToStart()</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkSelectionAttributes(anchorNode, anchorOffset, focusNode, focusOffset, collapsed, rangeCount)
-            {
-                var selection = window.getSelection();
-                if (anchorNode != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (anchorOffset != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (focusNode != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (focusOffset != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (collapsed != selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (rangeCount != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p1 = document.getElementById("p1");
-                    
-                    var range = document.createRange();
-                    range.selectNode(p1);
-                    selection.addRange(range);
-                    selection.collapseToStart();
-                    
-                    range.collapse(true);
-                    
-                    checkSelectionAttributes(range.startContainer, range.startOffset, range.endContainer, range.endOffset, true, 1);
-                    if ("" != selection.toString())
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p1 = document.getElementById("p1");
+
+                var range = document.createRange();
+                range.selectNode(p1);
+                selection.addRange(range);
+
+                checkSelectionAttributes(document.body, 1, document.body, 2, false, 1);
+                assert_equals(selection.toString(), p1.textContent);
+
+                selection.collapseToStart();
+
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), "")
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Collapse the selection with collapseToStart()</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/common.js b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/common.js
new file mode 100644
index 000000000000..6da739b5eb63
--- /dev/null
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/common.js
@@ -0,0 +1,15 @@
+function checkSelectionAttributes(anchorNode, anchorOffset, focusNode, focusOffset, collapsed, rangeCount)
+{
+    var selection = window.getSelection();
+    assert_equals(selection.anchorNode, anchorNode, "anchorNode");
+    assert_equals(selection.anchorOffset, anchorOffset, "anchorOffset");
+    assert_equals(selection.focusNode, focusNode, "focusNode");
+    assert_equals(selection.focusOffset, focusOffset, "focusOffset");
+    assert_equals(selection.isCollapsed, collapsed, "collapsed");
+    assert_equals(selection.rangeCount, rangeCount, "rangeCount");
+}
+
+function checkDefaultSelectionAttributes()
+{
+    checkSelectionAttributes(null, 0, null, 0, true, 0);
+}
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm
index 2373939cc49b..b9ae112275ed 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/deleteFromDocument.htm
@@ -2,79 +2,32 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Delete some text from the document while it is part of a selection</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkSelectionAttributes(anchorNode, anchorOffset, focusNode, focusOffset, collapsed, rangeCount)
-            {
-                var selection = window.getSelection();
-                if (anchorNode != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (anchorOffset != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (focusNode != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (focusOffset != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (collapsed != selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (rangeCount != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p2 = document.getElementById("p2");
-                    var expectedResult = "abcdeuvwxyz";
-                    
-                    var range = document.createRange();
-                    range.setStart(p2.firstChild, 5);
-                    range.setEnd(p2.firstChild, 20);
-                    selection.addRange(range);
-                    selection.deleteFromDocument();
-                    p2.normalize();
-                    
-                    range.collapse(true);
-                    
-                    checkSelectionAttributes(range.startContainer, range.startOffset, range.endContainer, range.endOffset, true, 1);
-                    
-                    if (expectedResult != p2.firstChild.data)
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p2 = document.getElementById("p2");
+
+                var range = document.createRange();
+                range.setStart(p2.firstChild, 5);
+                range.setEnd(p2.firstChild, 20);
+                selection.addRange(range);
+
+                checkSelectionAttributes(p2.firstChild, 5, p2.firstChild, 20, false, 1);
+                assert_equals(p2.firstChild.data, p2.textContent)
+
+                selection.deleteFromDocument();
+
+                checkSelectionAttributes(p2.firstChild, 5, p2.firstChild, 5, true, 1);
+                assert_equals(p2.firstChild.data, "abcdeuvwxyz")
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Delete some text from the document while it is part of a selection</p>
         <p id="p2">abcdefghijklmnopqrstuvwxyz</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm
index a3911e6cd9dc..d323e7d71c28 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/getRangeAt.htm
@@ -2,58 +2,29 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Get the range from the selection</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p1 = document.getElementById("p1");
-                    var testPassed = true;
-                    
-                    var range = document.createRange();
-                    range.selectNode(p1);
-                    selection.addRange(range);
-                    
-                    var returnedRange = selection.getRangeAt(0);
-                    
-                    if (range.toString() != returnedRange.toString())
-                    {
-                        testPassed = false;
-                    }
-                    if (range.startContainer != returnedRange.startContainer)
-                    {
-                        testPassed = false;
-                    }
-                    if (range.startOffset != returnedRange.startOffset)
-                    {
-                        testPassed = false;
-                    }
-                    if (range.endContainer != returnedRange.endContainer)
-                    {
-                        testPassed = false;
-                    }
-                    if (range.endOffset != returnedRange.endOffset)
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p1 = document.getElementById("p1");
+
+                var range = document.createRange();
+                range.selectNode(p1);
+                selection.addRange(range);
+
+                var returnedRange = selection.getRangeAt(0);
+
+                assert_equals(returnedRange.toString(), p1.textContent);
+                assert_equals(returnedRange.startContainer, document.body);
+                assert_equals(returnedRange.startOffset, 1);
+                assert_equals(returnedRange.endContainer, document.body);
+                assert_equals(returnedRange.endOffset, 2);
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Get the range from the selection</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm
index 4ec0d80f359e..4ac8702a0e5b 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/insertNodeIntoSelection.htm
@@ -2,40 +2,30 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Insert a new element and text node into an element that is currently selected</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
         <script type="text/javascript">
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var expectedText = "some textnew text";
-                    var div1 = document.getElementById("div1");
-                    var range = document.createRange();
-                    range.selectNode(div1);
-                    selection.addRange(range);
-                    
-                    var ele = document.createElement("div");
-                    var tNode = document.createTextNode("new text");
-                    ele.appendChild(tNode);
-                    div1.appendChild(ele);
-                    
-                    if (expectedText == selection.toString())
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var div1 = document.getElementById("div1");
+                var range = document.createRange();
+                range.selectNode(div1);
+                selection.addRange(range);
+
+                assert_equals(selection.toString(), "some text");
+
+                var ele = document.createElement("div");
+                var tNode = document.createTextNode("new text");
+                ele.appendChild(tNode);
+                div1.appendChild(ele);
+
+                assert_equals(selection.toString(), "some text\nnew text");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p>This test inserts a new element with a text node child into the current selection.</p>
         <div id="div1">some text</div>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm
index 869e5391dda1..85d6211e1cb0 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeAllRanges.htm
@@ -2,72 +2,30 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Call removeAllRanges() to clear the selection</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkDefaultSelectionAttributes()
-            {
-                var selection = window.getSelection();
-                if (null != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (null != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (!selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p1 = document.getElementById("p1");
-                    
-                    var range = document.createRange();
-                    range.selectNode(p1);
-                    selection.addRange(range);
-                    selection.removeAllRanges();
-                    
-                    checkDefaultSelectionAttributes();
-                    if ("" != selection.toString())
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p1 = document.getElementById("p1");
+
+                var range = document.createRange();
+                range.selectNode(p1);
+                selection.addRange(range);
+
+                checkSelectionAttributes(document.body, 1, document.body, 2, false, 1);
+                assert_equals(selection.toString(), p1.textContent);
+
+                selection.removeAllRanges();
+
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Call removeAllRanges() to clear the selection</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeRange.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeRange.htm
index e35047b4701d..8786e8267141 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeRange.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/removeRange.htm
@@ -2,71 +2,30 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Remove the range from the selection</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkDefaultSelectionAttributes()
-            {
-                var selection = window.getSelection();
-                if (null != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (null != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (!selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var p1 = document.getElementById("p1");
-                    
-                    var range = document.createRange();
-                    range.selectNode(p1);
-                    selection.addRange(range);
-                    selection.removeRange(range);
-                    
-                    checkDefaultSelectionAttributes();
-                    if ("" != selection.toString())
-                    {
-                        testPassed = false;
-                    }
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var p1 = document.getElementById("p1");
+
+                var range = document.createRange();
+                range.selectNode(p1);
+                selection.addRange(range);
+
+                checkSelectionAttributes(document.body, 1, document.body, 2, false, 1);
+                assert_equals(selection.toString(), p1.textContent);
+
+                selection.removeRange(range);
+
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <p id="p1">Remove the range from the selection by calling removeRange()</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/select.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/select.htm
index f6a31f24964b..98086ef18916 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/select.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/select.htm
@@ -2,71 +2,31 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Call select() on a text field</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkDefaultSelectionAttributes()
-            {
-                var selection = window.getSelection();
-                if (null != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (null != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (!selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.rangeCount)
-                {
-                    testPassed = false;
-                }
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var input1 = document.getElementById("input1");
-                    
-                    input1.select();
-                    
-                    checkDefaultSelectionAttributes();
-                    
-                    var selectionText = input1.value.substring(input1.selectionStart, input1.selectionEnd);
-                    if (input1.value != selectionText)
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var input1 = document.getElementById("input1");
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, 0);
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                input1.select();
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, input1.value.length);
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), input1.value);
             }
         </script>
     </head>
-    <body onload="RunTest();">
-        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" /> 
+    <body onload="test(RunTest);">
+        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" />
         <p>Select the text in the input element by calling select()</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm
index a3ab4f57d40d..8f0d7c81b99b 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectAllChildren.htm
@@ -2,31 +2,26 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Call selectAllChildren() where the parameter is a text node</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
             function RunTest()
             {
-                try
-                {
-                    var selection = window.getSelection();
-                    var div1 = document.getElementById("div1");
-                    selection.selectAllChildren(div1.firstChild);
-                    
-                    if ("" == selection.toString())
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var div1 = document.getElementById("div1");
+
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                selection.selectAllChildren(div1.firstChild);
+
+                checkSelectionAttributes(div1.firstChild, 0, div1.firstChild, 0, true, 1);
+                assert_equals(selection.toString(), "");
             }
         </script>
     </head>
-    <body onload="RunTest();">
+    <body onload="test(RunTest);">
         <div id="div1">Call selectAllChildren() where the parameter is a text node</div>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm
index c5b69d570600..35687f4a5ad7 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/selectionStartEnd.htm
@@ -2,73 +2,53 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Set selectionStart and selectionEnd on a text field</title>
-        <script type="text/javascript">  
-            var testPassed = true;
-            
-            function checkDefaultSelectionAttributes()
-            {
-                var selection = window.getSelection();
-                if (null != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (null != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (!selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.rangeCount)
-                {
-                    testPassed = false;
-                }  
-            }
-            
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
+        <script type="text/javascript">
             function RunTest()
             {
-                try
-                {
-                    var input1 = document.getElementById("input1");
-                    var expectedResult = "text";
-                    
-                    input1.selectionStart = 5;
-                    input1.selectionEnd = 9;
-                    
-                    checkDefaultSelectionAttributes();
-                    
-                    var selectionText = input1.value.substring(input1.selectionStart, input1.selectionEnd);
-                    if (expectedResult != selectionText)
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var input1 = document.getElementById("input1");
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, 0);
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                // only setting selectionStart/End doesn't affect getSelection()
+
+                input1.selectionStart = 5;
+                input1.selectionEnd = 9;
+
+                assert_equals(input1.selectionStart, 5);
+                assert_equals(input1.selectionEnd, 9);
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                // select() changes selectionStart/End and getSelection()
+
+                input1.select();
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, input1.value.length);
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), input1.value);
+
+                // now setting selectionStart/End does affect getSelection()
+
+                input1.selectionStart = 5;
+                input1.selectionEnd = 9;
+
+                assert_equals(input1.selectionStart, 5);
+                assert_equals(input1.selectionEnd, 9);
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), "text");
             }
         </script>
     </head>
-    <body onload="RunTest();">
-        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" /> 
+    <body onload="test(RunTest);">
+        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" />
         <p>Select some text in the input element by setting selectionStart and selectionEnd</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm
index a6d7a0f2ba1c..8de7fe5eb4e1 100644
--- a/testing/web-platform/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm
+++ b/testing/web-platform/tests/old-tests/submission/Microsoft/selection/setSelectionRange.htm
@@ -2,72 +2,52 @@
 <html>
     <head>
         <title id="desc">HTML5 Selection: Call setSelectionRange() on a text field</title>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script src="common.js"></script>
         <script type="text/javascript">
-            var testPassed = true;
-            
-            function checkDefaultSelectionAttributes()
-            {
-                var selection = window.getSelection();
-                if (null != selection.anchorNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.anchorOffset)
-                {
-                    testPassed = false;
-                }
-                if (null != selection.focusNode)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.focusOffset)
-                {
-                    testPassed = false;
-                }
-                if (!selection.isCollapsed)
-                {
-                    testPassed = false;
-                }
-                if (0 != selection.rangeCount)
-                {
-                    testPassed = false;
-                }  
-            }
-            
             function RunTest()
             {
-                try
-                {
-                    var input1 = document.getElementById("input1");
-                    var expectedResult = "input";
-                    
-                    input1.setSelectionRange(16, 21);
-                    
-                    checkDefaultSelectionAttributes();
-                    
-                    var selectionText = input1.value.substring(input1.selectionStart, input1.selectionEnd);
-                    if (expectedResult != selectionText)
-                    {
-                        testPassed = false;
-                    }
-                    
-                    if (testPassed)
-                    {
-                        document.getElementById("testresult").firstChild.data = "PASS";
-                    }
-                }
-                catch (ex)
-                {
-                    document.getElementById("testresult").firstChild.data = "FAIL";
-                }
+                var selection = window.getSelection();
+                var input1 = document.getElementById("input1");
+                var expectedResult = "input";
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, 0);
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                // only calling setSelectionRange() doesn't affect getSelection()
+
+                input1.setSelectionRange(16, 21);
+
+                assert_equals(input1.selectionStart, 16);
+                assert_equals(input1.selectionEnd, 21);
+                checkDefaultSelectionAttributes();
+                assert_equals(selection.toString(), "");
+
+                // select() changes selectionStart/End and getSelection()
+
+                input1.select();
+
+                assert_equals(input1.selectionStart, 0);
+                assert_equals(input1.selectionEnd, input1.value.length);
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), input1.value);
+
+                // now calling setSelectionRange() does affect getSelection()
+
+                input1.setSelectionRange(16, 21);
+
+                assert_equals(input1.selectionStart, 16);
+                assert_equals(input1.selectionEnd, 21);
+                checkSelectionAttributes(document.body, 1, document.body, 1, true, 1);
+                assert_equals(selection.toString(), "input");
             }
         </script>
     </head>
-    <body onload="RunTest();">
-        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" /> 
+    <body onload="test(RunTest);">
+        <input style="WIDTH: 500px" id="input1" value="Some text in an input control" type="text" />
         <p>Call setSelectionRange() on the input element to select some of the text</p>
-        <p>Test passes if the word "PASS" appears below.</p>
-        <div>Test result: </div>
-        <div id="testresult">FAIL</div>
     </body>
 </html>
diff --git a/testing/web-platform/tests/payment-handler/idlharness.https.any.js b/testing/web-platform/tests/payment-handler/idlharness.https.any.js
index d039f66001f2..6fbba53515eb 100644
--- a/testing/web-platform/tests/payment-handler/idlharness.https.any.js
+++ b/testing/web-platform/tests/payment-handler/idlharness.https.any.js
@@ -1,24 +1,46 @@
+// META: global=window,worker
 // META: script=/resources/WebIDLParser.js
 // META: script=/resources/idlharness.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
 
 'use strict';
 
 // https://w3c.github.io/payment-handler/
 
-promise_test(async () => {
-  const srcs = [
-    'payment-handler',
-    'service-workers',
-    'dedicated-workers',
-    'dom'
-  ];
-  const [idl, sw, dw, dom] = await Promise.all(
-      srcs.map(i => fetch(`/interfaces/${i}.idl`).then(r => r.text())));
+idl_test(
+  ['payment-handler'],
+  ['service-workers', 'dedicated-workers', 'dom'],
+  async (idl_array, t) => {
+    const isWindow = self.GLOBAL.isWindow();
+    const isServiceWorker = 'ServiceWorkerGlobalScope' in self;
+    const hasRegistration = isServiceWorker || isWindow;
 
-  const idlArray = new IdlArray();
-  idlArray.add_idls(idl);
-  idlArray.add_dependency_idls(sw);
-  idlArray.add_dependency_idls(dw);
-  idlArray.add_dependency_idls(dom);
-  idlArray.test();
-}, 'payment-handler interfaces.');
+    if (hasRegistration) {
+      idl_array.add_objects({
+        ServiceWorkerRegistration: ['registration'],
+        PaymentManager: ['paymentManager'],
+        PaymentInstruments: ['instruments'],
+      });
+    }
+    if (isServiceWorker) {
+      idl_array.add_objects({
+        ServiceWorkerGlobalScope: ['self'],
+        CanMakePaymentEvent: ['new CanMakePaymentEvent("type")'],
+        PaymentRequestEvent: ['new PaymentRequestEvent("type")'],
+      })
+    }
+
+    if (isWindow) {
+      const scope = '/service-workers/service-worker/resources/';
+      const reg = await service_worker_unregister_and_register(
+        t, '/service-workers/service-worker/resources/empty-worker.js', scope);
+      self.registration = reg;
+      await wait_for_state(t, reg.installing, "activated");
+      add_completion_callback(() => reg.unregister());
+    }
+    if (hasRegistration) {
+      self.paymentManager = self.registration.paymentManager;
+      self.instruments = self.paymentManager.instruments;
+    }
+  }
+);
diff --git a/testing/web-platform/tests/payment-handler/interfaces.https.any.js b/testing/web-platform/tests/payment-handler/interfaces.https.any.js
deleted file mode 100644
index 73679300f070..000000000000
--- a/testing/web-platform/tests/payment-handler/interfaces.https.any.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-
-'use strict';
-
-// https://w3c.github.io/payment-handler/
-
-promise_test(async () => {
-  const idl = await fetch('/interfaces/payment-handler.idl').then(r => r.text());
-  const idlArray = new IdlArray();
-  idlArray.add_idls(idl);
-  idlArray.add_untested_idls('interface ExtendableEvent {};');
-  idlArray.add_untested_idls('dictionary ExtendableEventInit {};');
-  idlArray.test();
-  done();
-}, 'Payment handler interfaces.');
diff --git a/testing/web-platform/tests/priority-hints/img-attr-named-constructor.tentative.html b/testing/web-platform/tests/priority-hints/img-attr-named-constructor.tentative.html
index d9dd22a9c5de..ce677ccc177b 100644
--- a/testing/web-platform/tests/priority-hints/img-attr-named-constructor.tentative.html
+++ b/testing/web-platform/tests/priority-hints/img-attr-named-constructor.tentative.html
@@ -19,6 +19,8 @@
     assert_equals(img5.importance, "auto", "missing importance reflects as 'auto' IDL attribute on the image element");
   }, "importance attribute on <img> elements should reflect valid IDL values");
 
-  const img = new Image();
-  assert_equals(img.importance, "auto");
+  test(() => {
+    const img = new Image();
+    assert_equals(img.importance, "auto");
+  }, "importance of new Image() is 'auto'");
 </script>
diff --git a/testing/web-platform/tests/push-api/idlharness.any.js b/testing/web-platform/tests/push-api/idlharness.any.js
new file mode 100644
index 000000000000..16c0826a7592
--- /dev/null
+++ b/testing/web-platform/tests/push-api/idlharness.any.js
@@ -0,0 +1,42 @@
+// META: global=window,worker
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: script=/service-workers/service-worker/resources/test-helpers.sub.js
+
+// https://w3c.github.io/push-api/
+
+idl_test(
+  ['push-api'],
+  ['service-workers', 'html', 'dom'],
+  async (idl_array, t) => {
+    const isServiceWorker = 'ServiceWorkerGlobalScope' in self
+      && self instanceof ServiceWorkerGlobalScope;
+    if (isServiceWorker) {
+      idl_array.add_objects({
+        ServiceWorkerGlobalScope: ['self'],
+        PushEvent: ['new PushEvent("type")'],
+        PushSubscriptionChangeEvent: [
+          'new PushSubscriptionChangeEvent("pushsubscriptionchange")'
+        ],
+      })
+    }
+    if (GLOBAL.isWindow() || isServiceWorker) {
+      idl_array.add_objects({
+        // self.registration set for window below, and registration is already
+        // part of ServiceWorkerGlobalScope.
+        ServiceWorkerRegistration: ['registration'],
+        PushManager: ['registration.pushManager'],
+      });
+    }
+
+    if (GLOBAL.isWindow()) {
+      const scope = '/service-workers/service-worker/resources/';
+      const worker = `${scope}empty-worker.js`;
+      return service_worker_unregister_and_register(t, worker, scope)
+        .then(registration => {
+          self.registration = registration;
+          t.add_cleanup(function () { registration.unregister(); });
+        });
+    }
+  }
+);
diff --git a/testing/web-platform/tests/push-api/idlharness.https.any.js b/testing/web-platform/tests/push-api/idlharness.https.any.js
deleted file mode 100644
index 7ed5e110c56a..000000000000
--- a/testing/web-platform/tests/push-api/idlharness.https.any.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// META: global=window,worker
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-
-// https://w3c.github.io/push-api/
-
-idl_test(
-  ['push-api'],
-  ['service-workers', 'html', 'dom'],
-  idl_array => {
-    // TODO: ServiceWorkerRegistration objects
-    if ('ServiceWorkerGlobalScope' in self
-        && self instanceof ServiceWorkerGlobalScope) {
-      idl_array.add_objects({
-        PushSubscriptionChangeEvent: [
-          'new PushSubscriptionChangeEvent("pushsubscriptionchange")'
-        ],
-      })
-    }
-  },
-  'push-api interfaces'
-);
diff --git a/testing/web-platform/tests/resources/chromium/webxr-test.js b/testing/web-platform/tests/resources/chromium/webxr-test.js
index 7ed9332bd6ee..d760e7c76d30 100644
--- a/testing/web-platform/tests/resources/chromium/webxr-test.js
+++ b/testing/web-platform/tests/resources/chromium/webxr-test.js
@@ -61,7 +61,7 @@ class MockVRService {
   }
 }
 
-// Implements both VRDisplayHost and VRMagicWindowProvider. Maintains a mock for
+// Implements both XRDeviceImpl and VRMagicWindowProvider. Maintains a mock for
 // XRPresentationProvider.
 class MockDevice {
   constructor(fakeDeviceInit, service) {
@@ -89,14 +89,14 @@ class MockDevice {
   // Functions for setup.
   // This function calls to the backend to add this device to the list.
   notifyClientOfDisplay() {
-    let displayPtr = new device.mojom.VRDisplayHostPtr();
-    let displayRequest = mojo.makeRequest(displayPtr);
-    let displayBinding =
-        new mojo.Binding(device.mojom.VRDisplayHost, this, displayRequest);
+    let devicePtr = new device.mojom.XRDevicePtr();
+    let deviceRequest = mojo.makeRequest(devicePtr);
+    let deviceBinding =
+        new mojo.Binding(device.mojom.XRDevice, this, deviceRequest);
 
     let clientRequest = mojo.makeRequest(this.displayClient_);
     this.service_.client_.onDisplayConnected(
-        displayPtr, clientRequest, this.displayInfo_);
+        devicePtr, clientRequest, this.displayInfo_);
   }
 
   // Test methods.
@@ -279,7 +279,7 @@ class MockDevice {
     // do not have any use for this data at present.
   }
 
-  // VRDisplayHost implementation.
+  // XRDeviceImpl implementation.
 
   requestSession(sessionOptions, was_activation) {
     return this.supportsSession(sessionOptions).then((result) => {
diff --git a/testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-keys.js b/testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-keys.js
index 96bd43b673a4..a94c18f873c8 100644
--- a/testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-keys.js
+++ b/testing/web-platform/tests/service-workers/cache-storage/script-tests/cache-keys.js
@@ -179,6 +179,20 @@ prepopulated_cache_test(simple_entries, function(cache, entries) {
         });
   }, 'Cache.keys without parameters');
 
+prepopulated_cache_test(vary_entries, function(cache, entries) {
+    return cache.keys()
+      .then(function(result) {
+          assert_request_array_equals(
+            result,
+            [
+              entries.vary_cookie_is_cookie.request,
+              entries.vary_cookie_is_good.request,
+              entries.vary_cookie_absent.request,
+            ],
+            'Cache.keys without parameters should match all entries.');
+        });
+  }, 'Cache.keys without parameters and VARY entries');
+
 prepopulated_cache_test(simple_entries, function(cache, entries) {
     return cache.keys(new Request(entries.cat.request.url, {method: 'HEAD'}))
       .then(function(result) {
diff --git a/testing/web-platform/tests/speech-api/SpeechRecognition-abort-manual.https.html b/testing/web-platform/tests/speech-api/SpeechRecognition-abort-manual.https.html
new file mode 100644
index 000000000000..3c9e1ab2512e
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechRecognition-abort-manual.https.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>SpeechRecognition.abort</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="webspeech.js"></script>
+  </head>
+  <body>
+    <p><b>Instructions:</b> Do NOT speak. Run test in silence.
+      This test may fail if too much noise.</p>
+    <div id="log"></div>
+    <div id="notes"></div>
+    <script>
+var audioTest = new CycleTest('onaudio');
+reco.onaudiostart = audioTest.startEvent();
+reco.onaudioend = audioTest.endEvent();
+
+reco.onsoundstart = neverFireEvent('onsoundstart');
+reco.onsoundend = neverFireEvent('onsoundend');
+reco.onspeechstart = neverFireEvent('onspeechstart');
+reco.onspeechend = neverFireEvent('onsspeechend');
+reco.onresult = neverFireEvent('onresult');
+reco.onnomatch = neverFireEvent('onnomatch');
+
+var errorTest = new CountTest('onerror aborted', 1, 1);
+reco.onerror = errorTest.test().step_func(function(event) {
+  errorTest.count(1);
+  assert_equals(typeof(event.message), 'string', 'typeof(event.message)');
+  notes.innerHTML += 'onerror message is "' + event.message + '"' + '<br>';
+  assert_equals(event.error, 'aborted', 'onerror event.error');
+});
+
+reco.start();
+
+function beginTest() {
+  audioTest.test.step_timeout(function() { reco.abort(); }, DELAY);
+}
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/speech-api/SpeechRecognition-basics.https.html b/testing/web-platform/tests/speech-api/SpeechRecognition-basics.https.html
new file mode 100644
index 000000000000..dc5d3f5c1df6
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechRecognition-basics.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>SpeechRecognition basics</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+  const reco = new SpeechRecognition();
+  assert_equals(reco.grammars.length, 0, 'SpeechRecognition.grammars.length');
+  assert_equals(reco.lang, '', 'SpeechRecognition.lang');
+  assert_false(reco.continuous, 'SpeechRecognition.continuous');
+  assert_false(reco.interimResults, 'SpeechRecognition.interimResults');
+  assert_equals(reco.maxAlternatives, 1, 'SpeechRecognition.maxAlternatives');
+});
+</script>
diff --git a/testing/web-platform/tests/speech-api/SpeechRecognition-onerror-manual.https.html b/testing/web-platform/tests/speech-api/SpeechRecognition-onerror-manual.https.html
new file mode 100644
index 000000000000..b0d5d5ebed05
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechRecognition-onerror-manual.https.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>SpeechRecognition.onerror no-speech</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      var TIMEOUT_OVERRIDE = 10000;  // In milliseconds.
+    </script>
+    <script src='webspeech.js'></script>
+  </head>
+  <body>
+    <p><b>Instructions:</b> Do NOT speak. Run test in silence.
+      This test may fail if too much noise.</p>
+    <div id="log"></div>
+    <div id="notes"></div>
+    <script>
+var audioTest = new CycleTest('onaudio');
+reco.onaudiostart = audioTest.startEvent();
+reco.onaudioend = audioTest.endEvent();
+
+reco.onsoundstart = neverFireEvent('onsoundstart');
+reco.onsoundend = neverFireEvent('onsoundend');
+reco.onspeechstart = neverFireEvent('onspeechstart');
+reco.onspeechend = neverFireEvent('onsspeechend');
+reco.onresult = neverFireEvent('onresult');
+reco.onnomatch = neverFireEvent('onnomatch');
+
+var errorTest = new CountTest('onerror no-speech', 1, 1);
+reco.onerror = errorTest.test().step_func(function(event) {
+  errorTest.count(1);
+  assert_equals(typeof(event.message), 'string', 'typeof(event.message)');
+  notes.innerHTML += 'onerror message is "' + event.message + '"' + '<br>';
+  assert_equals(event.error, 'no-speech', 'onerror event.error');
+});
+
+reco.start();
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/speech-api/SpeechRecognition-onresult-manual.https.html b/testing/web-platform/tests/speech-api/SpeechRecognition-onresult-manual.https.html
new file mode 100644
index 000000000000..6a0877bbe1e3
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechRecognition-onresult-manual.https.html
@@ -0,0 +1,157 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="timeout" content="long">
+    <title>SpeechRecognition.onresult</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script>
+      var TIMEOUT_OVERRIDE = 60000;  // In milliseconds.
+    </script>
+    <script src="webspeech.js"></script>
+  </head>
+  <body>
+    <b>Instructions:</b>
+    <p>Reload and re-run this test at least 4 times to cover all 4 combinations
+      of these checkboxes:
+    <input type="checkbox" id="continuous">continuous
+    <input type="checkbox" id="interim">interimResults
+    <button id="button" onclick="startButton()">Click and Speak</button>
+    <br>
+    You may also wish to test with various combinations of these:
+    maxAlternatives:
+    <input type="text" value="3" size="2" id="maxAlternatives">,
+    language:
+    <input type="text" value="en-us" size="7" id="language">
+    </p>
+    <div id="results"></div>
+    <div id="log"></div>
+    <div id="notes"></div>
+    <script>
+var audioTest = new CycleTest('onaudio');
+reco.onaudiostart = audioTest.startEvent();
+reco.onaudioend = audioTest.endEvent();
+
+var soundTest = new CycleTest('onsound');
+reco.onsoundstart = soundTest.startEvent();
+reco.onsoundend = soundTest.endEvent();
+
+var speechTest = new CycleTest('onspeech');
+reco.onspeechstart = speechTest.startEvent();
+reco.onspeechend = speechTest.endEvent();
+
+reco.onerror = neverFireEvent('onerror');
+reco.onnomatch = neverFireEvent('onnomatch');
+
+var lastIsFinal = -1;  // Highest results index that has been marked isFinal.
+var lastInterimCount = 0;  // Number of results that are not marked isFinal.
+var resultTest = new CountTest('onresult', 1, 9999);
+
+resultTest.whenDone = function() {
+  assert_equals(lastInterimCount, 0, 'Number of interim results pending');
+};
+
+function appendAlternatives(array, results) {
+  for (var i = 0; i < reco.maxAlternatives; i++) {
+    if (i < results.length) {
+      array[i] += results[i].transcript;
+    } else {
+      array[i] += '<no alternative>';
+      assert_true(i > 0, 'Must return at least one alternative.');
+    }
+  }
+}
+
+reco.onresult = resultTest.test().step_func(function(event) {
+  resultTest.count(1);
+  var final = new Array();
+  var interim = new Array();
+  for (var i = 0; i < reco.maxAlternatives; i++) {
+    final[i] = '';
+    interim[i] = '';
+  }
+  assert_true(event.resultIndex > lastIsFinal, 'resultIndex must not ' +
+      'indicate a change in a result that was previously marked isFinal.');
+  assert_true(event.resultIndex <= event.results.length,
+      'resultIndex must not be greater than results.length.');
+  for (var i = 0; i < event.results.length; ++i) {
+    assert_true(event.results[i].length <= reco.maxAlternatives,
+        'Number of alternatives must not exceed maxAlternatives.');
+    if (event.results[i].isFinal) {
+      appendAlternatives(final, event.results[i]);
+      assert_true(reco.continuous || i < 1,
+          'When SpeechRecognition.continuous is false, no more than one ' +
+          'SpeechRecognitionResult.isFinal true should be returned.');
+      if (i > lastIsFinal) {
+        lastIsFinal = i;
+      }
+    } else {
+      appendAlternatives(interim, event.results[i]);
+      assert_true(i > lastIsFinal, 'A SpeechRecognitionResult was previously ' +
+          'marked isFinal, but now is not marked isFinal.');
+    }
+  lastInterimCount = event.results.length - lastIsFinal - 1;
+  assert_true(reco.interimResults || lastInterimCount == 0,
+      'Should not return interim results when reco.interimResults is false.');
+  }
+  for (var i = 0; i < reco.maxAlternatives; i++) {
+    document.getElementById('final_span_' + i).innerHTML = final[i];
+    document.getElementById('interim_span_' + i).innerHTML = interim[i];
+  }
+});
+
+function configureRecognition() {
+  var continuousBox = document.getElementById('continuous');
+  var interimBox = document.getElementById('interim');
+  var maxAlternativesInput = document.getElementById('maxAlternatives');
+  var langInput = document.getElementById('language');
+  reco.continuous = continuousBox.checked;
+  reco.interimResults = interimBox.checked;
+  reco.maxAlternatives = maxAlternativesInput.value;
+  reco.lang = langInput.value;
+  continuousBox.disabled = true;
+  interimBox.disabled = true;
+  maxAlternativesInput.disabled = true;
+  langInput.disabled = true;
+  test(function() {
+    assert_equals(reco.continuous, continuousBox.checked,
+                  'SpeechRecognition.continuous');
+    assert_equals(reco.interimResults, interim.checked,
+                  'SpeechRecognition.interimResults');
+    assert_equals(reco.maxAlternatives, parseInt(maxAlternativesInput.value),
+                  'SpeechRecognition.maxAlternatives');
+    assert_equals(reco.lang, langInput.value,
+                  'SpeechRecognition.lang');
+  }, 'SpeechRecognition settings');
+}
+
+var clicks = 0;
+function startButton() {
+  var button = document.getElementById('button');
+  if (++clicks == 1) {
+    configureRecognition();
+    if (reco.continuous) {
+      button.innerHTML = 'Click when done speaking';
+    } else {
+      button.hidden = true;
+    }
+    var results_html = '';
+    for (var i = 0; i < reco.maxAlternatives; i++) {
+      results_html += '<div style="border:1px dotted gray; padding:10px; ' +
+          'font-weight:bold">' +
+          '<span id="final_span_' + i + '"></span>' +
+          '<span id="interim_span_' + i + '" style="color:blue"></span>' +
+          '</div>';
+    }
+    results.innerHTML = results_html;
+    reco.start();
+  } else {
+    button.hidden = true;
+    reco.stop();
+  }
+}
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/speech-api/SpeechRecognition-stop-manual.https.html b/testing/web-platform/tests/speech-api/SpeechRecognition-stop-manual.https.html
new file mode 100644
index 000000000000..e4741b7fc6f4
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechRecognition-stop-manual.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>SpeechRecognition.stop</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="webspeech.js"></script>
+  </head>
+  <body>
+    <p><b>Instructions:</b> Do NOT speak. Run test in silence.
+      This test may fail if too much noise.</p>
+    <div id="log"></div>
+    <div id="notes"></div>
+    <script>
+var audioTest = new CycleTest('onaudio');
+reco.onaudiostart = audioTest.startEvent();
+reco.onaudioend = audioTest.endEvent();
+
+reco.onsoundstart = neverFireEvent('onsoundstart');
+reco.onsoundend = neverFireEvent('onsoundend');
+reco.onspeechstart = neverFireEvent('onspeechstart');
+reco.onspeechend = neverFireEvent('onsspeechend');
+reco.onresult = neverFireEvent('onresult');
+reco.onerror = neverFireEvent('onerror');
+
+var nomatchTest = new CountTest('onnomatch', 0, 1);
+reco.onnomatch = nomatchTest.test().step_func(function(event) {
+  nomatchTest.count(1);
+});
+
+reco.start();
+
+function beginTest() {
+  setTimeout(function() { reco.stop(); }, DELAY);
+}
+    </script>
+  </body>
+</html>
+
diff --git a/testing/web-platform/tests/speech-api/SpeechSynthesisUtterance-basics.https.html b/testing/web-platform/tests/speech-api/SpeechSynthesisUtterance-basics.https.html
new file mode 100644
index 000000000000..9a90f086ac45
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/SpeechSynthesisUtterance-basics.https.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>SpeechSynthesisUtterance basics</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+const DEFAULTS = {
+  text: '',
+  lang: '',
+  voice: null,
+  volume: 1,
+  rate: 1,
+  pitch: 1,
+};
+
+for (const prop in DEFAULTS) {
+  test(function() {
+    const utt = new SpeechSynthesisUtterance();
+    assert_equals(utt[prop], DEFAULTS[prop], prop);
+  }, `new SpeechSynthesisUtterance() default ${prop}`);
+}
+
+test(function() {
+  const utt = new SpeechSynthesisUtterance("hello");
+  assert_equals(utt.text, 'hello', 'text');
+  // check that the other properties retain their defaults
+  for (const prop in DEFAULTS) {
+    if (prop != 'text') {
+      assert_equals(utt[prop], DEFAULTS[prop], prop);
+    }
+  }
+}, 'new SpeechSynthesisUtterance("hello") text and defaults');
+
+test(function() {
+  const utt = new SpeechSynthesisUtterance();
+  utt.text = 'word';
+  assert_equals(utt.text, 'word');
+}, 'SpeechSynthesisUtterance text setter');
+
+// TODO: setters https://github.com/w3c/speech-api/issues/29
+</script>
diff --git a/testing/web-platform/tests/speech-api/historical.html b/testing/web-platform/tests/speech-api/historical.html
index 4ca574b1717a..2fb0ccd4b905 100644
--- a/testing/web-platform/tests/speech-api/historical.html
+++ b/testing/web-platform/tests/speech-api/historical.html
@@ -5,6 +5,7 @@
 <div id="log"></div>
 <script>
 [
+  "SpeechRecognitionError",
   "webkitSpeechGrammar",
   "webkitSpeechGrammarList",
   "webkitSpeechRecognition",
diff --git a/testing/web-platform/tests/speech-api/webspeech.js b/testing/web-platform/tests/speech-api/webspeech.js
new file mode 100644
index 000000000000..93830e648b2e
--- /dev/null
+++ b/testing/web-platform/tests/speech-api/webspeech.js
@@ -0,0 +1,112 @@
+var DELAY = 500;  // In milliseconds.
+var TIMEOUT = 2000;  // In milliseconds.  Used for most tests.
+if (typeof(TIMEOUT_OVERRIDE) != 'undefined') {
+  TIMEOUT = TIMEOUT_OVERRIDE;
+}
+GLOBAL_TIMEOUT = TIMEOUT + 2000;  // In milliseconds.
+setup({timeout: GLOBAL_TIMEOUT});
+var onstarted = false;
+var neverFireTest = async_test('Events that should not fire',
+                               {timeout: TIMEOUT});
+var onstartTest = async_test('onstart', {timeout: TIMEOUT});
+var reco = new SpeechRecognition();
+
+reco.onstart = onstartTest.step_func(function(event) {
+  assert_false(onstarted, 'onstart should only fire once.');
+  onstarted = true;
+  onstartTest.done();
+  beginTest();
+});
+
+reco.onend = function() {
+  neverFireTest.done();
+  for (var i = 0; i < doneOnEndTestList.length; i++) {
+    doneOnEndTestList[i].done();
+  }
+};
+
+function neverFireEvent(name) {
+  return neverFireTest.step_func(function(event) {
+    assert_unreached(name + ' should not fire.');
+  });
+}
+
+var doneOnEndTestList = [];  // List of all test objects to call done at onend.
+
+// Tally calls to count() and test against min/max when test ends.
+// A max value of 0 indicates no maximum.
+function CountTest(name, min, max) {
+  doneOnEndTestList.push(this);
+  this.name = name;
+  this.min = min;
+  this.max = max;
+  this.sum = 0;
+  this.asyncTest = async_test(name, {timeout: TIMEOUT});
+
+  this.count = function(increment) { this.sum += increment; };
+
+  this.test = function() { return this.asyncTest; };
+
+  this.done = function() {
+    var cTest = this;
+    this.asyncTest.step(function() {
+      notes.innerHTML += cTest.name + ' occurred ' + cTest.sum + ' times.<br>';
+      if (cTest.min == cTest.max) {
+        assert_true(cTest.sum == cTest.min, cTest.name + ' occurred ' +
+          cTest.sum + ' times and should have occurred ' +
+          cTest.min + ' times.');
+      } else {
+        assert_true(cTest.sum >= cTest.min, cTest.name + ' occurred ' +
+            cTest.sum + ' times and should have occurred at least ' +
+            cTest.min + ' times.');
+        assert_true(cTest.max == 0 || cTest.sum <= cTest.max, cTest.name +
+            ' occurred ' + cTest.sum +
+            ' times and should have occurred at most ' + cTest.max + ' times.');
+      }
+      if (cTest.whenDone) {
+        cTest.whenDone();
+      }
+    });
+    this.asyncTest.done();
+  };
+}
+
+// Test for proper cycling of startEvent followed by endEvent.
+function CycleTest(name) {
+  doneOnEndTestList.push(this);
+  this.name = name;
+  this.count = 0;  // Counts number of start / end cycles.
+  this.started = false; // Tracks whether last event was a start or end event.
+  this.test = async_test(name + ' start/stop', {timeout: TIMEOUT});
+
+  this.startEvent = function() {
+    var cycle = this;
+    return this.test.step_func(function(event) {
+      assert_true(onstarted, cycle.name + 'start fired before onstart.');
+      assert_false(cycle.started, cycle.name + 'start fired twice without ' +
+                   cycle.name + 'stop.');
+      cycle.started = true;
+    });
+  };
+
+  this.endEvent = function() {
+    var cycle = this;
+    return this.test.step_func(function(event) {
+      assert_true(cycle.started, cycle.name + 'end fired before ' +
+                  cycle.name + 'start.');
+      cycle.started = false;
+      cycle.count += 1;
+    });
+  };
+
+  this.done = function() {
+    var cycle = this;
+    this.test.step(function() {
+      assert_false(cycle.started, cycle.name + 'start fired but not ' +
+                   cycle.name + 'end.');
+      assert_true(cycle.count > 0, cycle.name + 'start never fired.');
+      notes.innerHTML += cycle.name + ' cycled ' + cycle.count + ' times.<br>';
+    });
+    this.test.done();
+  };
+}
diff --git a/testing/web-platform/tests/tools/ci/ci_taskcluster.sh b/testing/web-platform/tests/tools/ci/ci_taskcluster.sh
index 8d00a5c53781..118243881a93 100755
--- a/testing/web-platform/tests/tools/ci/ci_taskcluster.sh
+++ b/testing/web-platform/tests/tools/ci/ci_taskcluster.sh
@@ -7,3 +7,4 @@ if [ $1 == "firefox" ]; then
 elif [ $1 == "chrome" ]; then
     ./wpt run chrome --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y  --no-pause --no-restart-on-unexpected --install-fonts --no-fail-on-unexpected
 fi
+gzip ../artifacts/wpt_report.json
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_chrome.txt b/testing/web-platform/tests/tools/wptrunner/requirements_chrome.txt
index 5a1d26b8b9bc..22a07532657d 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_chrome.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_chrome.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_chrome_android.txt b/testing/web-platform/tests/tools/wptrunner/requirements_chrome_android.txt
index 5a1d26b8b9bc..22a07532657d 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_chrome_android.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_chrome_android.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_edge.txt b/testing/web-platform/tests/tools/wptrunner/requirements_edge.txt
index 5a1d26b8b9bc..22a07532657d 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_edge.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_edge.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_ie.txt b/testing/web-platform/tests/tools/wptrunner/requirements_ie.txt
index 5a1d26b8b9bc..22a07532657d 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_ie.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_ie.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_opera.txt b/testing/web-platform/tests/tools/wptrunner/requirements_opera.txt
index 5a1d26b8b9bc..22a07532657d 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_opera.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_opera.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
diff --git a/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt b/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt
index 5a86904a5caa..77a74222433a 100644
--- a/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt
+++ b/testing/web-platform/tests/tools/wptrunner/requirements_sauce.txt
@@ -1,3 +1,3 @@
 mozprocess == 0.26
-selenium==3.13.0
+selenium==3.14.0
 requests==2.19.1
diff --git a/testing/web-platform/tests/uievents/auxclick/auxclick_event-manual.html b/testing/web-platform/tests/uievents/click/auxclick_event-manual.html
similarity index 100%
rename from testing/web-platform/tests/uievents/auxclick/auxclick_event-manual.html
rename to testing/web-platform/tests/uievents/click/auxclick_event-manual.html
diff --git a/testing/web-platform/tests/uievents/click/click_event_target-manual.html b/testing/web-platform/tests/uievents/click/click_event_target-manual.html
new file mode 100644
index 000000000000..1e5670262b5c
--- /dev/null
+++ b/testing/web-platform/tests/uievents/click/click_event_target-manual.html
@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Click targets the nearest common ancestor</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <style>
+    div {
+      padding: 10px;
+      margin: 5px;
+    }
+    </style>
+  </head>
+  <body id='body'>
+    <h1>Click targeting when targets of down and up are different</h1>
+
+    <ul>
+      <li>Press down the primary button on red div and move to blue box and release.</li>
+      <li>Press down the primary button on button b1 and move to button b2 and release.</li>
+      <li>Press down the primary button on link 1 and move to link 2 and release.</li>
+      <li>Click done.</li>
+    </ul>
+
+    <div id="div_container" style="background: green">
+      <div id="red_div" style="background: red">
+      </div>
+      <div id="blue_div" style="background: blue">
+      </div>
+    </div>
+
+    <div id="button_container" style="background: green">
+      <button id="button1"> b1
+      </button>
+      <button id="button2"> b2
+      </button>
+    </div>
+
+    <div id="link_container" style="background: green">
+      <a id="link1" href="#">link1
+      </a>
+      <br/>
+      <a id="link2" href="#">link2
+      </a>
+    </div>
+
+    <button id="done">Done</button>
+    <script>
+    var test_click_target = async_test("Click targets the nearest common ancestor");
+
+    // Prevent drag to avoid interfering with the click.
+    document.addEventListener('dragstart', (e) => e.preventDefault());
+
+    var events = [];
+    var nodes = ['div_container', 'red_div', 'blue_div', 'button_container', 'button1', 'button2', 'link_container', 'link1', 'link2', 'body'];
+
+    for (var i = 0; i < nodes.length; i++) {
+     ['mousedown', 'mouseup', 'click'].forEach((eventName) => {
+       document.getElementById(nodes[i]).addEventListener(eventName, (e) => {
+         if (e.eventPhase == Event.AT_TARGET)
+           events.push(e.type + '@' + e.target.id);
+        });
+      });
+    }
+    document.getElementById('done').addEventListener('click', () => {
+      test_click_target.step(() => {
+        assert_equals (events.join(','),
+        "mousedown@red_div,mouseup@blue_div,click@div_container,mousedown@button1,mouseup@button2,click@button_container,mousedown@link1,mouseup@link2,click@link_container",
+        "Click should be sent to the nearest common ancestor");
+      });
+      test_click_target.done();
+    });
+    </script>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/url/README.md b/testing/web-platform/tests/url/README.md
index 667951d680fc..823a8eec0222 100644
--- a/testing/web-platform/tests/url/README.md
+++ b/testing/web-platform/tests/url/README.md
@@ -44,5 +44,10 @@ expected to fail.
 Tests in `/encoding` and `/html/infrastructure/urls/resolving-urls/query-encoding/` cover the
 encoding argument to the URL parser.
 
+## Specification
+
+The tests in this directory assert conformance with [the URL Standard][URL].
+
 [parsing]: https://url.spec.whatwg.org/#concept-basic-url-parser
 [API]: https://url.spec.whatwg.org/#api
+[URL]: https://url.spec.whatwg.org/
diff --git a/testing/web-platform/tests/url/url-constructor.html b/testing/web-platform/tests/url/url-constructor.html
index 6d7c2d64dbd8..cb4c0db3571d 100644
--- a/testing/web-platform/tests/url/url-constructor.html
+++ b/testing/web-platform/tests/url/url-constructor.html
@@ -40,73 +40,5 @@ function runURLTests(urltests) {
   }
 }
 
-function runURLSearchParamTests() {
-  test(function() {
-    var url = bURL('http://example.org/?a=b')
-    assert_true("searchParams" in url)
-    var searchParams = url.searchParams
-    assert_true(url.searchParams === searchParams, 'Object identity should hold.')
-  }, 'URL.searchParams getter')
-
-  test(function() {
-    var url = bURL('http://example.org/?a=b')
-    assert_true("searchParams" in url)
-    var searchParams = url.searchParams
-    assert_equals(searchParams.toString(), 'a=b')
-
-    searchParams.set('a', 'b')
-    assert_equals(url.searchParams.toString(), 'a=b')
-    assert_equals(url.search, '?a=b')
-    url.search = ''
-    assert_equals(url.searchParams.toString(), '')
-    assert_equals(url.search, '')
-    assert_equals(searchParams.toString(), '')
-  }, 'URL.searchParams updating, clearing')
-
-  test(function() {
-    'use strict'
-    var urlString = 'http://example.org'
-    var url = bURL(urlString)
-    assert_throws(TypeError(), function() { url.searchParams = new URLSearchParams(urlString) })
-  }, 'URL.searchParams setter, invalid values')
-
-  test(function() {
-    var url = bURL('http://example.org/file?a=b&c=d')
-    assert_true("searchParams" in url)
-    var searchParams = url.searchParams
-    assert_equals(url.search, '?a=b&c=d')
-    assert_equals(searchParams.toString(), 'a=b&c=d')
-
-    // Test that setting 'search' propagates to the URL object's query object.
-    url.search = 'e=f&g=h'
-    assert_equals(url.search, '?e=f&g=h')
-    assert_equals(searchParams.toString(), 'e=f&g=h')
-
-    // ..and same but with a leading '?'.
-    url.search = '?e=f&g=h'
-    assert_equals(url.search, '?e=f&g=h')
-    assert_equals(searchParams.toString(), 'e=f&g=h')
-
-    // And in the other direction, altering searchParams propagates
-    // back to 'search'.
-    searchParams.append('i', ' j ')
-    assert_equals(url.search, '?e=f&g=h&i=+j+')
-    assert_equals(url.searchParams.toString(), 'e=f&g=h&i=+j+')
-    assert_equals(searchParams.get('i'), ' j ')
-
-    searchParams.set('e', 'updated')
-    assert_equals(url.search, '?e=updated&g=h&i=+j+')
-    assert_equals(searchParams.get('e'), 'updated')
-
-    var url2 = bURL('http://example.org/file??a=b&c=d')
-    assert_equals(url2.search, '??a=b&c=d')
-    assert_equals(url2.searchParams.toString(), '%3Fa=b&c=d')
-
-    url2.href = 'http://example.org/file??a=b'
-    assert_equals(url2.search, '??a=b')
-    assert_equals(url2.searchParams.toString(), '%3Fa=b')
-  }, 'URL.searchParams and URL.search setters, update propagation')
-}
-runURLSearchParamTests()
 promise_test(() => fetch("resources/urltestdata.json").then(res => res.json()).then(runURLTests), "Loading data…");
 </script>
diff --git a/testing/web-platform/tests/url/url-searchparams.any.js b/testing/web-platform/tests/url/url-searchparams.any.js
new file mode 100644
index 000000000000..c55ae58d3b1e
--- /dev/null
+++ b/testing/web-platform/tests/url/url-searchparams.any.js
@@ -0,0 +1,72 @@
+function bURL(url, base) {
+  return new URL(url, base || "about:blank")
+}
+
+function runURLSearchParamTests() {
+  test(function() {
+    var url = bURL('http://example.org/?a=b')
+    assert_true("searchParams" in url)
+    var searchParams = url.searchParams
+    assert_true(url.searchParams === searchParams, 'Object identity should hold.')
+  }, 'URL.searchParams getter')
+
+  test(function() {
+    var url = bURL('http://example.org/?a=b')
+    assert_true("searchParams" in url)
+    var searchParams = url.searchParams
+    assert_equals(searchParams.toString(), 'a=b')
+
+    searchParams.set('a', 'b')
+    assert_equals(url.searchParams.toString(), 'a=b')
+    assert_equals(url.search, '?a=b')
+    url.search = ''
+    assert_equals(url.searchParams.toString(), '')
+    assert_equals(url.search, '')
+    assert_equals(searchParams.toString(), '')
+  }, 'URL.searchParams updating, clearing')
+
+  test(function() {
+    'use strict'
+    var urlString = 'http://example.org'
+    var url = bURL(urlString)
+    assert_throws(TypeError(), function() { url.searchParams = new URLSearchParams(urlString) })
+  }, 'URL.searchParams setter, invalid values')
+
+  test(function() {
+    var url = bURL('http://example.org/file?a=b&c=d')
+    assert_true("searchParams" in url)
+    var searchParams = url.searchParams
+    assert_equals(url.search, '?a=b&c=d')
+    assert_equals(searchParams.toString(), 'a=b&c=d')
+
+    // Test that setting 'search' propagates to the URL object's query object.
+    url.search = 'e=f&g=h'
+    assert_equals(url.search, '?e=f&g=h')
+    assert_equals(searchParams.toString(), 'e=f&g=h')
+
+    // ..and same but with a leading '?'.
+    url.search = '?e=f&g=h'
+    assert_equals(url.search, '?e=f&g=h')
+    assert_equals(searchParams.toString(), 'e=f&g=h')
+
+    // And in the other direction, altering searchParams propagates
+    // back to 'search'.
+    searchParams.append('i', ' j ')
+    assert_equals(url.search, '?e=f&g=h&i=+j+')
+    assert_equals(url.searchParams.toString(), 'e=f&g=h&i=+j+')
+    assert_equals(searchParams.get('i'), ' j ')
+
+    searchParams.set('e', 'updated')
+    assert_equals(url.search, '?e=updated&g=h&i=+j+')
+    assert_equals(searchParams.get('e'), 'updated')
+
+    var url2 = bURL('http://example.org/file??a=b&c=d')
+    assert_equals(url2.search, '??a=b&c=d')
+    assert_equals(url2.searchParams.toString(), '%3Fa=b&c=d')
+
+    url2.href = 'http://example.org/file??a=b'
+    assert_equals(url2.search, '??a=b')
+    assert_equals(url2.searchParams.toString(), '%3Fa=b')
+  }, 'URL.searchParams and URL.search setters, update propagation')
+}
+runURLSearchParamTests()
diff --git a/testing/web-platform/tests/url/url-tojson.any.js b/testing/web-platform/tests/url/url-tojson.any.js
new file mode 100644
index 000000000000..65165f96c572
--- /dev/null
+++ b/testing/web-platform/tests/url/url-tojson.any.js
@@ -0,0 +1,4 @@
+test(() => {
+  const a = new URL("https://example.com/")
+  assert_equals(JSON.stringify(a), "\"https://example.com/\"")
+})
diff --git a/testing/web-platform/tests/url/url-tojson.html b/testing/web-platform/tests/url/url-tojson.html
deleted file mode 100644
index 3e8798c08b55..000000000000
--- a/testing/web-platform/tests/url/url-tojson.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>URL's toJSON()</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
-test(() => {
-  const a = new URL("https://example.com/")
-  assert_equals(JSON.stringify(a), "\"https://example.com/\"")
-})
-</script>
diff --git a/testing/web-platform/tests/url/urlencoded-parser.html b/testing/web-platform/tests/url/urlencoded-parser.any.js
similarity index 91%
rename from testing/web-platform/tests/url/urlencoded-parser.html
rename to testing/web-platform/tests/url/urlencoded-parser.any.js
index 40a54f1e3eca..65e894b94c26 100644
--- a/testing/web-platform/tests/url/urlencoded-parser.html
+++ b/testing/web-platform/tests/url/urlencoded-parser.any.js
@@ -1,10 +1,3 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>application/x-www-form-urlencoded parser test</title>
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<div id=log></div>
-<script>
 [
   { "input": "test", "output": [["test", ""]] },
   { "input": "\uFEFFtest=\uFEFF", "output": [["\uFEFFtest", "\uFEFF"]] },
@@ -67,5 +60,4 @@
       }
     })
   }, "response.formData() with input: " + val.input)
-})
-</script>
+});
diff --git a/testing/web-platform/tests/url/urlsearchparams-append.html b/testing/web-platform/tests/url/urlsearchparams-append.any.js
similarity index 84%
rename from testing/web-platform/tests/url/urlsearchparams-append.html
rename to testing/web-platform/tests/url/urlsearchparams-append.any.js
index ca367e6f6182..5a7376144d06 100644
--- a/testing/web-platform/tests/url/urlsearchparams-append.html
+++ b/testing/web-platform/tests/url/urlsearchparams-append.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-append">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams();
     params.append('a', 'b');
@@ -45,6 +37,3 @@ test(function() {
     params.append('first', 10);
     assert_equals(params.get('first'), '1', 'Search params object has name "first" with value "1"');
 }, 'Append multiple');
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-constructor.html b/testing/web-platform/tests/url/urlsearchparams-constructor.any.js
similarity index 96%
rename from testing/web-platform/tests/url/urlsearchparams-constructor.html
rename to testing/web-platform/tests/url/urlsearchparams-constructor.any.js
index 0637a386ec76..5412fc8b7517 100644
--- a/testing/web-platform/tests/url/urlsearchparams-constructor.html
+++ b/testing/web-platform/tests/url/urlsearchparams-constructor.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#urlsearchparams">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams();
     assert_equals(params + '', '');
@@ -182,6 +174,3 @@ test(() => {
   let params2 = new URLSearchParams(params)
   assert_equals(params2.get("a"), "b")
 }, "Custom [Symbol.iterator]")
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-delete.html b/testing/web-platform/tests/url/urlsearchparams-delete.any.js
similarity index 87%
rename from testing/web-platform/tests/url/urlsearchparams-delete.html
rename to testing/web-platform/tests/url/urlsearchparams-delete.any.js
index d4bc0a6d26a6..1aa9b313736d 100644
--- a/testing/web-platform/tests/url/urlsearchparams-delete.html
+++ b/testing/web-platform/tests/url/urlsearchparams-delete.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-delete">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     params.delete('a');
@@ -51,6 +43,3 @@ test(function() {
     assert_equals(url.href, 'http://example.com/', 'url.href does not have ?');
     assert_equals(url.search, '', 'url.search does not have ?');
 }, 'Removing non-existent param removes ? from URL');
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-foreach.html b/testing/web-platform/tests/url/urlsearchparams-foreach.any.js
similarity index 90%
rename from testing/web-platform/tests/url/urlsearchparams-foreach.html
rename to testing/web-platform/tests/url/urlsearchparams-foreach.any.js
index 29c0ee802fde..7969a0cb11a2 100644
--- a/testing/web-platform/tests/url/urlsearchparams-foreach.html
+++ b/testing/web-platform/tests/url/urlsearchparams-foreach.any.js
@@ -1,9 +1,3 @@
-<!doctype html>
-<meta charset="utf-8">
-<link rel="help" href="https://url.spec.whatwg.org/#dom-urlsearchparams-has">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=1&b=2&c=3');
     var keys = [];
@@ -80,4 +74,3 @@ test(function() {
     assert_array_equals(seen, ["param0", "param2"], "param1 should not have been seen by the loop");
     assert_equals(String(searchParams), "param1=1", "param1 should remain");
 }, "delete every param seen during iteration");
-</script>
diff --git a/testing/web-platform/tests/url/urlsearchparams-get.html b/testing/web-platform/tests/url/urlsearchparams-get.any.js
similarity index 79%
rename from testing/web-platform/tests/url/urlsearchparams-get.html
rename to testing/web-platform/tests/url/urlsearchparams-get.any.js
index 1d27727ce881..a2610fc933a7 100644
--- a/testing/web-platform/tests/url/urlsearchparams-get.html
+++ b/testing/web-platform/tests/url/urlsearchparams-get.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-get">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_equals(params.get('a'), 'b');
@@ -27,6 +19,3 @@ test(function() {
     assert_equals(params.get('third'), '', 'Search params object has name "third" with the empty value.');
     assert_equals(params.get('fourth'), null, 'Search params object has no "fourth" name and value.');
 }, 'More get() basics');
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-getall.html b/testing/web-platform/tests/url/urlsearchparams-getall.any.js
similarity index 82%
rename from testing/web-platform/tests/url/urlsearchparams-getall.html
rename to testing/web-platform/tests/url/urlsearchparams-getall.any.js
index db6c7e301b21..5d1a35352acf 100644
--- a/testing/web-platform/tests/url/urlsearchparams-getall.html
+++ b/testing/web-platform/tests/url/urlsearchparams-getall.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-getAll">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_array_equals(params.getAll('a'), ['b']);
@@ -31,6 +23,3 @@ test(function() {
     assert_true(matches && matches.length == 1, 'Search params object has values for name "a"');
     assert_array_equals(matches, ['one'], 'Search params object has expected name "a" values');
 }, 'getAll() multiples');
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-has.html b/testing/web-platform/tests/url/urlsearchparams-has.any.js
similarity index 78%
rename from testing/web-platform/tests/url/urlsearchparams-has.html
rename to testing/web-platform/tests/url/urlsearchparams-has.any.js
index ad045f73c40b..673dce77dc44 100644
--- a/testing/web-platform/tests/url/urlsearchparams-has.html
+++ b/testing/web-platform/tests/url/urlsearchparams-has.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-has">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     assert_true(params.has('a'));
@@ -30,6 +22,3 @@ test(function() {
     params.delete('first');
     assert_false(params.has('first'), 'Search params object has no name "first"');
 }, 'has() following delete()');
-</script>
-</head>
-</html>
diff --git a/testing/web-platform/tests/url/urlsearchparams-set.html b/testing/web-platform/tests/url/urlsearchparams-set.any.js
similarity index 78%
rename from testing/web-platform/tests/url/urlsearchparams-set.html
rename to testing/web-platform/tests/url/urlsearchparams-set.any.js
index 61578b2c18e6..eb24cac87b6d 100644
--- a/testing/web-platform/tests/url/urlsearchparams-set.html
+++ b/testing/web-platform/tests/url/urlsearchparams-set.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-set">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams('a=b&c=d');
     params.set('a', 'B');
@@ -28,7 +20,3 @@ test(function() {
     assert_true(params.has('a'), 'Search params object has name "a"');
     assert_equals(params.get('a'), '4', 'Search params object has name "a" with value "4"');
 }, 'URLSearchParams.set');
-</script>
-</head>
-</html>
-
diff --git a/testing/web-platform/tests/url/urlsearchparams-sort.html b/testing/web-platform/tests/url/urlsearchparams-sort.any.js
similarity index 90%
rename from testing/web-platform/tests/url/urlsearchparams-sort.html
rename to testing/web-platform/tests/url/urlsearchparams-sort.any.js
index 22a7be2cb270..4fd8cef69239 100644
--- a/testing/web-platform/tests/url/urlsearchparams-sort.html
+++ b/testing/web-platform/tests/url/urlsearchparams-sort.any.js
@@ -1,9 +1,3 @@
-<!doctype html>
-<meta charset="utf8">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<div id=log></div>
-<script>
 [
   {
     "input": "z=b&a=b&z=a&a=a",
@@ -66,4 +60,3 @@ test(function() {
   assert_equals(url.href, "http://example.com/")
   assert_equals(url.search, "")
 }, "Sorting non-existent params removes ? from URL")
-</script>
diff --git a/testing/web-platform/tests/url/urlsearchparams-stringifier.html b/testing/web-platform/tests/url/urlsearchparams-stringifier.any.js
similarity index 93%
rename from testing/web-platform/tests/url/urlsearchparams-stringifier.html
rename to testing/web-platform/tests/url/urlsearchparams-stringifier.any.js
index 5e885b446a3e..ef95c1434c79 100644
--- a/testing/web-platform/tests/url/urlsearchparams-stringifier.html
+++ b/testing/web-platform/tests/url/urlsearchparams-stringifier.any.js
@@ -1,11 +1,3 @@
-<!doctype html>
-<html>
-<head>
-<meta charset="utf8">
-<link rel="help" href="http://url.spec.whatwg.org/#dom-urlsearchparams-set">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
 test(function() {
     var params = new URLSearchParams();
     params.append('a', 'b c');
@@ -129,8 +121,3 @@ test(() => {
     assert_equals(url.toString(), 'http://www.example.com/?a=b%2Cc&x=y');
     assert_equals(params.toString(), 'a=b%2Cc&x=y');
 }, 'URLSearchParams connected to URL');
-
-</script>
-</head>
-</html>
-
diff --git a/testing/web-platform/tests/wasm/wasm_idb_worker.js b/testing/web-platform/tests/wasm/wasm_idb_worker.js
deleted file mode 100644
index 9d36d748ded8..000000000000
--- a/testing/web-platform/tests/wasm/wasm_idb_worker.js
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-importScripts('/resources/testharness.js');
-importScripts('resources/load_wasm.js');
-importScripts('wasm_indexeddb_test.js');
-
-onmessage = function(e) {
-  if (e.data.command === "load") {
-    loadFromIndexedDB(e.data.db_name)
-      .then(res => {
-        if (res === 2) postMessage("ok");
-        else postMessage("error");
-      },
-            error => postMessage(error));
-  } else if (e.data.command === "save") {
-    createAndSaveToIndexedDB(e.data.db_name)
-      .then((m) => {
-        postMessage("ok");
-      },
-            () => postMessage("error"));
-  } else {
-    postMessage("unknown message: " + e.data);
-  }
-}
diff --git a/testing/web-platform/tests/wasm/wasm_indexeddb_test.https.html b/testing/web-platform/tests/wasm/wasm_indexeddb_test.https.html
deleted file mode 100644
index 320f046426d9..000000000000
--- a/testing/web-platform/tests/wasm/wasm_indexeddb_test.https.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/common/get-host-info.sub.js"></script>
-<script src="resources/load_wasm.js"></script>
-<script src="wasm_indexeddb_test.js"></script>
-</head>
-<body>
-<script>
-  promise_test(TestIndexedDBLoadStoreSecure, "serialize/deserialize to IndexedDB ");
-  promise_test(SaveToIDBAndLoadInWorker, "Save to IDB and load in worker");
-  promise_test(SaveToIDBInWorkerAndLoadInMain, "Save in worker to IDB and load in window");
-</script>
-</body>
-</html>
diff --git a/testing/web-platform/tests/wasm/wasm_indexeddb_test.js b/testing/web-platform/tests/wasm/wasm_indexeddb_test.js
deleted file mode 100644
index a5a582cd2930..000000000000
--- a/testing/web-platform/tests/wasm/wasm_indexeddb_test.js
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-var db_name = "db_wasm_test";
-var obj_store = 'store';
-var module_key = 'my_module';
-
-function createAndSaveToIndexedDB(db_name) {
-  return createWasmModule()
-    .then(mod => new Promise((resolve, reject) => {
-      var delete_request = indexedDB.deleteDatabase(db_name);
-      delete_request.onsuccess = function() {
-        var open_request = indexedDB.open(db_name);
-        open_request.onupgradeneeded = function() {
-          var db = open_request.result;
-          db.createObjectStore(obj_store);
-        };
-        open_request.onsuccess = function() {
-          var db = open_request.result;
-          var tx = db.transaction(obj_store, 'readwrite');
-          var store = tx.objectStore(obj_store);
-          try {
-            store.put(mod, module_key);
-          } catch(e) {
-            db.close();
-            reject(e);
-            return;
-          }
-          tx.oncomplete = function() {
-            db.close();
-            resolve();
-            return;
-          };
-        };
-      };
-    }));
-}
-
-function loadFromIndexedDB(db_name) {
-  var open_request = indexedDB.open(db_name);
-
-  return new Promise((resolve, reject) => {
-    open_request.onsuccess = function() {
-      var db = open_request.result;
-      var tx = db.transaction(obj_store);
-      var store = tx.objectStore(obj_store);
-      var get_request = store.get(module_key);
-      get_request.onsuccess = function() {
-        var mod = get_request.result;
-        db.close();
-        assert_true(mod instanceof WebAssembly.Module);
-        try {
-          var instance = new WebAssembly.Instance(mod);
-          resolve(instance.exports.increment(1));
-        } catch(e) {
-          reject(e);
-        }
-      };
-      get_request.onerror = reject;
-    };
-  });
-}
-
-function TestIndexedDBLoadStoreSecure() {
-  return createAndSaveToIndexedDB(db_name)
-    .then(() => loadFromIndexedDB(db_name))
-    .then(res => assert_equals(res, 2),
-          error => assert_unreached(error));
-}
-
-function TestIndexedDBLoadStoreInsecure() {
-  return createAndSaveToIndexedDB(db_name)
-    .then(assert_unreached,
-          error => {
-            assert_true(error instanceof DOMException);
-            assert_equals(error.name, 'DataCloneError');
-          });
-}
-
-function SaveToIDBAndLoadInWorker() {
-  return createAndSaveToIndexedDB(db_name)
-  .then(() => {
-    var worker = new Worker("wasm_idb_worker.js");
-    return new Promise((resolve, reject) => {
-      worker.onmessage = function (event) {
-        if (typeof (event.data) == "string") {
-          resolve(event.data);
-          worker.terminate();
-          worker = undefined;
-        }
-      };
-      worker.postMessage({command: "load", db_name: db_name});
-    })
-  })
-.then(data => assert_equals(data, "ok"),
-    error => assert_unreached(error));
-}
-
-function SaveToIDBInWorkerAndLoadInMain() {
-  var worker = new Worker("wasm_idb_worker.js");
-  var ret = new Promise((resolve, reject) => {
-    worker.onmessage = function (event) {
-      if (typeof (event.data) == "string") {
-        resolve(event.data);
-        worker.terminate();
-        worker = undefined;
-      }
-    };
-  })
-  worker.postMessage({command: "save", db_name: db_name});
-  return ret
-    .then(data => assert_equals(data, "ok"),
-          error => assert_unreached(error))
-    .then(() => loadFromIndexedDB(db_name))
-    .then(res => assert_equals(res, 2),
-          assert_unreached);
-}
diff --git a/testing/web-platform/tests/webmidi/META.yml b/testing/web-platform/tests/webmidi/META.yml
new file mode 100644
index 000000000000..f39d4122887b
--- /dev/null
+++ b/testing/web-platform/tests/webmidi/META.yml
@@ -0,0 +1,3 @@
+spec: https://webaudio.github.io/web-midi-api/
+suggested_reviewers:
+  - cwilso
diff --git a/testing/web-platform/tests/webmidi/idlharness.window.js b/testing/web-platform/tests/webmidi/idlharness.window.js
new file mode 100644
index 000000000000..5fb88073b169
--- /dev/null
+++ b/testing/web-platform/tests/webmidi/idlharness.window.js
@@ -0,0 +1,31 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+// https://webaudio.github.io/web-midi-api/
+
+'use strict';
+
+idl_test(
+  ['webmidi'],
+  ['html', 'dom'],
+  async idl_array => {
+    idl_array.add_objects({
+      MIDIAccess: ['access'],
+      MIDIInputMap: ['inputs'],
+      MIDIOutputMap: ['outputs'],
+      MIDIConnectionEvent: ['new MIDIConnectionEvent("type")'],
+    })
+
+    self.access = await navigator.requestMIDIAccess();
+    self.inputs = access.inputs;
+    if (inputs.size) {
+      self.input = Array.from(access.inputs.values())[0];
+      idl_array.add_objects({ MIDIInput: ['input'] });
+    }
+    self.outputs = access.outputs;
+    if (outputs.size) {
+      self.output = Array.from(access.outputs.values())[0];
+      idl_array.add_objects({ MIDIOutput: ['output'] });
+    }
+  }
+);
diff --git a/testing/web-platform/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html b/testing/web-platform/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html
index 6b65a12f07f8..1d99aa29d85a 100644
--- a/testing/web-platform/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html
+++ b/testing/web-platform/tests/webrtc/RTCConfiguration-rtcpMuxPolicy.html
@@ -140,4 +140,56 @@
       Tested    2
       Total     2
    */
+  const FINGERPRINT_SHA256 = '00:00:00:00:00:00:00:00:00:00:00:00:00' +
+      ':00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00';
+  const ICEUFRAG = 'someufrag';
+  const ICEPWD = 'somelongpwdwithenoughrandomness';
+
+  promise_test(async t => {
+    // audio-only SDP offer without BUNDLE and rtcp-mux.
+    const sdp = 'v=0\r\n' +
+        'o=- 166855176514521964 2 IN IP4 127.0.0.1\r\n' +
+        's=-\r\n' +
+        't=0 0\r\n' +
+        'm=audio 9 UDP/TLS/RTP/SAVPF 111\r\n' +
+        'c=IN IP4 0.0.0.0\r\n' +
+        'a=rtcp:9 IN IP4 0.0.0.0\r\n' +
+        'a=ice-ufrag:' + ICEUFRAG + '\r\n' +
+        'a=ice-pwd:' + ICEPWD + '\r\n' +
+        'a=fingerprint:sha-256 ' + FINGERPRINT_SHA256 + '\r\n' +
+        'a=setup:actpass\r\n' +
+        'a=mid:audio1\r\n' +
+        'a=sendonly\r\n' +
+        'a=rtcp-rsize\r\n' +
+        'a=rtpmap:111 opus/48000/2\r\n';
+    const pc = new RTCPeerConnection({rtcpMuxPolicy: 'require'});
+    t.add_cleanup(() => pc.close());
+
+    return promise_rejects(t, 'InvalidAccessError', pc.setRemoteDescription({type: 'offer', sdp}));
+  }, 'setRemoteDescription throws InvalidAccessError when called with an offer without rtcp-mux and rtcpMuxPolicy is set to require');
+
+  promise_test(async t => {
+    // audio-only SDP answer without BUNDLE and rtcp-mux.
+    // Also omitting a=mid in order to avoid parsing it from the offer as this needs to match.
+    const sdp = 'v=0\r\n' +
+        'o=- 166855176514521964 2 IN IP4 127.0.0.1\r\n' +
+        's=-\r\n' +
+        't=0 0\r\n' +
+        'm=audio 9 UDP/TLS/RTP/SAVPF 111\r\n' +
+        'c=IN IP4 0.0.0.0\r\n' +
+        'a=rtcp:9 IN IP4 0.0.0.0\r\n' +
+        'a=ice-ufrag:' + ICEUFRAG + '\r\n' +
+        'a=ice-pwd:' + ICEPWD + '\r\n' +
+        'a=fingerprint:sha-256 ' + FINGERPRINT_SHA256 + '\r\n' +
+        'a=setup:active\r\n' +
+        'a=sendonly\r\n' +
+        'a=rtcp-rsize\r\n' +
+        'a=rtpmap:111 opus/48000/2\r\n';
+    const pc = new RTCPeerConnection({rtcpMuxPolicy: 'require'});
+    t.add_cleanup(() => pc.close());
+
+    await pc.createOffer({offerToReceiveAudio: true})
+      .then(offer => pc.setLocalDescription(offer));
+    return promise_rejects(t, 'InvalidAccessError', pc.setRemoteDescription({type: 'answer', sdp}));
+  }, 'setRemoteDescription throws InvalidAccessError when called with an answer without rtcp-mux and rtcpMuxPolicy is set to require');
 </script>
diff --git a/testing/web-platform/tests/webrtc/idlharness.https.window.js b/testing/web-platform/tests/webrtc/idlharness.https.window.js
new file mode 100644
index 000000000000..3c57a022cabf
--- /dev/null
+++ b/testing/web-platform/tests/webrtc/idlharness.https.window.js
@@ -0,0 +1,143 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: script=./RTCPeerConnection-helper.js
+
+'use strict';
+
+// The following helper functions are called from RTCPeerConnection-helper.js:
+//   generateAnswer()
+//   getNoiseStream()
+
+// Put the global IDL test objects under a parent object.
+// This allows easier search for the test cases when
+// viewing the web page
+const idlTestObjects = {};
+
+// Helper function to create RTCTrackEvent object
+function initTrackEvent() {
+  const pc = new RTCPeerConnection();
+  const transceiver = pc.addTransceiver('audio');
+  const { sender, receiver } = transceiver;
+  const { track } = receiver;
+  return new RTCTrackEvent('track', {
+    receiver, track, transceiver
+  });
+}
+
+// List of async test driver functions
+const asyncInitTasks = [
+  asyncInitCertificate,
+  asyncInitTransports,
+  asyncInitMediaStreamTrack,
+];
+
+// Asynchronously generate an RTCCertificate
+function asyncInitCertificate() {
+  return RTCPeerConnection.generateCertificate({
+    name: 'RSASSA-PKCS1-v1_5',
+    modulusLength: 2048,
+    publicExponent: new Uint8Array([1, 0, 1]),
+    hash: 'SHA-256'
+  }).then(cert => {
+    idlTestObjects.certificate = cert;
+  });
+}
+
+// Asynchronously generate instances of
+// RTCSctpTransport, RTCDtlsTransport,
+// and RTCIceTransport
+function asyncInitTransports() {
+  const pc = new RTCPeerConnection();
+  pc.createDataChannel('test');
+
+  // setting answer description initializes pc.sctp
+  return pc.createOffer()
+  .then(offer =>
+    pc.setLocalDescription(offer)
+    .then(() => generateAnswer(offer)))
+  .then(answer => pc.setRemoteDescription(answer))
+  .then(() => {
+    const sctpTransport = pc.sctp;
+    assert_true(sctpTransport instanceof RTCSctpTransport,
+      'Expect pc.sctp to be instance of RTCSctpTransport');
+    idlTestObjects.sctpTransport = sctpTransport;
+
+    const dtlsTransport = sctpTransport.transport;
+    assert_true(dtlsTransport instanceof RTCDtlsTransport,
+      'Expect sctpTransport.transport to be instance of RTCDtlsTransport');
+    idlTestObjects.dtlsTransport = dtlsTransport;
+
+    const iceTransport = dtlsTransport.transport;
+    idlTestObjects.iceTransport = iceTransport;
+  });
+}
+
+// Asynchoronously generate MediaStreamTrack from getUserMedia
+function asyncInitMediaStreamTrack() {
+  return getNoiseStream({ audio: true })
+    .then(mediaStream => {
+      idlTestObjects.mediaStreamTrack = mediaStream.getTracks()[0];
+    });
+}
+
+// Run all async test drivers, report and swallow any error
+// thrown/rejected. Proper test for correct initialization
+// of the objects are done in their respective test files.
+function asyncInit() {
+  return Promise.all(asyncInitTasks.map(
+    task => {
+      const t = async_test(`Test driver for ${task.name}`);
+      let promise;
+      t.step(() => {
+        promise = task().then(
+          t.step_func_done(),
+          t.step_func(err =>
+            assert_unreached(`Failed to run ${task.name}: ${err}`)));
+      });
+      return promise;
+    }));
+}
+
+idl_test(
+  ['webrtc'],
+  ['mediacapture-streams', 'dom'],
+  async idlArray => {
+    idlArray.add_objects({
+      RTCPeerConnection: [`new RTCPeerConnection()`],
+      RTCSessionDescription: [`new RTCSessionDescription({ type: 'offer' })`],
+      RTCIceCandidate: [`new RTCIceCandidate({ sdpMid: 1 })`],
+      RTCDataChannel: [`new RTCPeerConnection().createDataChannel('')`],
+      RTCRtpTransceiver: [`new RTCPeerConnection().addTransceiver('audio')`],
+      RTCRtpSender: [`new RTCPeerConnection().addTransceiver('audio').sender`],
+      RTCRtpReceiver: [`new RTCPeerConnection().addTransceiver('audio').receiver`],
+      RTCPeerConnectionIceEvent: [`new RTCPeerConnectionIceEvent('ice')`],
+      RTCPeerConnectionIceErrorEvent: [
+        `new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 });`
+      ],
+      RTCTrackEvent: [`initTrackEvent()`],
+      RTCErrorEvent: [`new RTCErrorEvent('error')`],
+      RTCDataChannelEvent: [
+        `new RTCDataChannelEvent('channel', {
+          channel: new RTCPeerConnection().createDataChannel('')
+        })`
+      ],
+      // Async initialized objects below
+      RTCCertificate: ['idlTestObjects.certificate'],
+      RTCSctpTransport: ['idlTestObjects.sctpTransport'],
+      RTCDtlsTransport: ['idlTestObjects.dtlsTransport'],
+      RTCIceTransport: ['idlTestObjects.iceTransport'],
+      MediaStreamTrack: ['idlTestObjects.mediaStreamTrack'],
+    });
+    /*
+      TODO
+        RTCRtpContributingSource
+        RTCRtpSynchronizationSource
+        RTCDTMFSender
+        RTCDTMFToneChangeEvent
+        RTCIdentityProviderRegistrar
+        RTCIdentityAssertion
+    */
+
+    await asyncInit();
+  }
+);
diff --git a/testing/web-platform/tests/webrtc/interfaces.https.html b/testing/web-platform/tests/webrtc/interfaces.https.html
deleted file mode 100644
index a834f895abcc..000000000000
--- a/testing/web-platform/tests/webrtc/interfaces.https.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<!doctype html>
-<meta charset=utf-8>
-<title>WebRTC IDL Tests</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script src="./RTCPeerConnection-helper.js"></script>
-<script>
-  'use strict';
-
-  // The following helper functions are called from RTCPeerConnection-helper.js:
-  //   generateAnswer()
-  //   getNoiseStream()
-
-  // Put the global IDL test objects under a parent object.
-  // This allows easier search for the test cases when
-  // viewing the web page
-  const idlTestObjects = {};
-
-  // Helper function to create RTCTrackEvent object
-  function initTrackEvent() {
-    const pc = new RTCPeerConnection();
-    const transceiver = pc.addTransceiver('audio');
-    const { sender, receiver } = transceiver;
-    const { track } = receiver;
-    return new RTCTrackEvent('track', {
-      receiver, track, transceiver
-    });
-  }
-
-  // List of async test driver functions
-  const asyncInitTasks = [
-    asyncInitCertificate,
-    asyncInitTransports,
-    asyncInitMediaStreamTrack,
-  ];
-
-  // Asynchronously generate an RTCCertificate
-  function asyncInitCertificate() {
-    return RTCPeerConnection.generateCertificate({
-      name: 'RSASSA-PKCS1-v1_5',
-      modulusLength: 2048,
-      publicExponent: new Uint8Array([1, 0, 1]),
-      hash: 'SHA-256'
-    }).then(cert => {
-      idlTestObjects.certificate = cert;
-    });
-  }
-
-  // Asynchronously generate instances of
-  // RTCSctpTransport, RTCDtlsTransport,
-  // and RTCIceTransport
-  function asyncInitTransports() {
-    const pc = new RTCPeerConnection();
-    pc.createDataChannel('test');
-
-    // setting answer description initializes pc.sctp
-    return pc.createOffer()
-    .then(offer =>
-      pc.setLocalDescription(offer)
-      .then(() => generateAnswer(offer)))
-    .then(answer => pc.setRemoteDescription(answer))
-    .then(() => {
-      const sctpTransport = pc.sctp;
-      assert_true(sctpTransport instanceof RTCSctpTransport,
-        'Expect pc.sctp to be instance of RTCSctpTransport');
-      idlTestObjects.sctpTransport = sctpTransport;
-
-      const dtlsTransport = sctpTransport.transport;
-      assert_true(dtlsTransport instanceof RTCDtlsTransport,
-        'Expect sctpTransport.transport to be instance of RTCDtlsTransport');
-      idlTestObjects.dtlsTransport = dtlsTransport;
-
-      const iceTransport = dtlsTransport.transport;
-      idlTestObjects.iceTransport = iceTransport;
-    });
-  }
-
-  // Asynchoronously generate MediaStreamTrack from getUserMedia
-  function asyncInitMediaStreamTrack() {
-    return getNoiseStream({ audio: true })
-    .then(mediaStream => {
-      idlTestObjects.mediaStreamTrack = mediaStream.getTracks()[0];
-    });
-  }
-
-  // Run all async test drivers, report and swallow any error
-  // thrown/rejected. Proper test for correct initialization
-  // of the objects are done in their respective test files.
-  function asyncInit() {
-    return Promise.all(asyncInitTasks.map(
-      task => {
-        const t = async_test(`Test driver for ${task.name}`);
-        let promise;
-        t.step(() => {
-          promise = task().then(
-            t.step_func_done(),
-            t.step_func(err =>
-              assert_unreached(`Failed to run ${task.name}: ${err}`)));
-        });
-        return promise;
-      }));
-  }
-
-  promise_test(async t => {
-    await asyncInit();
-
-    const idlArray = new IdlArray();
-
-    let webrtcIdl = fetch('/interfaces/webrtc-pc.idl').then(r => r.text());
-    let mediacaptureMainIdl = fetch('/interfaces/mediacapture-streams.idl').then(r => r.text());
-
-    idlArray.add_untested_idls(mediacaptureMainIdl, { only: ['MediaStreamConstraints'] });
-    idlArray.add_idls(webrtcIdl);
-
-    idlArray.add_untested_idls('interface EventHandler {};');
-    idlArray.add_idls('interface EventTarget {};');
-    idlArray.add_idls('interface MediaStreamTrack : EventTarget {};');
-
-    idlArray.add_objects({
-      'RTCPeerConnection': [`new RTCPeerConnection()`],
-
-      'RTCSessionDescription': [`new RTCSessionDescription({ type: 'offer' })`],
-
-      'RTCIceCandidate': [`new RTCIceCandidate({ sdpMid: 1 })`],
-
-      'RTCDataChannel': [`new RTCPeerConnection().createDataChannel('')`],
-
-      'RTCRtpTransceiver': [`new RTCPeerConnection().addTransceiver('audio')`],
-
-      'RTCRtpSender': [`new RTCPeerConnection().addTransceiver('audio').sender`],
-
-      'RTCRtpReceiver': [`new RTCPeerConnection().addTransceiver('audio').receiver`],
-
-      'RTCPeerConnectionIceEvent': [`new RTCPeerConnectionIceEvent('ice')`],
-
-      'RTCPeerConnectionIceErrorEvent':
-        [`new RTCPeerConnectionIceErrorEvent('ice-error', { errorCode: 701 });`],
-
-      'RTCTrackEvent': [`initTrackEvent()`],
-
-      'RTCErrorEvent': [`new RTCErrorEvent('error')`],
-
-      'RTCDataChannelEvent': [`new RTCDataChannelEvent('channel',
-        { channel: new RTCPeerConnection().createDataChannel('') })`],
-
-      // Async initialized objects below
-
-      'RTCCertificate': ['idlTestObjects.certificate'],
-
-      'RTCSctpTransport': ['idlTestObjects.sctpTransport'],
-
-      'RTCDtlsTransport': ['idlTestObjects.dtlsTransport'],
-
-      'RTCIceTransport': ['idlTestObjects.iceTransport'],
-
-      'MediaStreamTrack': ['idlTestObjects.mediaStreamTrack']
-    });
-
-    idlArray.test();
-  }, 'Main test driver');
-
-  /*
-    TODO
-      RTCRtpContributingSource
-      RTCRtpSynchronizationSource
-      RTCDTMFSender
-      RTCDTMFToneChangeEvent
-      RTCIdentityProviderRegistrar
-      RTCIdentityAssertion
-   */
-</script>
diff --git a/testing/web-platform/tests/webusb/idlharness.https.any.js b/testing/web-platform/tests/webusb/idlharness.https.any.js
index e520200f7e46..9ba0198a5bc3 100644
--- a/testing/web-platform/tests/webusb/idlharness.https.any.js
+++ b/testing/web-platform/tests/webusb/idlharness.https.any.js
@@ -2,67 +2,45 @@
 // META: script=/resources/idlharness.js
 // META: script=/webusb/resources/fake-devices.js
 // META: script=/webusb/resources/usb-helpers.js
+
 'use strict';
 
-// Object instances used by the IDL test.
-var usbDevice;
-var usbConfiguration;
-var usbInterface;
-var usbAlternateInterface;
-var usbEndpoint;
-var usbConnectionEvent;
+idl_test(
+  ['webusb'],
+  ['permissions', 'html', 'dom'],
+  async idl_array => {
+    if (self.GLOBAL.isWindow()) {
+      idl_array.add_objects({ Navigator: ['navigator'] });
+    } else if (self.GLOBAL.isWorker()) {
+      idl_array.add_objects({ WorkerNavigator: ['navigator'] });
+    }
 
-usb_test(async () => {
-  // Ignored errors are surfaced in idlharness.js's test_object below.
-  let device;
-  try {
-    device = (await getFakeDevice()).device;
-  } catch (e) {}
+    idl_array.add_objects({
+      USB: ['navigator.usb'],
+      USBAlternateInterface: ['usbAlternateInterface'],
+      USBConfiguration: ['usbConfiguration'],
+      USBConnectionEvent: ['usbConnectionEvent'],
+      USBDevice: ['usbDevice'],
+      USBEndpoint: ['usbEndpoint'],
+      USBInterface: ['usbInterface'],
+      USBInTransferResult: ['new USBInTransferResult("ok")'],
+      USBOutTransferResult: ['new USBOutTransferResult("ok")'],
+      USBIsochronousInTransferResult: ['new USBIsochronousInTransferResult([])'],
+      USBIsochronousOutTransferResult: ['new USBIsochronousOutTransferResult([])'],
+      USBIsochronousInTransferPacket: ['new USBIsochronousInTransferPacket("ok")'],
+      USBIsochronousOutTransferPacket: ['new USBIsochronousOutTransferPacket("ok")'],
+    });
 
-  return idl_test(
-    ['webusb'],
-    ['html', 'dom'],
-    idl_array => {
-      // Untested IDL interfaces
-      idl_array.add_untested_idls('dictionary PermissionDescriptor {};');
-      idl_array.add_untested_idls('interface PermissionStatus {};');
-
-      try {
-        usbDevice = device;
-        usbConfiguration = usbDevice.configurations[0];
-        usbInterface = usbConfiguration.interfaces[0];
-        usbAlternateInterface = usbInterface.alternates[0];
-        usbEndpoint = usbAlternateInterface.endpoints[0];
-        usbConnectionEvent =
-            new USBConnectionEvent('connect', { device: usbDevice })
-      } catch (e) {}
-
-      if (self.GLOBAL.isWindow()) {
-        idl_array.add_objects({ Navigator: ['navigator'] });
-      } else if (self.GLOBAL.isWorker()) {
-        idl_array.add_objects({ WorkerNavigator: ['navigator'] });
-      }
-
-      idl_array.add_objects({
-        Navigator: ['navigator'],
-        USB: ['navigator.usb'],
-        USBAlternateInterface: ['usbAlternateInterface'],
-        USBConfiguration: ['usbConfiguration'],
-        USBConnectionEvent: ['usbConnectionEvent'],
-        USBDevice: ['usbDevice'],
-        USBEndpoint: ['usbEndpoint'],
-        USBInterface: ['usbInterface'],
-        USBInTransferResult: ['new USBInTransferResult("ok")'],
-        USBOutTransferResult: ['new USBOutTransferResult("ok")'],
-        USBIsochronousInTransferResult: ['new USBIsochronousInTransferResult([])'],
-        USBIsochronousOutTransferResult: ['new USBIsochronousOutTransferResult([])'],
-        USBIsochronousInTransferPacket: ['new USBIsochronousInTransferPacket("ok")'],
-        USBIsochronousOutTransferPacket: ['new USBIsochronousOutTransferPacket("ok")'],
-      });
-      idl_array.prevent_multiple_testing('Navigator');
-    },
-    'WebUSB IDL test'
-  )
-});
-
-done();
+    return usb_test(async () => {
+      // Ignored errors are surfaced in idlharness.js's test_object below.
+      self.usbDevice = await getFakeDevice().device;
+      self.usbConfiguration = usbDevice.configurations[0];
+      self.usbInterface = usbConfiguration.interfaces[0];
+      self.usbAlternateInterface = usbInterface.alternates[0];
+      self.usbEndpoint = usbAlternateInterface.endpoints[0];
+      self.usbConnectionEvent =
+          new USBConnectionEvent('connect', { device: usbDevice });
+    }, 'USB device setup');
+  },
+  'WebUSB IDL test'
+);
diff --git a/testing/web-platform/tests/webusb/resources/usb-helpers.js b/testing/web-platform/tests/webusb/resources/usb-helpers.js
index 81a712c1c652..e2b7d46dca52 100644
--- a/testing/web-platform/tests/webusb/resources/usb-helpers.js
+++ b/testing/web-platform/tests/webusb/resources/usb-helpers.js
@@ -9,7 +9,7 @@
 //
 //   --enable-blink-features=MojoJS,MojoJSTest
 let loadChromiumResources = Promise.resolve().then(() => {
-  if (!MojoInterfaceInterceptor) {
+  if (!('MojoInterfaceInterceptor' in self)) {
     // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
     // not present in the global namespace.
     return;
diff --git a/testing/web-platform/tests/webxr/idlharness.https.window.js b/testing/web-platform/tests/webxr/idlharness.https.window.js
new file mode 100644
index 000000000000..6ec963df6d56
--- /dev/null
+++ b/testing/web-platform/tests/webxr/idlharness.https.window.js
@@ -0,0 +1,22 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+// https://immersive-web.github.io/webxr/
+
+idl_test(
+  ['webxr'],
+  ['webgl1', 'html', 'dom'],
+  async idl_array => {
+    idl_array.add_objects({
+      Navigator: ['navigator'],
+      XR: ['navigator.XR'],
+      XRDevice: ['device'],
+      XRSession: ['session'],
+    });
+    self.device = await navigator.XR.requestDevice();
+    self.session = await device.requestSession();
+  },
+  'Test IDL implementation of WebXR API'
+);
diff --git a/testing/web-platform/tests/webxr/interfaces.https.html b/testing/web-platform/tests/webxr/interfaces.https.html
deleted file mode 100644
index 65b2a85326ee..000000000000
--- a/testing/web-platform/tests/webxr/interfaces.https.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>WebXR Device API IDL Tests</title>
-<link rel="help" href="https://immersive-web.github.io/webxr/spec/latest/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script>
-"use strict";
-
-idl_test(
-  ['webxr'],
-  ['webgl1', 'html', 'dom'],
-  idl_array => {
-    idl_array.add_objects({
-      Navigator:['navigator'],
-    });
-  },
-  'Test IDL implementation of WebXR API');
-</script>
diff --git a/testing/web-platform/tests/workers/WorkerGlobalScope_requestAnimationFrame.htm b/testing/web-platform/tests/workers/WorkerGlobalScope_requestAnimationFrame.htm
index dcf58d92497e..c5efd53c210a 100644
--- a/testing/web-platform/tests/workers/WorkerGlobalScope_requestAnimationFrame.htm
+++ b/testing/web-platform/tests/workers/WorkerGlobalScope_requestAnimationFrame.htm
@@ -20,12 +20,13 @@ requestAnimationFrame((dt) => {
 async_test(function(t) {
   var blob = new Blob([document.getElementById('worker').textContent]);
   var worker = new Worker(URL.createObjectURL(blob));
-  worker.addEventListener("message", (ev) => {
+  worker.addEventListener("error", t.unreached_func("No error should be reported"));
+  worker.addEventListener("message", t.step_func((ev) => {
     const ret = ev.data;
     assert_equals(ret.length, 3);
     assert_true(ret[0] < ret[1]);
     assert_true(ret[1] < ret[2]);
     t.done();
-  });
+  }));
 });
 </script>
diff --git a/testing/web-platform/tests/workers/modules/dedicated-worker-import-blob-url.any.js b/testing/web-platform/tests/workers/modules/dedicated-worker-import-blob-url.any.js
index 9a50b23893b3..e3f61867c5b9 100644
--- a/testing/web-platform/tests/workers/modules/dedicated-worker-import-blob-url.any.js
+++ b/testing/web-platform/tests/workers/modules/dedicated-worker-import-blob-url.any.js
@@ -11,7 +11,10 @@ function import_blob_url_test(testCase) {
     const blobURL = URL.createObjectURL(blob);
 
     const worker = new Worker(blobURL, { type: 'module'});
-    const msgEvent = await new Promise(resolve => worker.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) => {
+      worker.onmessage = resolve;
+      worker.onerror = (error) => reject(error && error.message);
+    });
     assert_array_equals(msgEvent.data, testCase.expectation);
   }, testCase.description);
 }
diff --git a/testing/web-platform/tests/workers/modules/dedicated-worker-import-failure.html b/testing/web-platform/tests/workers/modules/dedicated-worker-import-failure.html
index 547f9e16dc9a..81d93322c77d 100644
--- a/testing/web-platform/tests/workers/modules/dedicated-worker-import-failure.html
+++ b/testing/web-platform/tests/workers/modules/dedicated-worker-import-failure.html
@@ -35,7 +35,10 @@ promise_test(async () => {
   const worker = new Worker('resources/dynamic-import-given-url-worker.js',
                             { type: 'module' });
   worker.postMessage(scriptURL);
-  const msg_event = await new Promise(resolve => worker.onmessage = resolve);
+  const msg_event = await new Promise((resolve, reject) => {
+    worker.onmessage = resolve;
+    worker.onerror = (error) => reject(error && error.message);
+  });
   assert_equals(msg_event.data, 'TypeError');
 }, 'Dynamic import for non-existent script should throw an exception.');
 
diff --git a/testing/web-platform/tests/workers/modules/dedicated-worker-import-meta.html b/testing/web-platform/tests/workers/modules/dedicated-worker-import-meta.html
index 6960cbe57702..9292b0f6d8ef 100644
--- a/testing/web-platform/tests/workers/modules/dedicated-worker-import-meta.html
+++ b/testing/web-platform/tests/workers/modules/dedicated-worker-import-meta.html
@@ -7,7 +7,10 @@
 promise_test(() => {
   const script_url = 'resources/import-meta-url-worker.js';
   const worker = new Worker(script_url, { type: 'module' });
-  return new Promise(resolve => worker.onmessage = resolve)
+  return new Promise((resolve, reject) => {
+        worker.onmessage = resolve;
+        worker.onerror = (error) => reject(error && error.message);
+      })
       .then(msg_event => assert_true(msg_event.data.endsWith(script_url)));
 }, 'Test import.meta.url on the top-level module script.');
 
@@ -16,7 +19,10 @@ promise_test(() => {
   const worker = new Worker('resources/dynamic-import-given-url-worker.js',
                             { type: 'module' });
   worker.postMessage('./' + script_url);
-  return new Promise(resolve => worker.onmessage = resolve)
+  return new Promise((resolve, reject) => {
+        worker.onmessage = resolve;
+        worker.onerror = (error) => reject(error && error.message);
+      })
       .then(msg_event => assert_true(msg_event.data.endsWith(script_url)));
 }, 'Test import.meta.url on the imported module script.');
 
@@ -26,7 +32,10 @@ promise_test(() => {
                             { type: 'module' });
   worker.postMessage('./' + script_url);
 
-  return new Promise(resolve => worker.onmessage = resolve)
+  return new Promise((resolve, reject) => {
+        worker.onmessage = resolve;
+        worker.onerror = (error) => reject(error && error.message);
+      })
       .then(msg_event => assert_true(msg_event.data.endsWith(script_url)))
       .then(() => {
         worker.postMessage('./' + script_url + '#1');
diff --git a/testing/web-platform/tests/workers/modules/dedicated-worker-import.any.js b/testing/web-platform/tests/workers/modules/dedicated-worker-import.any.js
index 65adcb0b5031..805dbf3288c0 100644
--- a/testing/web-platform/tests/workers/modules/dedicated-worker-import.any.js
+++ b/testing/web-platform/tests/workers/modules/dedicated-worker-import.any.js
@@ -6,7 +6,10 @@
 function import_test(testCase) {
   promise_test(async () => {
     const worker = new Worker(testCase.scriptURL, { type: 'module' });
-    const msgEvent = await new Promise(resolve => worker.onmessage = resolve);
+    const msgEvent = await new Promise((resolve, reject) => {
+      worker.onmessage = resolve;
+      worker.onerror = (error) => reject(error && error.message);
+    });
     assert_array_equals(msgEvent.data, testCase.expectation);
   }, testCase.description);
 }
diff --git a/toolkit/components/remote/nsDBusRemoteService.cpp b/toolkit/components/remote/nsDBusRemoteService.cpp
index e89092da2341..eec7c617aaa6 100644
--- a/toolkit/components/remote/nsDBusRemoteService.cpp
+++ b/toolkit/components/remote/nsDBusRemoteService.cpp
@@ -220,9 +220,8 @@ nsDBusRemoteService::Startup(const char* aAppName, const char* aProfileName)
     return NS_ERROR_FAILURE;
   }
 
-  nsAutoCString pathName;
-  pathName = nsPrintfCString("/org/mozilla/%s/Remote", mAppName.get());
-  if (!dbus_connection_register_object_path(mConnection, pathName.get(),
+  mPathName = nsPrintfCString("/org/mozilla/%s/Remote", mAppName.get());
+  if (!dbus_connection_register_object_path(mConnection, mPathName.get(),
                                             &remoteHandlersTable, this)) {
     mConnection = nullptr;
     return NS_ERROR_FAILURE;
@@ -234,6 +233,8 @@ nsDBusRemoteService::Startup(const char* aAppName, const char* aProfileName)
 NS_IMETHODIMP
 nsDBusRemoteService::Shutdown()
 {
+  dbus_connection_unregister_object_path(mConnection, mPathName.get());
+
   // dbus_connection_unref() will be called by RefPtr here.
   mConnection = nullptr;
   return NS_OK;
diff --git a/toolkit/components/remote/nsDBusRemoteService.h b/toolkit/components/remote/nsDBusRemoteService.h
index fab82715b5d7..4a722f2cd11d 100644
--- a/toolkit/components/remote/nsDBusRemoteService.h
+++ b/toolkit/components/remote/nsDBusRemoteService.h
@@ -36,6 +36,7 @@ private:
   // The connection is owned by DBus library
   RefPtr<DBusConnection>  mConnection;
   nsCString               mAppName;
+  nsCString               mPathName;
 };
 
 #endif // __nsDBusRemoteService_h__
diff --git a/toolkit/content/widgets/general.js b/toolkit/content/widgets/general.js
index 06e758bcdeb5..784523a33201 100644
--- a/toolkit/content/widgets/general.js
+++ b/toolkit/content/widgets/general.js
@@ -48,4 +48,22 @@ class MozDropmarker extends MozXULElement {
 
 customElements.define("dropmarker", MozDropmarker);
 
+class MozCommandSet extends MozXULElement {
+  connectedCallback() {
+    if (this.getAttribute("commandupdater") === "true") {
+      const events = this.getAttribute("events") || "*";
+      const targets = this.getAttribute("targets") || "*";
+      document.commandDispatcher.addCommandUpdater(this, events, targets);
+    }
+  }
+
+  disconnectedCallback() {
+    if (this.getAttribute("commandupdater") === "true") {
+      document.commandDispatcher.removeCommandUpdater(this);
+    }
+  }
+}
+
+customElements.define("commandset", MozCommandSet);
+
 }
diff --git a/toolkit/crashreporter/minidump-analyzer/moz.build b/toolkit/crashreporter/minidump-analyzer/moz.build
index 3df941ee8493..70f3b259a9d8 100644
--- a/toolkit/crashreporter/minidump-analyzer/moz.build
+++ b/toolkit/crashreporter/minidump-analyzer/moz.build
@@ -59,6 +59,3 @@ if CONFIG['OS_TARGET'] != 'WINNT':
     DisableStlWrapping()
 
 include('/toolkit/crashreporter/crashreporter.mozbuild')
-
-if CONFIG['MOZ_PGO'] and CONFIG['CC_TYPE'] == 'clang-cl':
-    AllowCompilerWarnings()  # workaround for bug 1090497
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index c60e0d61f38b..e1a361d19b7f 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1048,3 +1048,19 @@ def unsigned_addon_scopes(scopes):
 
 set_config('MOZ_UNSIGNED_APP_SCOPE', unsigned_addon_scopes.app)
 set_config('MOZ_UNSIGNED_SYSTEM_SCOPE', unsigned_addon_scopes.system)
+
+# Launcher process (Windows only)
+# ==============================================================
+
+option('--enable-launcher-process', help='Enable launcher process by default')
+
+@depends('--enable-launcher-process', target)
+def launcher(value, target):
+    enabled = bool(value)
+    if enabled and target.os != 'WINNT':
+        die('Cannot enable launcher process on %s', target.os)
+    if enabled:
+        return True
+
+set_config('MOZ_LAUNCHER_PROCESS', launcher)
+set_define('MOZ_LAUNCHER_PROCESS', launcher)
diff --git a/toolkit/recordreplay/ipc/JSControl.cpp b/toolkit/recordreplay/ipc/JSControl.cpp
index 633f5e527bc4..7b4b1a903ac3 100644
--- a/toolkit/recordreplay/ipc/JSControl.cpp
+++ b/toolkit/recordreplay/ipc/JSControl.cpp
@@ -188,6 +188,12 @@ Middleman_RegisterReplayDebugger(JSContext* aCx, unsigned aArgc, Value* aVp)
     return false;
   }
 
+  obj = ::js::CheckedUnwrap(obj);
+  if (!obj) {
+    ::js::ReportAccessDenied(aCx);
+    return false;
+  }
+
   PersistentRootedObject* root = new PersistentRootedObject(aCx);
   *root = obj;
   gReplayDebuggers.append(root);
@@ -201,7 +207,7 @@ InvalidateReplayDebuggersAfterUnpause(JSContext* aCx)
 {
   RootedValue rval(aCx);
   for (auto root : gReplayDebuggers) {
-    JSAutoRealmAllowCCW ac(aCx, *root);
+    JSAutoRealm ar(aCx, *root);
     if (!JS_CallFunctionName(aCx, *root, "invalidateAfterUnpause",
                              HandleValueArray::empty(), &rval))
     {
@@ -312,6 +318,12 @@ Middleman_SetBreakpoint(JSContext* aCx, unsigned aArgc, Value* aVp)
     return false;
   }
 
+  handler = ::js::CheckedUnwrap(handler);
+  if (!handler) {
+    ::js::ReportAccessDenied(aCx);
+    return false;
+  }
+
   BreakpointPosition position;
   if (!position.Decode(aCx, positionObject)) {
     return false;
@@ -341,7 +353,7 @@ HitBreakpoint(JSContext* aCx, size_t aId)
   InstalledBreakpoint* breakpoint = gBreakpoints[aId];
   MOZ_RELEASE_ASSERT(breakpoint);
 
-  JSAutoRealmAllowCCW ac(aCx, breakpoint->mHandler);
+  JSAutoRealm ar(aCx, breakpoint->mHandler);
 
   RootedValue handlerValue(aCx, ObjectValue(*breakpoint->mHandler));
   RootedValue rval(aCx);
diff --git a/tools/infer/config.yaml b/tools/infer/config.yaml
new file mode 100644
index 000000000000..4482dde40f50
--- /dev/null
+++ b/tools/infer/config.yaml
@@ -0,0 +1,23 @@
+---
+target: obj-x86_64-pc-linux-gnu
+# It is used by 'mach static-analysis' and 'mozreview static-analysis bot'
+# in order to have consistency across the used checkers.
+platforms:
+  - linux64
+infer_checkers:
+  - name: check-nullable
+    publish: !!bool yes
+  - name: eradicate
+    publish: !!bool no
+  - name: quandary
+    publish: !!bool yes
+  - name: starvation
+    publish: !!bool yes
+  - name: litho
+    publish: !!bool yes
+  - name: racerd
+    publish: !!bool yes
+  - name: liveness
+    publish: !!bool yes
+# Third party files from mozilla-central
+third_party: tools/rewriting/ThirdPartyPaths.txt
diff --git a/tools/profiler/lul/LulMain.cpp b/tools/profiler/lul/LulMain.cpp
index 61da557295c5..e66247448b45 100644
--- a/tools/profiler/lul/LulMain.cpp
+++ b/tools/profiler/lul/LulMain.cpp
@@ -1421,11 +1421,9 @@ LUL::Unwind(/*OUT*/uintptr_t* aFramePCs,
 
     }
 
-#if defined(GP_PLAT_amd64_linux)
-    // There's no RuleSet for the specified address.  On amd64_linux, see if
+#if defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_x86_linux)
+    // There's no RuleSet for the specified address.  On amd64/x86_linux, see if
     // it's possible to recover the caller's frame by using the frame pointer.
-    // This would probably work for the 32-bit case too, but hasn't been
-    // tested for that case.
 
     // We seek to compute (new_IP, new_SP, new_BP) from (old_BP, stack image),
     // and assume the following layout:
@@ -1473,7 +1471,7 @@ LUL::Unwind(/*OUT*/uintptr_t* aFramePCs,
         }
       }
     }
-#endif // defined(GP_PLAT_amd64_linux)
+#endif // defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_x86_linux)
 
     // We failed to recover a frame either using CFI or FP chasing, and we
     // have no other ways to recover the frame.  So we have to give up.
diff --git a/widget/cocoa/nsDragService.h b/widget/cocoa/nsDragService.h
index fbc3f2c042fd..774c46bb3b1d 100644
--- a/widget/cocoa/nsDragService.h
+++ b/widget/cocoa/nsDragService.h
@@ -25,7 +25,7 @@ public:
 
   // nsBaseDragService
   virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                         nsIScriptableRegion* aRegion,
+                                         const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                                          uint32_t aActionType) override;
   // nsIDragService
   NS_IMETHOD EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) override;
@@ -46,14 +46,14 @@ private:
   // Creates and returns the drag image for a drag. aImagePoint will be set to
   // the origin of the drag relative to mNativeDragView.
   NSImage* ConstructDragImage(nsINode* aDOMNode,
-                              nsIScriptableRegion* aRegion,
+                              const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                               NSPoint* aImagePoint);
 
   // Creates and returns the drag image for a drag. aPoint should be the origin
   // of the drag, for example the mouse coordinate of the mousedown event.
   // aDragRect will be set the area of the drag relative to this.
   NSImage* ConstructDragImage(nsINode* aDOMNode,
-                              nsIScriptableRegion* aRegion,
+                              const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                               mozilla::CSSIntPoint aPoint,
                               mozilla::LayoutDeviceIntRect* aDragRect);
 
diff --git a/widget/cocoa/nsDragService.mm b/widget/cocoa/nsDragService.mm
index c47d632eb3f4..35264b0105ac 100644
--- a/widget/cocoa/nsDragService.mm
+++ b/widget/cocoa/nsDragService.mm
@@ -66,7 +66,7 @@ nsDragService::~nsDragService()
 
 NSImage*
 nsDragService::ConstructDragImage(nsINode* aDOMNode,
-                                  nsIScriptableRegion* aRegion,
+                                  const Maybe<CSSIntRegion>& aRegion,
                                   NSPoint* aDragPoint)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;
@@ -108,7 +108,7 @@ nsDragService::ConstructDragImage(nsINode* aDOMNode,
 
 NSImage*
 nsDragService::ConstructDragImage(nsINode* aDOMNode,
-                                  nsIScriptableRegion* aRegion,
+                                  const Maybe<CSSIntRegion>& aRegion,
                                   CSSIntPoint aPoint,
                                   LayoutDeviceIntRect* aDragRect)
  {
@@ -284,7 +284,7 @@ nsDragService::GetFilePath(NSPasteboardItem* item)
 
 nsresult
 nsDragService::InvokeDragSessionImpl(nsIArray* aTransferableArray,
-                                     nsIScriptableRegion* aDragRgn,
+                                     const Maybe<CSSIntRegion>& aRegion,
                                      uint32_t aActionType)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
@@ -344,7 +344,7 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aTransferableArray,
   [pbItem setDataProvider:mNativeDragView forTypes:types];
 
   NSPoint draggingPoint;
-  NSImage* image = ConstructDragImage(mSourceNode, aDragRgn, &draggingPoint);
+  NSImage* image = ConstructDragImage(mSourceNode, aRegion, &draggingPoint);
 
   NSRect localDragRect = image.alignmentRect;
   localDragRect.origin.x = draggingPoint.x;
@@ -712,7 +712,7 @@ nsDragService::DragMovedWithView(NSDraggingSession* aSession, NSPoint aPoint)
 
         // Create a new image; if one isn't returned don't change the current one.
         LayoutDeviceIntRect newRect;
-        NSImage* image = ConstructDragImage(mSourceNode, nullptr, screenPoint, &newRect);
+        NSImage* image = ConstructDragImage(mSourceNode, Nothing(), screenPoint, &newRect);
         if (image) {
           NSRect draggingRect = nsCocoaUtils::GeckoRectToCocoaRectDevPix(newRect, scaleFactor);
           [draggingItem setDraggingFrame:draggingRect contents:image];
diff --git a/widget/gtk/nsDragService.cpp b/widget/gtk/nsDragService.cpp
index e20235475af2..a134845004c5 100644
--- a/widget/gtk/nsDragService.cpp
+++ b/widget/gtk/nsDragService.cpp
@@ -312,7 +312,6 @@ NS_IMETHODIMP
 nsDragService::InvokeDragSession(nsINode *aDOMNode,
                                  const nsACString& aPrincipalURISpec,
                                  nsIArray * aArrayTransferables,
-                                 nsIScriptableRegion * aRegion,
                                  uint32_t aActionType,
                                  nsContentPolicyType aContentPolicyType =
                                    nsIContentPolicy::TYPE_OTHER)
@@ -328,14 +327,14 @@ nsDragService::InvokeDragSession(nsINode *aDOMNode,
 
     return nsBaseDragService::InvokeDragSession(aDOMNode, aPrincipalURISpec,
                                                 aArrayTransferables,
-                                                aRegion, aActionType,
+                                                aActionType,
                                                 aContentPolicyType);
 }
 
 // nsBaseDragService
 nsresult
 nsDragService::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
-                                     nsIScriptableRegion* aRegion,
+                                     const Maybe<CSSIntRegion>& aRegion,
                                      uint32_t aActionType)
 {
     // make sure that we have an array of transferables to use
@@ -351,9 +350,6 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
     if (!sourceList)
         return NS_OK;
 
-    // stored temporarily until the drag-begin signal has been received
-    mSourceRegion = aRegion;
-
     // save our action type
     GdkDragAction action = GDK_ACTION_DEFAULT;
 
@@ -396,8 +392,6 @@ nsDragService::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
                                              1,
                                              &event);
 
-    mSourceRegion = nullptr;
-
     nsresult rv;
     if (context) {
         StartDragSession();
@@ -1723,8 +1717,8 @@ void nsDragService::SetDragIcon(GdkDragContext* aContext)
     LayoutDeviceIntRect dragRect;
     nsPresContext* pc;
     RefPtr<SourceSurface> surface;
-    DrawDrag(mSourceNode, mSourceRegion, mScreenPosition,
-             &dragRect, &surface, &pc);
+    DrawDrag(mSourceNode, mRegion,
+             mScreenPosition, &dragRect, &surface, &pc);
     if (!pc)
         return;
 
diff --git a/widget/gtk/nsDragService.h b/widget/gtk/nsDragService.h
index 100e0dd0d875..c8090916a930 100644
--- a/widget/gtk/nsDragService.h
+++ b/widget/gtk/nsDragService.h
@@ -61,13 +61,12 @@ public:
 
     // nsBaseDragService
     virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                           nsIScriptableRegion* aRegion,
+                                           const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                                            uint32_t aActionType) override;
     // nsIDragService
     NS_IMETHOD InvokeDragSession (nsINode *aDOMNode,
                                   const nsACString& aPrincipalURISpec,
                                   nsIArray * anArrayTransferables,
-                                  nsIScriptableRegion * aRegion,
                                   uint32_t aActionType,
                                   nsContentPolicyType aContentPolicyType) override;
     NS_IMETHOD StartDragSession() override;
@@ -209,8 +208,6 @@ private:
     // our source data items
     nsCOMPtr<nsIArray> mSourceDataItems;
 
-    nsCOMPtr<nsIScriptableRegion> mSourceRegion;
-
     // get a list of the sources in gtk's format
     GtkTargetList *GetSourceList(void);
 
diff --git a/widget/moz.build b/widget/moz.build
index 9398ba07c477..885070300c2a 100644
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -290,6 +290,7 @@ LOCAL_INCLUDES += [
     '/layout/generic',
     '/layout/painting',
     '/layout/xul',
+    '/layout/xul/tree/',
     '/view',
     '/widget',
     '/widget/headless',
diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp
index e3bc0307c361..f7240481a3ee 100644
--- a/widget/nsBaseDragService.cpp
+++ b/widget/nsBaseDragService.cpp
@@ -29,6 +29,9 @@
 #include "nsXULPopupManager.h"
 #include "nsMenuPopupFrame.h"
 #include "SVGImageContext.h"
+#ifdef MOZ_XUL
+#include "nsTreeBodyFrame.h"
+#endif
 #include "mozilla/MouseEvents.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -233,7 +236,6 @@ NS_IMETHODIMP
 nsBaseDragService::InvokeDragSession(nsINode *aDOMNode,
                                      const nsACString& aPrincipalURISpec,
                                      nsIArray* aTransferableArray,
-                                     nsIScriptableRegion* aDragRgn,
                                      uint32_t aActionType,
                                      nsContentPolicyType aContentPolicyType =
                                        nsIContentPolicy::TYPE_OTHER)
@@ -257,7 +259,7 @@ nsBaseDragService::InvokeDragSession(nsINode *aDOMNode,
   nsIPresShell::ClearMouseCapture(nullptr);
 
   nsresult rv = InvokeDragSessionImpl(aTransferableArray,
-                                      aDragRgn, aActionType);
+                                      mRegion, aActionType);
 
   if (NS_FAILED(rv)) {
     // Set mDoingDrag so that EndDragSession cleans up and sends the dragend event
@@ -273,7 +275,6 @@ NS_IMETHODIMP
 nsBaseDragService::InvokeDragSessionWithImage(nsINode* aDOMNode,
                                               const nsACString& aPrincipalURISpec,
                                               nsIArray* aTransferableArray,
-                                              nsIScriptableRegion* aRegion,
                                               uint32_t aActionType,
                                               nsINode* aImage,
                                               int32_t aImageX, int32_t aImageY,
@@ -295,10 +296,31 @@ nsBaseDragService::InvokeDragSessionWithImage(nsINode* aDOMNode,
   mScreenPosition.y = aDragEvent->ScreenY(CallerType::System);
   mInputSource = aDragEvent->MozInputSource();
 
-  return InvokeDragSession(aDOMNode, aPrincipalURISpec,
-                           aTransferableArray,
-                           aRegion, aActionType,
-                           nsIContentPolicy::TYPE_INTERNAL_IMAGE);
+  // If dragging within a XUL tree and no custom drag image was
+  // set, the region argument to InvokeDragSessionWithImage needs
+  // to be set to the area encompassing the selected rows of the
+  // tree to ensure that the drag feedback gets clipped to those
+  // rows. For other content, region should be null.
+  mRegion = Nothing();
+#ifdef MOZ_XUL
+  if (aDOMNode && aDOMNode->IsContent() && !aImage) {
+    if (aDOMNode->NodeInfo()->Equals(nsGkAtoms::treechildren,
+                                     kNameSpaceID_XUL)) {
+      nsTreeBodyFrame* treeBody =
+        do_QueryFrame(aDOMNode->AsContent()->GetPrimaryFrame());
+      if (treeBody) {
+        mRegion = treeBody->GetSelectionRegion();
+      }
+    }
+  }
+#endif
+
+  nsresult rv = InvokeDragSession(aDOMNode, aPrincipalURISpec,
+                                  aTransferableArray,
+                                  aActionType,
+                                  nsIContentPolicy::TYPE_INTERNAL_IMAGE);
+  mRegion = Nothing();
+  return rv;
 }
 
 NS_IMETHODIMP
@@ -319,6 +341,7 @@ nsBaseDragService::InvokeDragSessionWithSelection(Selection* aSelection,
   mDragPopup = nullptr;
   mImage = nullptr;
   mImageOffset = CSSIntPoint();
+  mRegion = Nothing();
 
   mScreenPosition.x = aDragEvent->ScreenX(CallerType::System);
   mScreenPosition.y = aDragEvent->ScreenY(CallerType::System);
@@ -331,7 +354,7 @@ nsBaseDragService::InvokeDragSessionWithSelection(Selection* aSelection,
 
   return InvokeDragSession(node, aPrincipalURISpec,
                            aTransferableArray,
-                           nullptr, aActionType,
+                           aActionType,
                            nsIContentPolicy::TYPE_OTHER);
 }
 
@@ -449,6 +472,7 @@ nsBaseDragService::EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers)
   mScreenPosition = CSSIntPoint();
   mEndDragPoint = LayoutDeviceIntPoint(0, 0);
   mInputSource = MouseEvent_Binding::MOZ_SOURCE_MOUSE;
+  mRegion = Nothing();
 
   return NS_OK;
 }
@@ -548,7 +572,7 @@ GetPresShellForContent(nsINode* aDOMNode)
 
 nsresult
 nsBaseDragService::DrawDrag(nsINode* aDOMNode,
-                            nsIScriptableRegion* aRegion,
+                            const Maybe<CSSIntRegion>& aRegion,
                             CSSIntPoint aScreenPosition,
                             LayoutDeviceIntRect* aScreenDragRect,
                             RefPtr<SourceSurface>* aSurface,
@@ -608,9 +632,7 @@ nsBaseDragService::DrawDrag(nsINode* aDOMNode,
     CSSIntRect dragRect;
     if (aRegion) {
       // the region's coordinates are relative to the root frame
-      int32_t dragRectX, dragRectY, dragRectW, dragRectH;
-      aRegion->GetBoundingBox(&dragRectX, &dragRectY, &dragRectW, &dragRectH);
-      dragRect.SetRect(dragRectX, dragRectY, dragRectW, dragRectH);
+      dragRect = aRegion->GetBounds();
 
       nsIFrame* rootFrame = presShell->GetRootFrame();
       CSSIntRect screenRect = rootFrame->GetScreenRect();
@@ -670,12 +692,7 @@ nsBaseDragService::DrawDrag(nsINode* aDOMNode,
 
   if (!mDragPopup) {
     // otherwise, just draw the node
-    nsIntRegion clipRegion;
     uint32_t renderFlags = mImage ? 0 : nsIPresShell::RENDER_AUTO_SCALE;
-    if (aRegion) {
-      aRegion->GetRegion(&clipRegion);
-    }
-
     if (renderFlags) {
       nsCOMPtr<nsINode> dragINode = do_QueryInterface(dragNode);
       // check if the dragged node itself is an img element
@@ -696,7 +713,7 @@ nsBaseDragService::DrawDrag(nsINode* aDOMNode,
       }
     }
     LayoutDeviceIntPoint pnt(aScreenDragRect->TopLeft());
-    *aSurface = presShell->RenderNode(dragNode, aRegion ? &clipRegion : nullptr,
+    *aSurface = presShell->RenderNode(dragNode, aRegion,
                                       pnt, aScreenDragRect,
                                       renderFlags);
   }
diff --git a/widget/nsBaseDragService.h b/widget/nsBaseDragService.h
index 6d6f0abf6b9e..979a8511b73b 100644
--- a/widget/nsBaseDragService.h
+++ b/widget/nsBaseDragService.h
@@ -17,6 +17,7 @@
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/HTMLCanvasElement.h"
 #include "nsTArray.h"
+#include "nsRegion.h"
 #include "Units.h"
 
 // translucency level for drag images
@@ -81,7 +82,7 @@ protected:
    * EndDragSession() get called if the platform drag is successfully invoked.
    */
   virtual nsresult InvokeDragSessionImpl(nsIArray* aTransferableArray,
-                                         nsIScriptableRegion* aDragRgn,
+                                         const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                                          uint32_t aActionType) = 0;
 
   /**
@@ -107,7 +108,7 @@ protected:
    * whichever of mImage or aDOMNode is used.
    */
   nsresult DrawDrag(nsINode* aDOMNode,
-                    nsIScriptableRegion* aRegion,
+                    const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                     mozilla::CSSIntPoint aScreenPosition,
                     mozilla::LayoutDeviceIntRect* aScreenDragRect,
                     RefPtr<SourceSurface>* aSurface,
@@ -196,6 +197,9 @@ protected:
   uint16_t mInputSource;
 
   nsTArray<RefPtr<mozilla::dom::ContentParent>> mChildProcesses;
+
+  // Sub-region for tree-selections.
+  mozilla::Maybe<mozilla::CSSIntRegion> mRegion;
 };
 
 #endif // nsBaseDragService_h__
diff --git a/widget/nsDragServiceProxy.cpp b/widget/nsDragServiceProxy.cpp
index 60142b0b5055..d68ed44c4ba4 100644
--- a/widget/nsDragServiceProxy.cpp
+++ b/widget/nsDragServiceProxy.cpp
@@ -47,7 +47,7 @@ GetPrincipalURIFromNode(nsCOMPtr<nsINode>& sourceNode,
 
 nsresult
 nsDragServiceProxy::InvokeDragSessionImpl(nsIArray* aArrayTransferables,
-                                          nsIScriptableRegion* aRegion,
+                                          const Maybe<CSSIntRegion>& aRegion,
                                           uint32_t aActionType)
 {
   NS_ENSURE_STATE(mSourceDocument->GetDocShell());
diff --git a/widget/nsDragServiceProxy.h b/widget/nsDragServiceProxy.h
index 7b4e026161ae..89aeeaace525 100644
--- a/widget/nsDragServiceProxy.h
+++ b/widget/nsDragServiceProxy.h
@@ -17,7 +17,7 @@ public:
 
   // nsBaseDragService
   virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                         nsIScriptableRegion* aRegion,
+                                         const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                                          uint32_t aActionType) override;
 private:
   virtual ~nsDragServiceProxy();
diff --git a/widget/nsIDragService.idl b/widget/nsIDragService.idl
index afd21afd0a4f..9e8fd58fecfb 100644
--- a/widget/nsIDragService.idl
+++ b/widget/nsIDragService.idl
@@ -7,7 +7,6 @@
 #include "nsIArray.idl"
 #include "nsISupports.idl"
 #include "nsIDragSession.idl"
-#include "nsIScriptableRegion.idl"
 #include "nsIContentPolicy.idl"
 
 webidl DragEvent;
@@ -46,8 +45,6 @@ interface nsIDragService : nsISupports
     * @param  aPrincipalURISpec - the URI of the triggering principal of the
     *            drag, or an empty string if it's from browser chrome or OS
     * @param  aTransferables - an array of transferables to be dragged
-    * @param  aRegion - a region containing rectangles for cursor feedback, 
-    *            in window coordinates.
     * @param  aActionType - specified which of copy/move/link are allowed
     * @param  aContentPolicyType - the contentPolicyType that will be
     *           passed to the loadInfo when creating a new channel
@@ -55,8 +52,7 @@ interface nsIDragService : nsISupports
     */
   void invokeDragSession (in Node aDOMNode,
                           in AUTF8String aPrincipalURISpec,
-                          in nsIArray aTransferables, 
-                          in nsIScriptableRegion aRegion,
+                          in nsIArray aTransferables,
                           in unsigned long aActionType,
                           [optional] in nsContentPolicyType aContentPolicyType);
 
@@ -91,7 +87,6 @@ interface nsIDragService : nsISupports
   void invokeDragSessionWithImage(in Node aDOMNode,
                                   in AUTF8String aPrincipalURISpec,
                                   in nsIArray aTransferableArray,
-                                  in nsIScriptableRegion aRegion,
                                   in unsigned long aActionType,
                                   in Node aImage,
                                   in long aImageX,
diff --git a/widget/windows/nsDragService.cpp b/widget/windows/nsDragService.cpp
index 9b5c2be26b36..c8dfc3dbe55e 100644
--- a/widget/windows/nsDragService.cpp
+++ b/widget/windows/nsDragService.cpp
@@ -68,7 +68,7 @@ nsDragService::~nsDragService()
 
 bool
 nsDragService::CreateDragImage(nsINode *aDOMNode,
-                               nsIScriptableRegion *aRegion,
+                               const Maybe<CSSIntRegion>& aRegion,
                                SHDRAGIMAGE *psdi)
 {
   if (!psdi)
@@ -165,7 +165,7 @@ nsDragService::CreateDragImage(nsINode *aDOMNode,
 //-------------------------------------------------------------------------
 nsresult
 nsDragService::InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                     nsIScriptableRegion* aRegion,
+                                     const Maybe<CSSIntRegion>& aRegion,
                                      uint32_t aActionType)
 {
   // Try and get source URI of the items that are being dragged
@@ -654,7 +654,7 @@ nsDragService::UpdateDragImage(nsINode* aImage, int32_t aImageX, int32_t aImageY
                                  CLSCTX_INPROC_SERVER,
                                  IID_IDragSourceHelper, (void**)&pdsh))) {
     SHDRAGIMAGE sdi;
-    if (CreateDragImage(mSourceNode, nullptr, &sdi)) {
+    if (CreateDragImage(mSourceNode, Nothing(), &sdi)) {
       nsNativeDragTarget::DragImageChanged();
       if (FAILED(pdsh->InitializeFromBitmap(&sdi, mDataObject)))
         DeleteObject(sdi.hbmpDragImage);
diff --git a/widget/windows/nsDragService.h b/widget/windows/nsDragService.h
index efc343b42a8e..631efacfb0aa 100644
--- a/widget/windows/nsDragService.h
+++ b/widget/windows/nsDragService.h
@@ -25,7 +25,7 @@ public:
   
   // nsBaseDragService
   virtual nsresult InvokeDragSessionImpl(nsIArray* anArrayTransferables,
-                                         nsIScriptableRegion* aRegion,
+                                         const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                                          uint32_t aActionType);
 
   // nsIDragSession
@@ -54,7 +54,7 @@ protected:
 
   // Create a bitmap for drag operations
   bool CreateDragImage(nsINode *aDOMNode,
-                       nsIScriptableRegion *aRegion,
+                       const mozilla::Maybe<mozilla::CSSIntRegion>& aRegion,
                        SHDRAGIMAGE *psdi);
 
   IDataObject * mDataObject;
diff --git a/xpcom/base/nsCycleCollector.cpp b/xpcom/base/nsCycleCollector.cpp
index 4d04ecb19136..040331c7aede 100644
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -1353,6 +1353,7 @@ public:
   void ForgetSkippable(js::SliceBudget& aBudget, bool aRemoveChildlessNodes,
                        bool aAsyncSnowWhiteFreeing);
   bool FreeSnowWhite(bool aUntilNoSWInPurpleBuffer);
+  bool FreeSnowWhiteWithBudget(js::SliceBudget& aBudget);
 
   // This method assumes its argument is already canonicalized.
   void RemoveObjectFromGraph(void* aPtr);
@@ -2715,40 +2716,66 @@ class SnowWhiteKiller : public TraceCallbacks
     ObjectsVector;
 
 public:
-  explicit SnowWhiteKiller(nsCycleCollector* aCollector)
+  SnowWhiteKiller(nsCycleCollector* aCollector, js::SliceBudget* aBudget)
     : mCollector(aCollector)
     , mObjects(kSegmentSize)
+    , mBudget(aBudget)
+    , mSawSnowWhiteObjects(false)
   {
     MOZ_ASSERT(mCollector, "Calling SnowWhiteKiller after nsCC went away");
   }
 
+  explicit SnowWhiteKiller(nsCycleCollector* aCollector)
+    : SnowWhiteKiller(aCollector, nullptr)
+  {
+  }
+
   ~SnowWhiteKiller()
   {
     for (auto iter = mObjects.Iter(); !iter.Done(); iter.Next()) {
       SnowWhiteObject& o = iter.Get();
-      if (!o.mRefCnt->get() && !o.mRefCnt->IsInPurpleBuffer()) {
-        mCollector->RemoveObjectFromGraph(o.mPointer);
-        o.mRefCnt->stabilizeForDeletion();
-        {
-          JS::AutoEnterCycleCollection autocc(mCollector->Runtime()->Runtime());
-          o.mParticipant->Trace(o.mPointer, *this, nullptr);
-        }
-        o.mParticipant->DeleteCycleCollectable(o.mPointer);
+      MaybeKillObject(o);
+    }
+  }
+
+  void
+  MaybeKillObject(SnowWhiteObject& aObject)
+  {
+    if (!aObject.mRefCnt->get() && !aObject.mRefCnt->IsInPurpleBuffer()) {
+      mCollector->RemoveObjectFromGraph(aObject.mPointer);
+      aObject.mRefCnt->stabilizeForDeletion();
+      {
+        JS::AutoEnterCycleCollection autocc(mCollector->Runtime()->Runtime());
+        aObject.mParticipant->Trace(aObject.mPointer, *this, nullptr);
       }
+      aObject.mParticipant->DeleteCycleCollectable(aObject.mPointer);
     }
   }
 
   bool
   Visit(nsPurpleBuffer& aBuffer, nsPurpleBufferEntry* aEntry)
   {
+    if (mBudget) {
+      if (mBudget->isOverBudget()) {
+        return false;
+      }
+      mBudget->step();
+    }
+
     MOZ_ASSERT(aEntry->mObject, "Null object in purple buffer");
     if (!aEntry->mRefCnt->get()) {
+      mSawSnowWhiteObjects = true;
       void* o = aEntry->mObject;
       nsCycleCollectionParticipant* cp = aEntry->mParticipant;
       ToParticipant(o, &cp);
       SnowWhiteObject swo = { o, cp, aEntry->mRefCnt };
-      mObjects.InfallibleAppend(swo);
+      if (!mBudget) {
+        mObjects.InfallibleAppend(swo);
+      }
       aBuffer.Remove(aEntry);
+      if (mBudget) {
+        MaybeKillObject(swo);
+      }
     }
     return true;
   }
@@ -2758,6 +2785,11 @@ public:
     return !mObjects.IsEmpty();
   }
 
+  bool SawSnowWhiteObjects() const
+  {
+    return mSawSnowWhiteObjects;
+  }
+
   virtual void Trace(JS::Heap<JS::Value>* aValue, const char* aName,
                      void* aClosure) const override
   {
@@ -2817,6 +2849,8 @@ public:
 private:
   RefPtr<nsCycleCollector> mCollector;
   ObjectsVector mObjects;
+  js::SliceBudget* mBudget;
+  bool mSawSnowWhiteObjects;
 };
 
 class RemoveSkippableVisitor : public SnowWhiteKiller
@@ -2925,6 +2959,23 @@ nsCycleCollector::FreeSnowWhite(bool aUntilNoSWInPurpleBuffer)
   return hadSnowWhiteObjects;
 }
 
+bool
+nsCycleCollector::FreeSnowWhiteWithBudget(js::SliceBudget& aBudget)
+{
+  CheckThreadSafety();
+
+  if (mFreeingSnowWhite) {
+    return false;
+  }
+
+  AutoRestore<bool> ar(mFreeingSnowWhite);
+  mFreeingSnowWhite = true;
+
+  SnowWhiteKiller visitor(this, &aBudget);
+  mPurpleBuf.VisitEntries(visitor);
+  return visitor.SawSnowWhiteObjects();;
+}
+
 void
 nsCycleCollector::ForgetSkippable(js::SliceBudget& aBudget,
                                   bool aRemoveChildlessNodes,
@@ -4320,6 +4371,19 @@ nsCycleCollector_doDeferredDeletion()
   return data->mCollector->FreeSnowWhite(false);
 }
 
+bool
+nsCycleCollector_doDeferredDeletionWithBudget(js::SliceBudget& aBudget)
+{
+  CollectorData* data = sCollectorData.get();
+
+  // We should have started the cycle collector by now.
+  MOZ_ASSERT(data);
+  MOZ_ASSERT(data->mCollector);
+  MOZ_ASSERT(data->mContext);
+
+  return data->mCollector->FreeSnowWhiteWithBudget(aBudget);
+}
+
 already_AddRefed<nsICycleCollectorLogSink>
 nsCycleCollector_createLogSink()
 {
diff --git a/xpcom/base/nsCycleCollector.h b/xpcom/base/nsCycleCollector.h
index 5b4f192e03da..7f18afa8e675 100644
--- a/xpcom/base/nsCycleCollector.h
+++ b/xpcom/base/nsCycleCollector.h
@@ -43,6 +43,7 @@ void nsCycleCollector_finishAnyCurrentCollection();
 void nsCycleCollector_dispatchDeferredDeletion(bool aContinuation = false,
                                                bool aPurge = false);
 bool nsCycleCollector_doDeferredDeletion();
+bool nsCycleCollector_doDeferredDeletionWithBudget(js::SliceBudget& aBudget);
 
 already_AddRefed<nsICycleCollectorLogSink> nsCycleCollector_createLogSink();
 
diff --git a/xpcom/ds/nsGkAtomList.h b/xpcom/ds/nsGkAtomList.h
index 563dd73783ff..1872b8998d62 100644
--- a/xpcom/ds/nsGkAtomList.h
+++ b/xpcom/ds/nsGkAtomList.h
@@ -279,6 +279,7 @@ GK_ATOM(decimalFormat, "decimal-format")
 GK_ATOM(decimalSeparator, "decimal-separator")
 GK_ATOM(declare, "declare")
 GK_ATOM(decoderDoctor, "decoder-doctor")
+GK_ATOM(decoding, "decoding")
 GK_ATOM(decrement, "decrement")
 GK_ATOM(_default, "default")
 GK_ATOM(headerDefaultStyle, "default-style")