Safely parallelize GC background finalization

Parallelize background finalization across zones within each finalize phase while preserving phase ordering and falling back to serial work when no helper thread is idle. Make compacting GC pointer updates schedule background work per zone and only when enough background-safe arenas exist.
Fix unsafe GC multithreading changes
2026-11-04 08:52:01 -05:00 · 2026-05-18 09:56:40 +02:00 · 2026-05-18 09:56:32 +02:00 · 2026-05-18 09:56:17 +02:00 · 2026-05-18 09:55:25 +02:00 · 2026-05-18 09:54:22 +02:00
2572 changed files with 133590 additions and 542078 deletions
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.

-Clobber for Issue #3027
+Clobber for Python 3 migration
@@ -1,8 +0,0 @@
-TRADEMARK NOTICE
-================
-
-The name "Goanna" and visual representations (logo) have not been
-registered by the Copyright owners as a trademark in any jurisdiction.
-However, because Goanna has been distributed and maintained world-wide,
-continually since 2015, the Copyright owners claim "common-law trademark
-protection" in any jurisdiction where common-law trademark is recognized.
@@ -18,6 +18,10 @@
 #endif
 #include <gtk/gtk.h>

+#if (MOZ_WIDGET_GTK == 3)
+extern "C" __attribute__((weak,visibility("default"))) int atk_bridge_adaptor_init(int*, char **[]);
+#endif
+
 using namespace mozilla;
 using namespace mozilla::a11y;

@@ -29,20 +33,12 @@ extern "C" {
 typedef GType (* AtkGetTypeType) (void);
 typedef void (*GnomeAccessibilityInit) (void);
 typedef void (*GnomeAccessibilityShutdown) (void);
-#if (MOZ_WIDGET_GTK == 3)
-typedef int (*AtkBridgeAdaptorInit) (int*, char***);
-#endif
 }

 static PRLibrary* sATKLib = nullptr;
 static const char sATKLibName[] = "libatk-1.0.so.0";
 static const char sATKHyperlinkImplGetTypeSymbol[] =
  "atk_hyperlink_impl_get_type";
-#if (MOZ_WIDGET_GTK == 3)
-static PRLibrary* sAtkBridgeAdaptorLib = nullptr;
-static const char sAtkBridgeAdaptorLibName[] = "libatk-bridge-2.0.so.0";
-static const char sAtkBridgeAdaptorInitSymbol[] = "atk_bridge_adaptor_init";
-#endif

 gboolean toplevel_event_watcher(GSignalInvocationHint*, guint, const GValue*,
                                gpointer);
@@ -131,38 +127,6 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
    return NS_OK;
 }

-#if (MOZ_WIDGET_GTK == 3)
-static bool
-InitAtkBridgeAdaptor()
-{
-  AtkBridgeAdaptorInit initBridge =
-    reinterpret_cast<AtkBridgeAdaptorInit>(
-      PR_FindFunctionSymbolAndLibrary(sAtkBridgeAdaptorInitSymbol,
-                                      &sAtkBridgeAdaptorLib));
-
-  if (!initBridge) {
-    sAtkBridgeAdaptorLib = PR_LoadLibrary(sAtkBridgeAdaptorLibName);
-    if (sAtkBridgeAdaptorLib) {
-      initBridge =
-        reinterpret_cast<AtkBridgeAdaptorInit>(
-          PR_FindFunctionSymbol(sAtkBridgeAdaptorLib,
-                                sAtkBridgeAdaptorInitSymbol));
-      if (!initBridge) {
-        PR_UnloadLibrary(sAtkBridgeAdaptorLib);
-        sAtkBridgeAdaptorLib = nullptr;
-      }
-    }
-  }
-
-  if (!initBridge) {
-    return false;
-  }
-
-  initBridge(nullptr, nullptr);
-  return true;
-}
-#endif
-
 void
 a11y::PlatformInit()
 {
@@ -217,7 +181,9 @@ a11y::PlatformInit()
  // Init atk-bridge now
  PR_SetEnv("NO_AT_BRIDGE=0");
 #if (MOZ_WIDGET_GTK == 3)
-  if (!InitAtkBridgeAdaptor())
+  if (atk_bridge_adaptor_init) {
+    atk_bridge_adaptor_init(nullptr, nullptr);
+  } else
 #endif
  {
    nsresult rv = LoadGtkModule(sAtkBridge);
@@ -262,13 +228,6 @@ a11y::PlatformShutdown()
        sAtkBridge.init = nullptr;
        sAtkBridge.shutdown = nullptr;
    }
-#if (MOZ_WIDGET_GTK == 3)
-    if (sAtkBridgeAdaptorLib) {
-        // Do not shutdown/unload atk-bridge; an exit function registered by
-        // the bridge will take care of it.
-        sAtkBridgeAdaptorLib = nullptr;
-    }
-#endif
 #if (MOZ_WIDGET_GTK == 2)
    if (sGail.lib) {
        // Do not shutdown gail because
@@ -276,7 +276,6 @@ NotificationController::DropMutationEvent(AccTreeMutationEvent* aEvent)
    MOZ_ASSERT(hideEvent);

    if (hideEvent->NeedsShutdown()) {
-      mDocument->UncacheChildrenInSubtree(aEvent->GetAccessible());
      mDocument->ShutdownChildrenInSubtree(aEvent->GetAccessible());
    }
  }
@@ -1307,8 +1307,6 @@ DocAccessible::UnbindFromDocument(Accessible* aAccessible)
 {
  NS_ASSERTION(mAccessibleCache.GetWeak(aAccessible->UniqueID()),
               "Unbinding the unbound accessible!");
-  MOZ_ASSERT(!mARIAOwnsHash.Contains(aAccessible),
-             "Container still lingering in mARIAOwnsHash");

  // Fire focus event on accessible having DOM focus if active item was removed
  // from the tree.
@@ -23,6 +23,7 @@ SOURCES += [
    'DocAccessibleWrap.cpp',
    'EnumVariant.cpp',
    'HTMLTableAccessibleWrap.cpp',
+    'HTMLWin32ObjectAccessible.cpp',
    'HyperTextAccessibleWrap.cpp',
    'ImageAccessibleWrap.cpp',
    'IUnknownImpl.cpp',
@@ -43,6 +43,8 @@ gyp_vars.update({
    'arm_neon': 0,
    'arm_neon_optional': 1,

+    'moz_webrtc_omx': 0,
+    'moz_webrtc_mediacodec': 0,

    # Turn off multi monitor screen share
    'multi_monitor_screenshare%' : 0,
@@ -344,7 +344,7 @@ def split_triplet(triplet):
    if cpu.endswith('86') or (cpu.startswith('i') and '86' in cpu):
        canonical_cpu = 'x86'
        endianness = 'little'
-    elif cpu == 'x86_64':
+    elif cpu in ('x86_64', 'ia64'):
        canonical_cpu = cpu
        endianness = 'little'
    elif cpu in ('s390', 's390x'):
@@ -152,7 +152,6 @@ def old_configure_options(*options):
    '--enable-jitspew',
    '--enable-js-lto',
    '--enable-leak-sanitizer',
-    '--enable-libaom',
    '--enable-libjpeg-turbo',
    '--enable-libproxy',
    '--enable-llvm-hacks',
@@ -164,7 +163,6 @@ def old_configure_options(*options):
    '--enable-negotiateauth',
    '--enable-nfc',
    '--enable-npapi',
-    '--enable-npapi-gtk2',
    '--enable-nspr-build',
    '--enable-official-branding',
    '--enable-official-vendor',
@@ -61,44 +61,6 @@ set_config('HAVE_YASM', have_yasm)
 # Until the YASM variable is not necessary in old-configure.
 add_old_configure_assignment('YASM', have_yasm)

-# nasm detection
-# ==============================================================
-nasm = check_prog('NASM', ['nasm'], allow_missing=True)
-
-@depends_if(nasm)
-@checking('nasm version')
-def nasm_version(nasm):
-    version = check_cmd_output(
-        nasm, '-v',
-        onerror=lambda: die('Failed to get nasm version.')
-    ).splitlines()[0].split()[2]
-    return Version(version)
-
-@depends(nasm, nasm_version)
-def have_nasm(nasm, version):
-    if nasm and version >= Version('2.14'):
-        return True
-
-set_config('HAVE_NASM', have_nasm)
-
-@depends(have_nasm, target)
-def nasm_asflags(have_nasm, target):
-    if have_nasm:
-        asflags = {
-            ('OSX', 'x86'): '-f macho32',
-            ('OSX', 'x86_64'): '-f macho64',
-            ('WINNT', 'x86'): '-f win32',
-            ('WINNT', 'x86_64'): '-f win64',
-        }.get((target.os, target.cpu), None)
-        if asflags is None:
-            if target.cpu == 'x86':
-                asflags = '-f elf32'
-            elif target.cpu == 'x86_64':
-                asflags = '-f elf64'
-        return asflags
-
-set_config('NASM_ASFLAGS', nasm_asflags)
-
 # MacOS deployment target version
 # ==============================================================
 # This needs to happen before any compilation test is done.
@@ -290,6 +290,11 @@ fi
 if [ -n "$LD_LIBRARY_PATH_64" ]; then
 	LD_LIBRARY_PATH_64=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH_64:+":$LD_LIBRARY_PATH_64"}
 fi
+#
+#
+## Set SHLIB_PATH for HPUX
+SHLIB_PATH=${MOZ_DIST_BIN}:${MRE_HOME}${SHLIB_PATH:+":$SHLIB_PATH"}
+#
 ## Set LIBPATH for AIX
 LIBPATH=${MOZ_DIST_BIN}:${MRE_HOME}${LIBPATH:+":$LIBPATH"}
 #
@@ -334,6 +339,7 @@ then
  fi
  echo "DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH"
  echo "     LIBRARY_PATH=$LIBRARY_PATH"
+  echo "       SHLIB_PATH=$SHLIB_PATH"
  echo "          LIBPATH=$LIBPATH"
  echo "       ADDON_PATH=$ADDON_PATH"
  echo "      MOZ_PROGRAM=$MOZ_PROGRAM"
@@ -344,7 +350,7 @@ then
 fi
 #
 export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
-export LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
+export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH

 if [ $moz_debug -eq 1 ]
 then
@@ -26,6 +26,6 @@
    global DATA_SYMBOL
 %endif

-SECTION .rodata data readable align=16
+SECTION .rodata align=16
 DATA_SYMBOL:
        incbin ICU_DATA_FILE
@@ -6,13 +6,7 @@
 .section .note.GNU-stack,"",%progbits
 #endif
 .global ICU_DATA_SYMBOL
-#if defined(__APPLE__)
-.const
-#elif defined(__GNUC__) && !defined(XP_SOLARIS)
-.section .rodata
-#else
 .data
-#endif
 .balign 16
 ICU_DATA_SYMBOL:
        .incbin ICU_DATA_FILE
@@ -17,8 +17,6 @@ DEFINES.update(
    UCONFIG_NO_LEGACY_CONVERSION = True,
    UCONFIG_NO_TRANSLITERATION = True,
    UCONFIG_NO_REGULAR_EXPRESSIONS = True,
-    UCONFIG_NO_BREAK_ITERATION = True,
-    UCONFIG_NO_MF2 = True,

    # We don't need to pass data to and from legacy char* APIs.
    U_CHARSET_IS_UTF8 = True,
@@ -29,10 +29,7 @@ if CONFIG['MOZ_WEBM_ENCODER']:
 external_dirs += ['media/libvpx']

 if CONFIG['MOZ_AV1']:
-    if CONFIG['AV1_USE_AOM']:
-        external_dirs += ['media/libaom']
-    else:
-        external_dirs += ['media/libdav1d']
+    external_dirs += ['media/libaom']

 external_dirs += ['media/libpng']

@@ -81,7 +81,7 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/
 		--track install_$(subst /,_,$*).track \
 		$(TOPOBJDIR)/$* \
 		-DAB_CD=en-US \
-		-DBOOKMARKS_INCLUDE_DIR=$(TOPSRCDIR)/$(MOZ_BUILD_APP)/locales/en-US/profile \
+		-DBOOKMARKS_INCLUDE_DIR=$(TOPSRCDIR)/browser/locales/en-US/profile \
 		$(ACDEFINES) \
 		install_$(subst /,_,$*)

@@ -448,6 +448,7 @@ gtk/gtkx.h
 gtk/gtkunixprint.h
 HIToolbox/HIToolbox.h
 hlink.h
+ia64/sys/inline.h
 Icons.h
 iconv.h
 ieeefp.h
@@ -143,8 +143,7 @@ TooltipsOverlay.prototype = {
    // Font preview tooltip
    if (type === VIEW_NODE_VALUE_TYPE && prop.property === "font-family") {
      let value = prop.value.toLowerCase();
-      if (value !== "inherit" && value !== "unset" && value !== "initial" &&
-          value !== "revert" && value !== "revert-layer") {
+      if (value !== "inherit" && value !== "unset" && value !== "initial" && value !== "revert") {
        tooltipType = TOOLTIP_FONTFAMILY_TYPE;
      }
    }
@@ -204,22 +204,21 @@ function initialHTML(doc) {
    os = "linux";
  }

-  // The appRoot URI is prepended to all URIs instead of using a <base> element
-  // because the latter can cause spurious network requests (UXP Issue #3122)
-  let appRoot = "resource://devtools/client/jsonview/";
+  let base = doc.createElement("base");
+  base.href = "resource://devtools/client/jsonview/";

  let style = doc.createElement("link");
  style.rel = "stylesheet";
  style.type = "text/css";
-  style.href = appRoot +"css/main.css";
+  style.href = "css/main.css";

  let script = doc.createElement("script");
-  script.src = appRoot + "lib/require.js";
-  script.dataset.main = appRoot + "viewer-config.js";
+  script.src = "lib/require.js";
+  script.dataset.main = "viewer-config";
  script.defer = true;

  let head = doc.createElement("head");
-  head.append(style, script);
+  head.append(base, style, script);

  return "<!DOCTYPE html>\n" +
    startTag("html", {
@@ -4,8 +4,6 @@ subsuite = devtools
 support-files =
  array_json.json
  array_json.json^headers^
-  csp_json.json
-  csp_json.json^headers^
  doc_frame_script.js
  head.js
  invalid_json.json
@@ -24,7 +22,6 @@ subsuite = clipboard
 subsuite = clipboard
 [browser_jsonview_copy_rawdata.js]
 subsuite = clipboard
-[browser_jsonview_csp_json.js]
 [browser_jsonview_filter.js]
 [browser_jsonview_invalid_json.js]
 [browser_jsonview_valid_json.js]
@@ -1,17 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-const TEST_JSON_URL = URL_ROOT + "csp_json.json";
-
-add_task(function* () {
-  info("Test CSP JSON started");
-
-  yield addJsonViewTab(TEST_JSON_URL);
-
-  let count = yield getElementCount(".jsonPanelBox .treeTable .treeRow");
-  is(count, 1, "There must be one row");
-});
@@ -1 +0,0 @@
-{"csp": true}
@@ -1,2 +0,0 @@
-Content-Type: application/json
-Content-Security-Policy: default-src 'none'; base-uri 'none';
@@ -23,7 +23,7 @@
 * of the code base, so it's consistent and modules can be easily reused.
 */
 require.config({
-  baseUrl: "resource://devtools/client/jsonview/",
+  baseUrl: ".",
  paths: {
    "devtools/client/shared": "resource://devtools/client/shared",
    "devtools/shared": "resource://devtools/shared",
@@ -3,6 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
    'devtools.js',
 ]
@@ -10,8 +10,7 @@ const SPECIALVALUES = new Set([
  "initial",
  "inherit",
  "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);

 const {getCSSLexer} = require("devtools/shared/css/lexer");
@@ -99,14 +99,7 @@ const filterList = [
 ];

 // Valid values that shouldn't be parsed for filters.
-const SPECIAL_VALUES = new Set([
-  "none",
-  "unset",
-  "initial",
-  "inherit",
-  "revert",
-  "revert-layer"
-]);
+const SPECIAL_VALUES = new Set(["none", "unset", "initial", "inherit", "revert"]);

 /**
 * A CSS Filter editor widget used to add/remove/modify
@@ -103,6 +103,12 @@ function StyleSheetEditor(styleSheet, win, file, isNew, walker, highlighter) {
    }
  };

+  this._styleSheetFilePath = null;
+  if (styleSheet.href &&
+      Services.io.extractScheme(this.styleSheet.href) == "file") {
+    this._styleSheetFilePath = this.styleSheet.href;
+  }
+
  this._onPropertyChange = this._onPropertyChange.bind(this);
  this._onError = this._onError.bind(this);
  this._onMediaRuleMatchesChange = this._onMediaRuleMatchesChange.bind(this);
@@ -658,7 +664,8 @@ StyleSheetEditor.prototype = {
    if (this._friendlyName) {
      defaultName = OS.Path.basename(this._friendlyName);
    }
-    showFilePicker(file, true, this._window, onFile, defaultName);
+    showFilePicker(file || this._styleSheetFilePath, true, this._window,
+                   onFile, defaultName);
  },

  /**
@@ -1,112 +1,98 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-"use strict";
-
-// Test that 'Save' function works.
-
-const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
-const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
-
-var tempScope = {};
-Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
-Components.utils.import("resource://gre/modules/NetUtil.jsm", tempScope);
-var FileUtils = tempScope.FileUtils;
-var NetUtil = tempScope.NetUtil;
-
-add_task(function* () {
-  let htmlFile = yield copy(TESTCASE_URI_HTML, "simple.html");
-  const cssFile = await copy(TESTCASE_URI_CSS, "simple.css");
-  let uri = Services.io.newFileURI(htmlFile);
-  let filePath = uri.resolve("");
-
-  let { ui } = yield openStyleEditorForURL(filePath);
-
-  let editor = ui.editors[0];
-  yield editor.getSourceEditor();
-
-  is(
-    editor.savedFile,
-    null,
-    "savedFile should not be pre-populated from the source file"
-  );
-
-  info("Editing the style sheet.");
-  let dirty = editor.sourceEditor.once("dirty-change");
-  let beginCursor = {line: 0, ch: 0};
-  editor.sourceEditor.replaceText("DIRTY TEXT", beginCursor, beginCursor);
-
-  yield dirty;
-
-  is(editor.sourceEditor.isClean(), false, "Editor is dirty.");
-  ok(editor.summary.classList.contains("unsaved"),
-     "Star icon is present in the corresponding summary.");
-
-  info(
-    "Saving the changes with an explicit file (simulating a user-chosen save location)."
-  );
-  dirty = editor.sourceEditor.once("dirty-change");
-
-  editor.saveToFile(cssFile, function (file) {
-    ok(file, "file should get saved when explicitly passing a file");
-  });
-
-  yield dirty;
-
-  is(editor.sourceEditor.isClean(), true, "Editor is clean.");
-  ok(!editor.summary.classList.contains("unsaved"),
-     "Star icon is not present in the corresponding summary.");
-
-  is(
-    editor.savedFile?.path,
-    cssFile.path,
-    "savedFile should now be set on the editor"
-  );
-});
-
-function copy(srcChromeURL, destFileName) {
-  let deferred = defer();
-  let destFile = FileUtils.getFile("ProfD", [destFileName]);
-  write(read(srcChromeURL), destFile, deferred.resolve);
-
-  return deferred.promise;
-}
-
-function read(srcChromeURL) {
-  let scriptableStream = Cc["@mozilla.org/scriptableinputstream;1"]
-    .getService(Ci.nsIScriptableInputStream);
-
-  let channel = NetUtil.newChannel({
-    uri: srcChromeURL,
-    loadUsingSystemPrincipal: true
-  });
-  let input = channel.open2();
-  scriptableStream.init(input);
-
-  let data = "";
-  while (input.available()) {
-    data = data.concat(scriptableStream.read(input.available()));
-  }
-  scriptableStream.close();
-  input.close();
-
-  return data;
-}
-
-function write(data, file, callback) {
-  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-    .createInstance(Ci.nsIScriptableUnicodeConverter);
-
-  converter.charset = "UTF-8";
-
-  let istream = converter.convertToInputStream(data);
-  let ostream = FileUtils.openSafeFileOutputStream(file);
-
-  NetUtil.asyncCopy(istream, ostream, function (status) {
-    if (!Components.isSuccessCode(status)) {
-      info("Couldn't write to " + file.path);
-      return;
-    }
-
-    callback(file);
-  });
-}
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+"use strict";
+
+// Test that 'Save' function works.
+
+const TESTCASE_URI_HTML = TEST_BASE_HTTP + "simple.html";
+const TESTCASE_URI_CSS = TEST_BASE_HTTP + "simple.css";
+
+var tempScope = {};
+Components.utils.import("resource://gre/modules/FileUtils.jsm", tempScope);
+Components.utils.import("resource://gre/modules/NetUtil.jsm", tempScope);
+var FileUtils = tempScope.FileUtils;
+var NetUtil = tempScope.NetUtil;
+
+add_task(function* () {
+  let htmlFile = yield copy(TESTCASE_URI_HTML, "simple.html");
+  yield copy(TESTCASE_URI_CSS, "simple.css");
+  let uri = Services.io.newFileURI(htmlFile);
+  let filePath = uri.resolve("");
+
+  let { ui } = yield openStyleEditorForURL(filePath);
+
+  let editor = ui.editors[0];
+  yield editor.getSourceEditor();
+
+  info("Editing the style sheet.");
+  let dirty = editor.sourceEditor.once("dirty-change");
+  let beginCursor = {line: 0, ch: 0};
+  editor.sourceEditor.replaceText("DIRTY TEXT", beginCursor, beginCursor);
+
+  yield dirty;
+
+  is(editor.sourceEditor.isClean(), false, "Editor is dirty.");
+  ok(editor.summary.classList.contains("unsaved"),
+     "Star icon is present in the corresponding summary.");
+
+  info("Saving the changes.");
+  dirty = editor.sourceEditor.once("dirty-change");
+
+  editor.saveToFile(null, function (file) {
+    ok(file, "file should get saved directly when using a file:// URI");
+  });
+
+  yield dirty;
+
+  is(editor.sourceEditor.isClean(), true, "Editor is clean.");
+  ok(!editor.summary.classList.contains("unsaved"),
+     "Star icon is not present in the corresponding summary.");
+});
+
+function copy(srcChromeURL, destFileName) {
+  let deferred = defer();
+  let destFile = FileUtils.getFile("ProfD", [destFileName]);
+  write(read(srcChromeURL), destFile, deferred.resolve);
+
+  return deferred.promise;
+}
+
+function read(srcChromeURL) {
+  let scriptableStream = Cc["@mozilla.org/scriptableinputstream;1"]
+    .getService(Ci.nsIScriptableInputStream);
+
+  let channel = NetUtil.newChannel({
+    uri: srcChromeURL,
+    loadUsingSystemPrincipal: true
+  });
+  let input = channel.open2();
+  scriptableStream.init(input);
+
+  let data = "";
+  while (input.available()) {
+    data = data.concat(scriptableStream.read(input.available()));
+  }
+  scriptableStream.close();
+  input.close();
+
+  return data;
+}
+
+function write(data, file, callback) {
+  let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
+    .createInstance(Ci.nsIScriptableUnicodeConverter);
+
+  converter.charset = "UTF-8";
+
+  let istream = converter.convertToInputStream(data);
+  let ostream = FileUtils.openSafeFileOutputStream(file);
+
+  NetUtil.asyncCopy(istream, ostream, function (status) {
+    if (!Components.isSuccessCode(status)) {
+      info("Couldn't write to " + file.path);
+      return;
+    }
+
+    callback(file);
+  });
+}
@@ -28,10 +28,7 @@ add_task(function* () {
  let HTMLFile = yield copy(TESTCASE_URI_HTML, ["sourcemaps.html"]);
  let CSSFile = yield copy(TESTCASE_URI_CSS,
    ["sourcemap-css", "sourcemaps.css"]);
-  const SCSSFile = await copy(TESTCASE_URI_SCSS, [
-    "sourcemap-sass",
-    "sourcemaps.scss",
-  ]);
+  yield copy(TESTCASE_URI_SCSS, ["sourcemap-sass", "sourcemaps.scss"]);
  yield copy(TESTCASE_URI_MAP, ["sourcemap-css", "sourcemaps.css.map"]);
  yield copy(TESTCASE_URI_REG_CSS, ["simple.css"]);

@@ -62,7 +59,7 @@ add_task(function* () {

  // Edit and save Sass in the editor. This will start off a file-watching
  // process waiting for the CSS file to change.
-  yield editSCSS(SCSSFile, editor);
+  yield editSCSS(editor);

  // We can't run Sass or another compiler, so we fake it by just
  // directly changing the CSS file.
@@ -76,12 +73,12 @@ add_task(function* () {
  is(color, "rgb(0, 0, 255)", "div is blue after saving file");
 });

-function editSCSS(SCSSFile, editor) {
+function editSCSS(editor) {
  let deferred = defer();

  editor.sourceEditor.setText(CSS_TEXT);

-  editor.saveToFile(SCSSFile, function (file) {
+  editor.saveToFile(null, function (file) {
    ok(file, "Scss file should be saved");
    deferred.resolve();
  });
@@ -20,8 +20,7 @@ const SPECIALVALUES = new Set([
  "inherit",
  "transparent",
  "unset",
-  "revert",
-  "revert-layer"
+  "revert"
 ]);

 /**
@@ -43,7 +43,7 @@ class MachCommands(MachCommandBase):
        if not os.path.exists(generated_dir):
            generated_dir = mozpath.join(self.topsrcdir, 'platform',
                'devtools/shared/css/generated')
-        if not os.path.exists(generated_dir):
+        else:
            raise Exception('Directory expected at %s does not exist.' % generated_dir)
        self.generated_dir = generated_dir

@@ -75,9 +75,6 @@ class MachCommands(MachCommandBase):
        contents = subprocess.check_output([xpcshell_path, '-g', gre_path,
                                            '-a', browser_path, script_path],
                                           env = sub_env)
-        if not isinstance(contents, str):
-            contents = contents.decode('utf-8')
-
        # Extract just the output between the delimiters as the xpcshell output can
        # have extra output that we don't want.
        contents = contents.split('DEVTOOLS_CSS_DB_DELIMITER')[1]
@@ -91,13 +88,13 @@ class MachCommands(MachCommandBase):
        destination_path = mozpath.join(self.generated_dir,
            'properties-db.js')

-        with open(js_template_path, 'r') as handle:
+        with open(js_template_path, 'rb') as handle:
            js_template = handle.read()

        preamble = '/* THIS IS AN AUTOGENERATED FILE.  DO NOT EDIT */\n\n'
        contents = string.Template(js_template).substitute(substitutions)

-        with open(destination_path, 'w') as destination:
+        with open(destination_path, 'wb') as destination:
            destination.write(preamble + contents)

        print(('The database was successfully generated at ' + destination_path))
@@ -31,7 +31,6 @@ public:
    void
    Unfollow();

-    /* Should this be WeakRef? */
    RefPtr<AbortSignal> mFollowingSignal;
  };

@@ -5,19 +5,13 @@

 #include "DocumentOrShadowRoot.h"
 #include "mozilla/EventStateManager.h"
-#include "mozilla/CSSStyleSheet.h"
-#include "mozilla/ErrorResult.h"
-#include "mozilla/dom/BindingUtils.h"
-#include "mozilla/dom/CSSStyleSheetBinding.h"
 #include "mozilla/dom/StyleSheetList.h"
-#include "mozilla/dom/ToJSValue.h"
 #include "nsDocument.h"
 #include "nsFocusManager.h"
 #include "ShadowRoot.h"
 #include "XULDocument.h"
 #include "nsLayoutUtils.h"
 #include "nsSVGUtils.h"
-#include "jsapi.h"

 class nsINode;
 class nsIDocument;
@@ -49,99 +43,6 @@ DocumentOrShadowRoot::EnsureDOMStyleSheets()
  return *mDOMStyleSheets;
 }

-void
-DocumentOrShadowRoot::GetAdoptedStyleSheets(
-    JSContext* aCx,
-    JS::MutableHandle<JSObject*> aResult,
-    ErrorResult& aRv) const
-{
-  JS::Rooted<JS::Value> value(aCx);
-  if (!ToJSValue(aCx, mAdoptedStyleSheets, &value)) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return;
-  }
-
-  MOZ_ASSERT(value.isObject());
-  aResult.set(&value.toObject());
-}
-
-void
-DocumentOrShadowRoot::SetAdoptedStyleSheets(
-    JSContext* aCx,
-    JS::Handle<JSObject*> aSheets,
-    ErrorResult& aRv)
-{
-  bool isArray = false;
-  if (!JS_IsArrayObject(aCx, aSheets, &isArray)) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  if (!isArray) {
-    aRv.ThrowTypeError<MSG_NOT_SEQUENCE>(
-      NS_LITERAL_STRING("DocumentOrShadowRoot.adoptedStyleSheets"));
-    return;
-  }
-
-  uint32_t length = 0;
-  if (!JS_GetArrayLength(aCx, aSheets, &length)) {
-    aRv.Throw(NS_ERROR_FAILURE);
-    return;
-  }
-
-  nsIDocument* document = AsNode().OwnerDoc();
-  nsTArray<RefPtr<CSSStyleSheet>> newSheets;
-  if (!newSheets.SetCapacity(length, fallible)) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return;
-  }
-
-  JS::Rooted<JS::Value> value(aCx);
-  for (uint32_t i = 0; i < length; ++i) {
-    if (!JS_GetElement(aCx, aSheets, i, &value)) {
-      aRv.Throw(NS_ERROR_FAILURE);
-      return;
-    }
-
-    if (!value.isObject()) {
-      aRv.ThrowTypeError<MSG_DOES_NOT_IMPLEMENT_INTERFACE>(
-        NS_LITERAL_STRING("Element of DocumentOrShadowRoot.adoptedStyleSheets"),
-        NS_LITERAL_STRING("CSSStyleSheet"));
-      return;
-    }
-
-    RefPtr<CSSStyleSheet> sheet;
-    nsresult rv = UnwrapObject<prototypes::id::CSSStyleSheet,
-                               CSSStyleSheet>(&value.toObject(), sheet);
-    if (NS_FAILED(rv)) {
-      aRv.ThrowTypeError<MSG_DOES_NOT_IMPLEMENT_INTERFACE>(
-        NS_LITERAL_STRING("Element of DocumentOrShadowRoot.adoptedStyleSheets"),
-        NS_LITERAL_STRING("CSSStyleSheet"));
-      return;
-    }
-
-    if (!sheet->IsConstructed() || sheet->ConstructorDocument() != document) {
-      aRv.Throw(NS_ERROR_DOM_NOT_ALLOWED_ERR);
-      return;
-    }
-
-    newSheets.AppendElement(sheet);
-  }
-
-  nsTArray<RefPtr<CSSStyleSheet>> oldSheets;
-  oldSheets.SwapElements(mAdoptedStyleSheets);
-  mAdoptedStyleSheets.SwapElements(newSheets);
-
-  if (mKind == Kind::Document) {
-    static_cast<nsDocument&>(AsNode()).AdoptedStyleSheetsChanged(oldSheets,
-                                                                 mAdoptedStyleSheets);
-    return;
-  }
-
-  static_cast<ShadowRoot&>(AsNode()).AdoptedStyleSheetsChanged(oldSheets,
-                                                              mAdoptedStyleSheets);
-}
-
 Element*
 DocumentOrShadowRoot::GetElementById(const nsAString& aElementId)
 {
@@ -11,14 +11,11 @@
 #include "nsContentListDeclarations.h"
 #include "nsNameSpaceManager.h"
 #include "mozilla/dom/NameSpaceConstants.h"
-#include "js/RootingAPI.h"

 class nsContentList;
 class nsINode;

 namespace mozilla {
-class CSSStyleSheet;
-class ErrorResult;
 class StyleSheet;

 namespace dom {
@@ -86,18 +83,6 @@ public:

  StyleSheetList& EnsureDOMStyleSheets();

-  void GetAdoptedStyleSheets(JSContext* aCx,
-                             JS::MutableHandle<JSObject*> aResult,
-                             mozilla::ErrorResult& aRv) const;
-  void SetAdoptedStyleSheets(JSContext* aCx,
-                             JS::Handle<JSObject*> aSheets,
-                             mozilla::ErrorResult& aRv);
-
-  const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& AdoptedStyleSheets() const
-  {
-    return mAdoptedStyleSheets;
-  }
-
  Element* GetElementById(const nsAString& aElementId);

  /**
@@ -166,7 +151,6 @@ protected:
  Element* GetRetargetedFocusedElement();

  nsTArray<RefPtr<mozilla::StyleSheet>> mStyleSheets;
-  nsTArray<RefPtr<mozilla::CSSStyleSheet>> mAdoptedStyleSheets;
  RefPtr<mozilla::dom::StyleSheetList> mDOMStyleSheets;

  /*
@@ -196,7 +196,7 @@ public:
  {
    MOZ_ASSERT(!NS_IsMainThread());

-    int32_t written = mLength < INT32_MAX ? PR_Write(mFD, mData, mLength) : -1;
+    int32_t written = PR_Write(mFD, mData, mLength);
    if (NS_WARN_IF(written < 0 || uint32_t(written) != mLength)) {
      return NS_DispatchToMainThread(
        new ErrorPropagationRunnable(mBlobStorage, NS_ERROR_FAILURE));
@@ -18,7 +18,6 @@
 #include "mozilla/dom/StyleSheetList.h"
 #include "nsXBLPrototypeBinding.h"
 #include "mozilla/BasicEvents.h"
-#include "mozilla/CSSStyleSheet.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/StyleSheetInlines.h"
@@ -31,7 +30,6 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(ShadowRoot)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(ShadowRoot,
                                                  DocumentFragment)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDOMStyleSheets)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAdoptedStyleSheets)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAssociatedBinding)
  for (auto iter = tmp->mIdentifierMap.ConstIter(); !iter.Done();
       iter.Next()) {
@@ -44,10 +42,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(ShadowRoot)
    tmp->GetHost()->RemoveMutationObserver(tmp);
  }
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDOMStyleSheets)
-  for (CSSStyleSheet* sheet : tmp->mAdoptedStyleSheets) {
-    sheet->RemoveAdopter(tmp);
-  }
-  tmp->mAdoptedStyleSheets.Clear();
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mAssociatedBinding)
  tmp->mIdentifierMap.Clear();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED(DocumentFragment)
@@ -96,11 +90,6 @@ ShadowRoot::~ShadowRoot()
    host->RemoveMutationObserver(this);
  }

-  for (CSSStyleSheet* sheet : mAdoptedStyleSheets) {
-    sheet->RemoveAdopter(this);
-  }
-  mAdoptedStyleSheets.Clear();
-
  UnsetFlags(NODE_IS_IN_SHADOW_TREE);

  // nsINode destructor expects mSubtreeRoot == this.
@@ -281,20 +270,15 @@ ShadowRoot::InsertSheet(StyleSheet* aSheet,

  linkingElement->SetStyleSheet(aSheet); // This sets the ownerNode on the sheet

-  MOZ_DIAGNOSTIC_ASSERT(mProtoBinding->SheetCount() ==
-                        DocumentOrShadowRoot::SheetCount() +
-                        mAdoptedStyleSheets.Length());
+  MOZ_DIAGNOSTIC_ASSERT(mProtoBinding->SheetCount() == DocumentOrShadowRoot::SheetCount());
 #ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  // FIXME(emilio, bug 1425759): For now we keep regular sheets duplicated;
-  // adopted sheets are stored as a suffix on the proto binding only.
+  // FIXME(emilio, bug 1425759): For now we keep them duplicated, the proto
+  // binding will disappear soon (tm).
  {
    size_t i = 0;
    for (RefPtr<StyleSheet>& sheet : mStyleSheets) {
      MOZ_DIAGNOSTIC_ASSERT(sheet.get() == mProtoBinding->StyleSheetAt(i++));
    }
-    for (RefPtr<CSSStyleSheet>& sheet : mAdoptedStyleSheets) {
-      MOZ_DIAGNOSTIC_ASSERT(sheet.get() == mProtoBinding->StyleSheetAt(i++));
-    }
  }
 #endif

@@ -303,7 +287,7 @@ ShadowRoot::InsertSheet(StyleSheet* aSheet,
  for (size_t i = 0; i <= SheetCount(); i++) {
    if (i == SheetCount()) {
      AppendStyleSheet(*aSheet);
-      mProtoBinding->InsertStyleSheetAt(i, aSheet);
+      mProtoBinding->AppendStyleSheet(aSheet);
      break;
    }

@@ -338,39 +322,6 @@ ShadowRoot::RemoveSheet(StyleSheet* aSheet)
  }
 }

-void
-ShadowRoot::AdoptedStyleSheetsChanged(
-    const nsTArray<RefPtr<CSSStyleSheet>>& aOldSheets,
-    const nsTArray<RefPtr<CSSStyleSheet>>& aNewSheets)
-{
-  OwnerDoc()->BeginUpdate(UPDATE_STYLE);
-
-  bool applicableChange = false;
-  for (size_t i = 0; i < aOldSheets.Length(); ++i) {
-    CSSStyleSheet* sheet = aOldSheets[i];
-    if (aOldSheets.IndexOf(sheet) == i) {
-      mProtoBinding->RemoveStyleSheet(sheet);
-    }
-    applicableChange = applicableChange || sheet->IsApplicable();
-    sheet->RemoveAdopter(this);
-  }
-
-  for (size_t i = 0; i < aNewSheets.Length(); ++i) {
-    CSSStyleSheet* sheet = aNewSheets[i];
-    sheet->AddAdopter(this);
-    if (aNewSheets.IndexOf(sheet) == i) {
-      mProtoBinding->AppendStyleSheet(sheet);
-    }
-    applicableChange = applicableChange || sheet->IsApplicable();
-  }
-
-  if (applicableChange) {
-    StyleSheetChanged();
-  }
-
-  OwnerDoc()->EndUpdate(UPDATE_STYLE);
-}
-
 void
 ShadowRoot::AddToIdTable(Element* aElement, nsIAtom* aId)
 {
@@ -21,7 +21,6 @@ class nsXBLPrototypeBinding;

 namespace mozilla {

-class CSSStyleSheet;
 class EventChainPreVisitor;

 namespace dom {
@@ -60,9 +59,6 @@ public:
  // [deprecated] Shadow DOM v0
  void InsertSheet(StyleSheet* aSheet, nsIContent* aLinkingContent);
  void RemoveSheet(StyleSheet* aSheet);
-  void AdoptedStyleSheetsChanged(
-      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aOldSheets,
-      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aNewSheets);
  StyleSheetList* StyleSheets()
  {
    return &DocumentOrShadowRoot::EnsureDOMStyleSheets();
@@ -177,3 +173,4 @@ protected:
 } // namespace mozilla

 #endif // mozilla_dom_shadowroot_h__
+
@@ -40,14 +40,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(Timeout)

 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Timeout)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mTimer)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mPrincipal)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mScriptHandler)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END

 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Timeout)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTimer)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPrincipal)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mScriptHandler)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
@@ -25,22 +25,6 @@ VisualViewport::~VisualViewport()
 {
 }

-NS_IMPL_CYCLE_COLLECTION_CLASS(VisualViewport)
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(VisualViewport,
-                                                  DOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(VisualViewport,
-                                                DOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(VisualViewport)
-NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
-
-NS_IMPL_ADDREF_INHERITED(VisualViewport, DOMEventTargetHelper)
-NS_IMPL_RELEASE_INHERITED(VisualViewport, DOMEventTargetHelper)
-
 /* virtual */
 JSObject*
 VisualViewport::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
@@ -21,9 +21,6 @@ class VisualViewport final: public mozilla::DOMEventTargetHelper
 {

 public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(VisualViewport, DOMEventTargetHelper)
-
  explicit VisualViewport(nsPIDOMWindowInner* aWindow);
  explicit VisualViewport(nsIGlobalObject* aGlobal);

@@ -274,7 +274,7 @@ public:
    }

    template<typename T,
-             typename = typename std::enable_if_t<std::is_enum_v<T>>>
+             typename = typename std::enable_if<std::is_enum<T>::value>::type>
    EnumTable(const char* aTag, T aValue)
      : tag(aTag)
      , value(static_cast<int16_t>(aValue))
@@ -695,7 +695,7 @@ nsContentList::ContentAppended(nsIDocument* aDocument, nsIContent* aContainer,
      !MayContainRelevantNodes(aContainer) ||
      (!aFirstNewContent->HasChildren() &&
       !aFirstNewContent->GetNextSibling() &&
-       !MatchSelf<MatchSelfMode::Insertion>(aFirstNewContent))) {
+       !MatchSelf(aFirstNewContent))) {
    return;
  }

@@ -731,7 +731,7 @@ nsContentList::ContentAppended(nsIDocument* aDocument, nsIContent* aContainer,
      // The new stuff is somewhere in the middle of our list; check
      // whether we need to invalidate
      for (nsIContent* cur = aFirstNewContent; cur; cur = cur->GetNextSibling()) {
-        if (MatchSelf<MatchSelfMode::Insertion>(cur)) {
+        if (MatchSelf(cur)) {
          // Uh-oh.  We're gonna have to add elements into the middle
          // of our list. That's not worth the effort.
          SetDirty();
@@ -788,7 +788,7 @@ nsContentList::ContentInserted(nsIDocument *aDocument,
  if (mState != LIST_DIRTY &&
      MayContainRelevantNodes(NODE_FROM(aContainer, aDocument)) &&
      nsContentUtils::IsInSameAnonymousTree(mRootNode, aChild) &&
-      MatchSelf<MatchSelfMode::Insertion>(aChild)) {
+      MatchSelf(aChild)) {
    SetDirty();
  }

@@ -808,7 +808,7 @@ nsContentList::ContentRemoved(nsIDocument *aDocument,
  if (mState != LIST_DIRTY &&
      MayContainRelevantNodes(NODE_FROM(aContainer, aDocument)) &&
      nsContentUtils::IsInSameAnonymousTree(mRootNode, aChild) &&
-      MatchSelf<MatchSelfMode::Removal>(aChild)) {
+      MatchSelf(aChild)) {
    SetDirty();
  }

@@ -853,7 +853,6 @@ nsContentList::Match(Element *aElement)
                     ni->Equals(mXMLMatchAtom, mMatchNameSpaceId);
 }

-template <nsContentList::MatchSelfMode Mode>
 bool 
 nsContentList::MatchSelf(nsIContent *aContent)
 {
@@ -865,20 +864,8 @@ nsContentList::MatchSelf(nsIContent *aContent)
    return false;
  }
  
-  auto matches = [&](Element* aElement) {
-    if (Match(aElement)) {
-      return true;
-    }
-    if constexpr (Mode == MatchSelfMode::Removal) {
-      return mFunc == nsContentUtils::MatchClassNames &&
-             aElement->IsSVGElement() && aElement->MayHaveClass();
-    }
-    return false;
-  };
-
-  if (matches(aContent->AsElement())) {
+  if (Match(aContent->AsElement()))
    return true;
-  }

  if (!mDeep)
    return false;
@@ -886,7 +873,7 @@ nsContentList::MatchSelf(nsIContent *aContent)
  for (nsIContent* cur = aContent->GetFirstChild();
       cur;
       cur = cur->GetNextNode(aContent)) {
-    if (cur->IsElement() && matches(cur->AsElement())) {
+    if (cur->IsElement() && Match(cur->AsElement())) {
      return true;
    }
  }
@@ -367,15 +367,6 @@ protected:
   * @return whether we match
   */
  bool Match(mozilla::dom::Element *aElement);
-
-  enum class MatchSelfMode : uint8_t {
-    Insertion,
-    // Also accept SVG elements that may have a class. SMIL can change their
-    // class without notification, so they can be in the list without
-    // matching now. Needed when aContent leaves the subtree.
-    Removal,
-  };
-
  /**
   * See if anything in the subtree rooted at aContent, including
   * aContent itself, matches our criterion.
@@ -383,7 +374,6 @@ protected:
   * @param  aContent the root of the subtree to match against
   * @return whether we match something in the tree rooted at aContent
   */
-  template <MatchSelfMode Mode>
  bool MatchSelf(nsIContent *aContent);

  /**
@@ -2073,10 +2073,6 @@ public:
                                          aClasses);
  }

-  static bool MatchClassNames(mozilla::dom::Element* aElement,
-                              int32_t aNamespaceID,
-                              nsIAtom* aAtom, void* aData);
-
  /**
   * Returns a presshell for this document, if there is one. This will be
   * aDoc's direct presshell if there is one, otherwise we'll look at all
@@ -3016,6 +3012,9 @@ private:

  static void DropFragmentParsers();

+  static bool MatchClassNames(mozilla::dom::Element* aElement,
+                              int32_t aNamespaceID,
+                              nsIAtom* aAtom, void* aData);
  static void DestroyClassNameArray(void* aData);
  static void* AllocClassMatchingInfo(nsINode* aRootNode,
                                      const nsString* aClasses);
@@ -921,7 +921,7 @@ private:
  // List of nodes referred to by mEntryTable so we can sort them
  // For a specific pseudo element, we use its parent element as the
  // batch target, so they will be put in the same EntryArray.
-  nsTArray<nsCOMPtr<nsINode>> mBatchTargets;
+  nsTArray<nsINode*> mBatchTargets;
 };

 inline
@@ -30,11 +30,6 @@
 #ifdef MOZ_FMP4
 #include "MP4Decoder.h"
 #endif
-#if defined(XP_WIN) && defined(MOZ_WMF)
-#include "MediaPrefs.h"
-#include "WMFDecoderModule.h"
-#include "mozilla/gfx/gfxVars.h"
-#endif
 #include "CubebUtils.h"

 #include "nsIScrollableFrame.h"
@@ -2365,42 +2360,6 @@ nsDOMWindowUtils::GetSupportsHardwareH264Decoding(JS::MutableHandle<JS::Value> a
  return NS_OK;
 }

-NS_IMETHODIMP
-nsDOMWindowUtils::GetSupportsHardwareVP9Decoding(JS::MutableHandle<JS::Value> aPromise)
-{
-  nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryReferent(mWindow);
-  NS_ENSURE_STATE(window);
-  nsCOMPtr<nsIGlobalObject> parentObject =
-    do_QueryInterface(window->GetCurrentInnerWindow());
-  NS_ENSURE_STATE(parentObject);
-  ErrorResult rv;
-  RefPtr<Promise> promise = Promise::Create(parentObject, rv);
-  if (rv.Failed()) {
-    return rv.StealNSResult();
-  }
-#if defined(XP_WIN) && defined(MOZ_WMF)
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  LayerManager* layerManager = widget ? widget->GetLayerManager() : nullptr;
-  if (!MediaPrefs::PDMWMFVP9DecoderEnabled()) {
-    promise->MaybeResolve(NS_LITERAL_STRING("No; media.wmf.vp9.enabled is false"));
-  } else if (!gfx::gfxVars::CanUseHardwareVideoDecoding()) {
-    promise->MaybeResolve(NS_LITERAL_STRING("No; hardware video decoding disabled"));
-  } else if (MediaPrefs::PDMWMFVP9MFTEnabled() &&
-             WMFDecoderModule::HasVP9MFT()) {
-    promise->MaybeResolve(NS_LITERAL_STRING("Yes, using MFT"));
-  } else if (layerManager &&
-             WMFDecoderModule::HasVP9DXVA2(layerManager->AsShadowForwarder())) {
-    promise->MaybeResolve(NS_LITERAL_STRING("Yes; using DXVA2"));
-  } else {
-    promise->MaybeResolve(NS_LITERAL_STRING("No; no VP9 hardware decoder available"));
-  }
-#else
-  promise->MaybeResolve(NS_LITERAL_STRING("No; not supported on this platform"));
-#endif
-  aPromise.setObject(*promise->PromiseObj());
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsDOMWindowUtils::GetCurrentAudioBackend(nsAString& aBackend)
 {
@@ -13,7 +13,6 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/AutoRestore.h"
 #include "mozilla/BinarySearch.h"
-#include "mozilla/CSSStyleSheet.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/EffectSet.h"
 #include "mozilla/IntegerRange.h"
@@ -1403,10 +1402,6 @@ nsDocument::~nsDocument()
  for (StyleSheet* sheet : mStyleSheets) {
    sheet->ClearAssociatedDocument();
  }
-  for (CSSStyleSheet* sheet : mAdoptedStyleSheets) {
-    sheet->RemoveAdopter(this);
-  }
-  mAdoptedStyleSheets.Clear();
  for (auto& sheets : mAdditionalSheets) {
    for (StyleSheet* sheet : sheets) {
    sheet->ClearAssociatedDocument();
@@ -1640,7 +1635,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsDocument)

  // Traverse all our nsCOMArrays.
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStyleSheets)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAdoptedStyleSheets)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOnDemandBuiltInUASheets)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPreloadingImages)

@@ -1746,11 +1740,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDocument)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDOMStyleSheets)

-  for (CSSStyleSheet* sheet : tmp->mAdoptedStyleSheets) {
-    sheet->RemoveAdopter(tmp);
-  }
-  tmp->mAdoptedStyleSheets.Clear();
-
  if (tmp->mStyleSheetSetList) {
    tmp->mStyleSheetSetList->Disconnect();
    tmp->mStyleSheetSetList = nullptr;
@@ -2216,12 +2205,6 @@ nsDocument::FillStyleSet(nsStyleSet* aStyleSet)
  AppendSheetsToStyleSet(aStyleSet, mAdditionalSheets[eAuthorSheet],
                         SheetType::Doc);

-  for (CSSStyleSheet* sheet : mAdoptedStyleSheets) {
-    if (sheet->IsApplicable()) {
-      aStyleSet->AppendStyleSheet(SheetType::Doc, sheet);
-    }
-  }
-
  mStyleSetFilled = true;
 }

@@ -3889,37 +3872,6 @@ nsDocument::RemoveStyleSheetFromStyleSets(StyleSheet* aSheet)
  }
 }

-void
-nsDocument::AdoptedStyleSheetsChanged(
-    const nsTArray<RefPtr<CSSStyleSheet>>& aOldSheets,
-    const nsTArray<RefPtr<CSSStyleSheet>>& aNewSheets)
-{
-  BeginUpdate(UPDATE_STYLE);
-
-  nsCOMPtr<nsIPresShell> shell = GetShell();
-  nsStyleSet* styleSet = shell ? shell->StyleSet() : nullptr;
-
-  for (size_t i = 0; i < aOldSheets.Length(); ++i) {
-    CSSStyleSheet* sheet = aOldSheets[i];
-    if (styleSet && sheet->IsApplicable() &&
-        aOldSheets.IndexOf(sheet) == i) {
-      styleSet->RemoveStyleSheet(SheetType::Doc, sheet);
-    }
-    sheet->RemoveAdopter(this);
-  }
-
-  for (size_t i = 0; i < aNewSheets.Length(); ++i) {
-    CSSStyleSheet* sheet = aNewSheets[i];
-    sheet->AddAdopter(this);
-    if (styleSet && sheet->IsApplicable() &&
-        aNewSheets.IndexOf(sheet) == i) {
-      styleSet->AppendStyleSheet(SheetType::Doc, sheet);
-    }
-  }
-
-  EndUpdate(UPDATE_STYLE);
-}
-
 void
 nsDocument::RemoveStyleSheet(StyleSheet* aSheet)
 {
@@ -4009,18 +3961,6 @@ nsDocument::SetStyleSheetApplicableState(StyleSheet* aSheet,
    } else {
      RemoveStyleSheetFromStyleSets(aSheet);
    }
-  } else if (mAdoptedStyleSheets.IndexOf(aSheet->AsConcrete()) !=
-             mAdoptedStyleSheets.NoIndex) {
-    nsCOMPtr<nsIPresShell> shell = GetShell();
-    if (shell) {
-      if (aApplicable) {
-        shell->StyleSet()->AppendStyleSheet(SheetType::Doc,
-                                            aSheet->AsConcrete());
-      } else {
-        shell->StyleSet()->RemoveStyleSheet(SheetType::Doc,
-                                            aSheet->AsConcrete());
-      }
-    }
  }

  // We have to always notify, since this will be called for sheets
@@ -95,7 +95,6 @@ class nsISecurityConsoleMessage;
 class nsPIBoxObject;

 namespace mozilla {
-class CSSStyleSheet;
 class EventChainPreVisitor;
 namespace dom {
 class BoxObject;
@@ -472,9 +471,6 @@ public:
      nsTArray<RefPtr<mozilla::StyleSheet>>& aNewSheets) override;
  virtual void AddStyleSheetToStyleSets(mozilla::StyleSheet* aSheet);
  virtual void RemoveStyleSheetFromStyleSets(mozilla::StyleSheet* aSheet);
-  void AdoptedStyleSheetsChanged(
-      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aOldSheets,
-      const nsTArray<RefPtr<mozilla::CSSStyleSheet>>& aNewSheets);

  virtual void InsertStyleSheetAt(mozilla::StyleSheet* aSheet,
                                  size_t aIndex) override;
@@ -1738,9 +1738,8 @@ nsFocusManager::Blur(nsPIDOMWindowOuter* aWindowToClear,
    if (mActiveWindow)
      window->UpdateCommands(NS_LITERAL_STRING("focus"), nullptr, 0);

-    nsCOMPtr<nsIDocument> doc = content->GetComposedDoc();
    SendFocusOrBlurEvent(eBlur, presShell,
-                         doc, content, 1,
+                         content->GetComposedDoc(), content, 1,
                         false, false, aContentToFocus);
  }

@@ -444,7 +444,6 @@ GK_ATOM(handheldFriendly, "HandheldFriendly")
 GK_ATOM(handler, "handler")
 GK_ATOM(handlers, "handlers")
 GK_ATOM(HARD, "HARD")
-GK_ATOM(hasSelectorDependency, "has-selector-dependency")
 GK_ATOM(hasSameNode, "has-same-node")
 GK_ATOM(hbox, "hbox")
 GK_ATOM(head, "head")
@@ -1005,7 +1004,6 @@ GK_ATOM(parameter, "parameter")
 GK_ATOM(parent, "parent")
 GK_ATOM(parentfocused, "parentfocused")
 GK_ATOM(parsetype, "parsetype")
-GK_ATOM(part, "part")
 GK_ATOM(password, "password")
 GK_ATOM(pattern, "pattern")
 GK_ATOM(patternSeparator, "pattern-separator")
@@ -2176,7 +2176,6 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(nsGlobalWindow)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLocation)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHistory)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCustomElements)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mVisualViewport)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLocalStorage)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSessionStorage)
@@ -2255,7 +2254,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsGlobalWindow)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mLocation)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mHistory)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCustomElements)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mVisualViewport)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mLocalStorage)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSessionStorage)
  if (tmp->mApplicationCache) {
@@ -6164,6 +6162,7 @@ nsGlobalWindow::CheckSecurityWidthAndHeight(int32_t* aWidth, int32_t* aHeight, b
  // This one is easy. Just ensure the variable is greater than 100;
  if ((aWidth && *aWidth < 100) || (aHeight && *aHeight < 100)) {
    // Check security state for use in determing window dimensions
+
    if (!nsContentUtils::IsCallerChrome()) {
      //sec check failed
      if (aWidth && *aWidth < 100) {
@@ -6174,21 +6173,6 @@ nsGlobalWindow::CheckSecurityWidthAndHeight(int32_t* aWidth, int32_t* aHeight, b
      }
    }
  }
-  
-  // Check for the screen dimensions and keep the size in the range of the
-  // screen size the window is on. We allow twice the screen size because the
-  // size we get for a screen is not always accurate, on Wayland in particular,
-  // and all we need is to keep the size in a reasonable range.
-  nsCOMPtr<nsIDOMScreen> screen = GetScreen();
-  int32_t screenWidth, screenHeight;
-  screen->GetAvailWidth(&screenWidth);
-  screen->GetAvailHeight(&screenHeight);
-  if (aWidth && *aWidth > 2 * screenWidth) {
-    *aWidth = 2 * screenWidth;
-  }
-  if (aHeight && *aHeight > 2 * screenHeight) {
-    *aHeight = 2 * screenHeight;
-  }  
 }

 // NOTE: Arguments to this function should have values in device pixels
@@ -8107,10 +8091,8 @@ nsGlobalWindow::ResizeByOuter(int32_t aWidthDif, int32_t aHeightDif,

  nsIntSize cssSize(DevToCSSIntPixels(nsIntSize(width, height)));

-  // The deltas come from content and can be large enough to overflow a 32-bit
-  // add, so do the arithmetic in 64 bits and keep the result in range.
-  cssSize.width = int32_t(std::clamp<int64_t>(int64_t(cssSize.width) + aWidthDif, 0, INT32_MAX));
-  cssSize.height = int32_t(std::clamp<int64_t>(int64_t(cssSize.height) + aHeightDif, 0, INT32_MAX));
+  cssSize.width += aWidthDif;
+  cssSize.height += aHeightDif;

  CheckSecurityWidthAndHeight(&cssSize.width, &cssSize.height, aCallerIsChrome);

@@ -46,9 +46,6 @@ nsIDocument::FindDocStyleSheetInsertionPoint(
          break;
        }
      }
-      if (sheet->IsConstructed()) {
-        break;
-      }
      if (sheet == GetFirstAdditionalAuthorSheet()) {
        break;
      }
@@ -97,7 +97,7 @@ ToJSValue(JSContext* aCx,
  return true;
 }

-// Accept floating point types
+// accept floating point types
 inline bool
 ToJSValue(JSContext* aCx,
          float aArgument,
@@ -106,7 +106,7 @@ ToJSValue(JSContext* aCx,
  // Make sure we're called in a compartment
  MOZ_ASSERT(JS::CurrentGlobalOrNull(aCx));

-  aValue.set(JS_NumberValue(double(aArgument)));
+  aValue.setNumber(aArgument);
  return true;
 }

@@ -39,44 +39,6 @@ WebGLTransformFeedback::Delete()

 ////////////////////////////////////////

-// Validation helper for beginning/resuming the TF and computing the
-// vertex capacity.
-bool
-WebGLTransformFeedback::PrepareTransformFeedback() {
-    const auto& prog = mContext->mCurrentProgram;
-    if (!prog ||
-        !prog->IsLinked() ||
-        !prog->LinkInfo()->componentsPerTFVert.size()) {
-        mContext->ErrorInvalidOperation("Current program not valid for transform feedback.");
-        return false;
-    }
-
-    const auto& linkInfo = prog->LinkInfo();
-    const auto& componentsPerTFVert = linkInfo->componentsPerTFVert;
-    
-    mActive_VertCapacity = 0;
-
-    size_t minVertCapacity = SIZE_MAX;
-    for (size_t i = 0; i < componentsPerTFVert.size(); i++) {
-        const auto& indexedBinding = mIndexedBindings[i];
-        const auto& componentsPerVert = componentsPerTFVert[i];
-
-        const auto& buffer = indexedBinding.mBufferBinding;
-        if (!buffer) {
-            mContext->ErrorInvalidOperation("No buffer attached to required transform feedback index %u.",
-                                            (uint32_t)i);
-            return false;
-        }
-
-        const size_t vertCapacity = buffer->ByteLength() / 4 / componentsPerVert;
-        minVertCapacity = std::min(minVertCapacity, vertCapacity);
-    }
-    
-    mActive_VertCapacity = minVertCapacity;
-    
-    return true;
-}
-
 void
 WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
 {
@@ -97,10 +59,37 @@ WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
        return;
    }

-    if (!PrepareTransformFeedback()) {
+    const auto& prog = mContext->mCurrentProgram;
+    if (!prog ||
+        !prog->IsLinked() ||
+        !prog->LinkInfo()->componentsPerTFVert.size())
+    {
+        mContext->ErrorInvalidOperation("%s: Current program not valid for transform"
+                                        " feedback.",
+                                        funcName);
        return;
    }

+    const auto& linkInfo = prog->LinkInfo();
+    const auto& componentsPerTFVert = linkInfo->componentsPerTFVert;
+
+    size_t minVertCapacity = SIZE_MAX;
+    for (size_t i = 0; i < componentsPerTFVert.size(); i++) {
+        const auto& indexedBinding = mIndexedBindings[i];
+        const auto& componentsPerVert = componentsPerTFVert[i];
+
+        const auto& buffer = indexedBinding.mBufferBinding;
+        if (!buffer) {
+            mContext->ErrorInvalidOperation("%s: No buffer attached to required transform"
+                                            " feedback index %u.",
+                                            funcName, (uint32_t)i);
+            return;
+        }
+
+        const size_t vertCapacity = buffer->ByteLength() / 4 / componentsPerVert;
+        minVertCapacity = std::min(minVertCapacity, vertCapacity);
+    }
+
    ////

    const auto& gl = mContext->gl;
@@ -112,9 +101,10 @@ WebGLTransformFeedback::BeginTransformFeedback(GLenum primMode)
    mIsActive = true;
    MOZ_ASSERT(!mIsPaused);

-    mActive_Program = mContext->mCurrentProgram;
+    mActive_Program = prog;
    mActive_PrimMode = primMode;
    mActive_VertPosition = 0;
+    mActive_VertCapacity = minVertCapacity;

    ////

@@ -183,12 +173,6 @@ WebGLTransformFeedback::ResumeTransformFeedback()
        return;
    }

-    // Re-run prepare in case some of the buffers have been modified
-    // while the TF was paused.
-    if (!PrepareTransformFeedback()) {
-        return;
-    }
-
    ////

    const auto& gl = mContext->gl;
@@ -44,7 +44,6 @@ public:
    WebGLTransformFeedback(WebGLContext* webgl, GLuint tf);
 private:
    ~WebGLTransformFeedback();
-    bool PrepareTransformFeedback();

 public:
    NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WebGLTransformFeedback)
@@ -26,6 +26,7 @@ support-files =
  image_yellow75.png
  imagebitmap_bug1239300.js
  imagebitmap_bug1239752.js
+  imagebitmap_extensions.html
  imagebitmap_on_worker.js
  imagebitmap_structuredclone.js
  imagebitmap_structuredclone_iframe.html
@@ -63,7 +63,6 @@ EncodingUtils::IsAsciiCompatible(const nsACString& aPreferredName)
           aPreferredName.LowerCaseEqualsLiteral("utf-16be") ||
           aPreferredName.LowerCaseEqualsLiteral("utf-16le") ||
           aPreferredName.LowerCaseEqualsLiteral("replacement") ||
-           aPreferredName.LowerCaseEqualsLiteral("iso-2022-jp") ||
           aPreferredName.LowerCaseEqualsLiteral("hz-gb-2312") ||
           aPreferredName.LowerCaseEqualsLiteral("utf-7") ||
           aPreferredName.LowerCaseEqualsLiteral("x-imap4-modified-utf7"));
@@ -682,19 +682,16 @@ DataTransfer::SetDataAtInternal(const nsAString& aFormat, nsIVariant* aData,
    return NS_ERROR_DOM_INDEX_SIZE_ERR;
  }

-  nsAutoString format;
-  GetRealFormat(aFormat, format);
-
  // Don't allow the custom type to be assigned.
-  if (format.EqualsLiteral(kCustomTypesMime)) {
+  if (aFormat.EqualsLiteral(kCustomTypesMime)) {
    return NS_ERROR_TYPE_ERR;
  }

-  if (!PrincipalMaySetData(format, aData, aSubjectPrincipal)) {
+  if (!PrincipalMaySetData(aFormat, aData, aSubjectPrincipal)) {
    return NS_ERROR_DOM_SECURITY_ERR;
  }

-  return SetDataWithPrincipal(format, aData, aIndex, aSubjectPrincipal);
+  return SetDataWithPrincipal(aFormat, aData, aIndex, aSubjectPrincipal);
 }

 void
@@ -29,19 +29,18 @@ using namespace workers;

 NS_IMPL_CYCLE_COLLECTING_ADDREF(Request)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Request)
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(Request)

 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Request)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mHeaders)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSignal)
  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END

 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Request)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHeaders)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSignal)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END

 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(Request)
@@ -30,12 +30,12 @@ namespace dom {

 NS_IMPL_CYCLE_COLLECTING_ADDREF(Response)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Response)
+
 NS_IMPL_CYCLE_COLLECTION_CLASS(Response)

 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(Response)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mOwner)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mHeaders)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mSignal)
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mFetchStreamReader)

  tmp->mReadableStreamBody = nullptr;
@@ -47,7 +47,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Response)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mOwner)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mHeaders)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mSignal)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mFetchStreamReader)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END

@@ -652,7 +652,7 @@ nsresult nsGeolocationService::Init()
 #endif

 #ifdef MOZ_WIDGET_COCOA
-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  if (Preferences::GetBool("geo.provider.use_corelocation", true)) {
    mProvider = new CoreLocationLocationProvider();
  }
@@ -876,12 +876,20 @@ HTMLImageElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
  return HTMLImageElementBinding::Wrap(aCx, this, aGivenProto);
 }

+#ifdef DEBUG
+nsIDOMHTMLFormElement*
+HTMLImageElement::GetForm() const
+{
+  return mForm;
+}
+#endif
+
 void
 HTMLImageElement::SetForm(nsIDOMHTMLFormElement* aForm)
 {
  NS_PRECONDITION(aForm, "Don't pass null here");
-  MOZ_ASSERT(!mForm && !HasFlag(ADDED_TO_FORM),
-             "We don't support switching from one non-null form to another.");
+  NS_ASSERTION(!mForm,
+               "We don't support switching from one non-null form to another.");

  mForm = static_cast<HTMLFormElement*>(aForm);
 }
@@ -216,8 +216,9 @@ public:
    SetHTMLAttr(nsGkAtoms::lowsrc, aLowsrc, aError);
  }

-  HTMLFormElement* GetForm() const { return mForm; };
-
+#ifdef DEBUG
+  nsIDOMHTMLFormElement* GetForm() const;
+#endif
  void SetForm(nsIDOMHTMLFormElement* aForm);
  void ClearForm(bool aRemoveFromForm);

@@ -1132,7 +1132,6 @@ void HTMLMediaElement::AbortExistingLoads()

  RemoveMediaElementFromURITable();
  mLoadingSrc = nullptr;
-  mCORSMode = CORS_NONE;
  mMediaSource = nullptr;

  if (mNetworkState == nsIDOMHTMLMediaElement::NETWORK_LOADING ||
@@ -1371,9 +1370,6 @@ void HTMLMediaElement::SelectResource()
  // If we have a 'src' attribute, use that exclusively.
  nsAutoString src;
  if (mSrcAttrStream) {
-    // Media provider objects use local mode, so a previous URL load's CORS
-    // mode does not apply.
-    mCORSMode = CORS_NONE;
    SetupSrcMediaStreamPlayback(mSrcAttrStream);
  } else if (GetAttr(kNameSpaceID_None, nsGkAtoms::src, src)) {
    nsCOMPtr<nsIURI> uri;
@@ -117,6 +117,11 @@ public:

  int32_t Index();

+protected:
+  virtual ~HTMLOptionElement();
+
+  virtual JSObject* WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+
  /**
   * Get the select content element that contains this option, this
   * intentionally does not return nsresult, all we care about is if
@@ -124,11 +129,6 @@ public:
   */
  HTMLSelectElement* GetSelect();

-protected:
-  virtual ~HTMLOptionElement();
-
-  virtual JSObject* WrapNode(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
-
  bool mSelectedChanged;
  bool mIsSelected;

@@ -732,10 +732,10 @@ bool
 HTMLSelectElement::MatchSelectedOptions(Element* aElement,
                                        int32_t /* unused */,
                                        nsIAtom* /* unused */,
-                                        void* aData)
+                                        void* /* unused*/)
 {
  HTMLOptionElement* option = HTMLOptionElement::FromContent(aElement);
-  return option && option->Selected() && option->GetSelect() == static_cast<HTMLSelectElement*>(aData);
+  return option && option->Selected();
 }

 nsIHTMLCollection*
@@ -743,7 +743,7 @@ HTMLSelectElement::SelectedOptions()
 {
  if (!mSelectedOptions) {
    mSelectedOptions = new nsContentList(this, MatchSelectedOptions, nullptr,
-                                         this, /* deep */ true);
+                                         nullptr, /* deep */ true);
  }
  return mSelectedOptions;
 }
@@ -18,8 +18,6 @@
 #include "nsContentUtils.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIURI.h"
-#include "nsNetUtil.h"
-#include "nsIProtocolHandler.h"

 NS_IMPL_NS_NEW_HTML_ELEMENT(Shared)

@@ -188,8 +186,6 @@ SetBaseURIUsingFirstBaseWithHref(nsIDocument* aDocument, nsIContent* aMustMatch)
        newBaseURI = nullptr;
      }
      if (csp && newBaseURI) {
-        bool isLocalResource = false;
-        rv = NS_URIChainHasFlags(newBaseURI, nsIProtocolHandler::URI_IS_LOCAL_RESOURCE, &isLocalResource);
        // base-uri is only enforced if explicitly defined in the
        // policy - do *not* consult default-src, see:
        // http://www.w3.org/TR/CSP2/#directive-default-src
@@ -197,7 +193,7 @@ SetBaseURIUsingFirstBaseWithHref(nsIDocument* aDocument, nsIContent* aMustMatch)
        rv = csp->Permits(newBaseURI, nsIContentSecurityPolicy::BASE_URI_DIRECTIVE,
                          true /* aSpecific */, true /* aSendViolationReports */,
                          &cspPermitsBaseURI);
-        if ((NS_FAILED(rv) || !cspPermitsBaseURI) && !isLocalResource) {
+        if (NS_FAILED(rv) || !cspPermitsBaseURI) {
          newBaseURI = nullptr;
        }
      }
@@ -1487,15 +1487,8 @@ nsGenericHTMLElement::MapImageSizeAttributesInto(const nsMappedAttributes* aAttr
    }

    if (w && h && *w != 0 && *h != 0) {
-      nsCSSValue width;
-      width.SetFloatValue(float(*w), eCSSUnit_Number);
-      nsCSSValue height;
-      height.SetFloatValue(float(*h), eCSSUnit_Number);
-      nsCSSValue ratio;
-      ratio.SetPairValue(width, height);
-      nsCSSValue autoValue;
-      autoValue.SetAutoValue();
-      aData->ValueForAspectRatio()->SetPairValue(autoValue, ratio);
+      nsCSSValue* aspect_ratio = aData->ValueForAspectRatio();
+      aspect_ratio->SetFloatValue((float(*w) / float(*h)), eCSSUnit_Number);
    }
  }
 }
@@ -1831,8 +1824,8 @@ void
 nsGenericHTMLFormElement::SetForm(nsIDOMHTMLFormElement* aForm)
 {
  NS_PRECONDITION(aForm, "Don't pass null here");
-  MOZ_ASSERT(!mForm && !HasFlag(ADDED_TO_FORM),
-             "We don't support switching from one non-null form to another.");
+  NS_ASSERTION(!mForm,
+               "We don't support switching from one non-null form to another.");

  // keep a *weak* ref to the form here
  mForm = static_cast<HTMLFormElement*>(aForm);
@@ -1415,7 +1415,6 @@ BackgroundFactoryRequestChild::BackgroundFactoryRequestChild(
                                               uint64_t aRequestedVersion)
  : BackgroundRequestChildBase(aOpenRequest)
  , mFactory(aFactory)
-  , mDatabaseActor(nullptr)
  , mRequestedVersion(aRequestedVersion)
  , mIsDeleteOp(aIsDeleteOp)
 {
@@ -1440,15 +1439,6 @@ BackgroundFactoryRequestChild::GetOpenDBRequest() const
  return static_cast<IDBOpenDBRequest*>(mRequest.get());
 }

-void
-BackgroundFactoryRequestChild::SetDatabaseActor(BackgroundDatabaseChild* aActor)
-{
-  AssertIsOnOwningThread();
-  MOZ_ASSERT(!aActor || !mDatabaseActor);
-
-  mDatabaseActor = aActor;
-}
-
 bool
 BackgroundFactoryRequestChild::HandleResponse(nsresult aResponse)
 {
@@ -1460,11 +1450,6 @@ BackgroundFactoryRequestChild::HandleResponse(nsresult aResponse)

  DispatchErrorEvent(mRequest, aResponse);

-  if (mDatabaseActor) {
-    mDatabaseActor->ReleaseDOMObject();
-    MOZ_ASSERT(!mDatabaseActor);
-  }
-
  return true;
 }

@@ -1483,7 +1468,6 @@ BackgroundFactoryRequestChild::HandleResponse(
  IDBDatabase* database = databaseActor->GetDOMObject();
  if (!database) {
    databaseActor->EnsureDOMObject();
-    MOZ_ASSERT(mDatabaseActor);

    database = databaseActor->GetDOMObject();
    MOZ_ASSERT(database);
@@ -1491,8 +1475,6 @@ BackgroundFactoryRequestChild::HandleResponse(
    MOZ_ASSERT(!database->IsClosed());
  }

-  MOZ_ASSERT(mDatabaseActor == databaseActor);
-
  if (database->IsClosed()) {
    // If the database was closed already, which is only possible if we fired an
    // "upgradeneeded" event, then we shouldn't fire a "success" event here.
@@ -1505,7 +1487,6 @@ BackgroundFactoryRequestChild::HandleResponse(
  }

  databaseActor->ReleaseDOMObject();
-  MOZ_ASSERT(!mDatabaseActor);

  return true;
 }
@@ -1526,8 +1507,6 @@ BackgroundFactoryRequestChild::HandleResponse(

  DispatchSuccessEvent(&helper, successEvent);

-  MOZ_ASSERT(!mDatabaseActor);
-
  return true;
 }

@@ -1758,8 +1737,6 @@ BackgroundDatabaseChild::EnsureDOMObject()

  mDatabase = mTemporaryStrongDatabase;
  mSpec.forget();
-
-  mOpenRequestActor->SetDatabaseActor(this);
 }

 void
@@ -1771,8 +1748,6 @@ BackgroundDatabaseChild::ReleaseDOMObject()
  MOZ_ASSERT(mOpenRequestActor);
  MOZ_ASSERT(mDatabase == mTemporaryStrongDatabase);

-  mOpenRequestActor->SetDatabaseActor(nullptr);
-
  mOpenRequestActor = nullptr;

  // This may be the final reference to the IDBDatabase object so we may end up
@@ -254,20 +254,6 @@ class BackgroundFactoryRequestChild final
  friend class PermissionRequestParent;

  RefPtr<IDBFactory> mFactory;
-
-  // Normally when opening of a database is successful, we receive a database
-  // actor in request response, so we can use it to call ReleaseDOMObject()
-  // which clears temporary strong reference to IDBDatabase.
-  // However, when there's an error, we don't receive a database actor and
-  // IDBRequest::mTransaction is already cleared (must be). So the only way how
-  // to call ReleaseDOMObject() is to have a back-reference to database actor.
-  // This creates a weak ref cycle between
-  // BackgroundFactoryRequestChild (using mDatabaseActor member) and
-  // BackgroundDatabaseChild actor (using mOpenRequestActor member).
-  // mDatabaseActor is set in EnsureDOMObject() and cleared in
-  // ReleaseDOMObject().
-  BackgroundDatabaseChild* mDatabaseActor;
-
  const uint64_t mRequestedVersion;
  const bool mIsDeleteOp;

@@ -285,9 +271,6 @@ private:
  // Only destroyed by BackgroundFactoryChild.
  ~BackgroundFactoryRequestChild();

-  void
-  SetDatabaseActor(BackgroundDatabaseChild* aActor);
-
  bool
  HandleResponse(nsresult aResponse);

@@ -138,9 +138,7 @@ GetJSValFromKeyPathString(JSContext* aCx,
        // only through getters but we still want to support them for key
        // extraction. So they need to be handled manually.
        Blob* blob;
-        // UNWRAP_OBJECT calls might mutate this.
-        JS::Rooted<JSObject*> blobObj(aCx, obj);
-        if (NS_SUCCEEDED(UNWRAP_OBJECT(Blob, &blobObj, blob))) {
+        if (NS_SUCCEEDED(UNWRAP_OBJECT(Blob, &obj, blob))) {
          if (token.EqualsLiteral("size")) {
            ErrorResult rv;
            uint64_t size = blob->GetSize(rv);
@@ -49,7 +49,7 @@ interface nsIJSRAIIHelper;
 interface nsIContentPermissionRequest;
 interface nsIObserver;

-[scriptable, uuid(16ed093c-84a7-4ca3-84c8-9ad71f8b5d82)]
+[scriptable, uuid(58e97ce9-1d9e-4576-aabf-89480fdeb16d)]
 interface nsIDOMWindowUtils : nsISupports {

  /**
@@ -1420,15 +1420,6 @@ interface nsIDOMWindowUtils : nsISupports {
   */
  readonly attribute jsval supportsHardwareH264Decoding;

-  /**
-   * Returns a Promise resolved with a string describing whether VP9 hardware
-   * decoding is supported, and if it is, whether it is available through the
-   * Windows MFT or direct DXVA2 path.
-   * Success does not mean that all vp9 video decoding will be done
-   * in hardware.
-   */
-  readonly attribute jsval supportsHardwareVP9Decoding;
-
  /**
   * Returns the current audio backend as a free-form string.
   */
@@ -2455,7 +2455,7 @@ ContentChild::RecvUpdateWindow(const uintptr_t& aChildId)
  if (parentInstance) {
  // sync! update call to the plugin instance that forces the
  // plugin to paint its child window.
-  Unused << parentInstance->CallUpdateWindow();
+  parentInstance->CallUpdateWindow();
  }
  return true;
 #else
@@ -105,6 +105,8 @@ gDownMixMatrices[CUSTOM_CHANNEL_LAYOUTS*(CUSTOM_CHANNEL_LAYOUTS - 1)/2] =
 * Given an array of input channels, downmix to aOutputChannelCount, and copy
 * the results to the channel buffers in aOutputChannels.  Don't call this with
 * input count <= output count.
+ * Each of aOutputChannels must be non-null.
+ * aChannelArray elements may be null.
 */
 template<typename T>
 void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
@@ -119,7 +121,11 @@ void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
  if (inputChannelCount > 6) {
    // Just drop the unknown channels.
    for (uint32_t o = 0; o < aOutputChannelCount; ++o) {
-      PodCopy(aOutputChannels[o], inputChannels[o], aDuration);
+      if (inputChannels[o]) {
+        PodCopy(aOutputChannels[o], inputChannels[o], aDuration);
+      } else {
+        std::fill_n(aOutputChannels[o], aDuration, static_cast<T>(0));
+      }
    }
    return;
  }
@@ -138,13 +144,19 @@ void AudioChannelsDownMix(const nsTArray<const T*>& aChannelArray,
    // want an input channel to contribute to nothing
    T outputChannels[CUSTOM_CHANNEL_LAYOUTS + 1] = {0};
    for (uint32_t c = 0; c < inputChannelCount; ++c) {
-      outputChannels[m.mInputDestination[c]] +=
-        m.mInputCoefficient[c]*(static_cast<const T*>(inputChannels[c]))[s];
+      if (inputChannels[c]) {
+        outputChannels[m.mInputDestination[c]] +=
+            m.mInputCoefficient[c] *
+            (static_cast<const T*>(inputChannels[c]))[s];
+      }
    }
    // Utilize the fact that in every layout, C is the third channel.
    if (m.mCExtraDestination != IGNORE) {
-      outputChannels[m.mCExtraDestination] +=
-        m.mInputCoefficient[SURROUND_C]*(static_cast<const T*>(inputChannels[SURROUND_C]))[s];
+      if (inputChannels[SURROUND_C]) {
+        outputChannels[m.mCExtraDestination] +=
+            m.mInputCoefficient[SURROUND_C] *
+            (static_cast<const T*>(inputChannels[SURROUND_C]))[s];
+      }
    }

    for (uint32_t c = 0; c < aOutputChannelCount; ++c) {
@@ -7,7 +7,6 @@
 #include <speex/speex_resampler.h>
 #include <string.h>
 #include <cmath>
-#include "mozilla/CheckedInt.h"

 /*
 *  Parts derived from MythTV AudioConvert Class
@@ -263,15 +262,8 @@ AudioConverter::ResampleAudio(void* aOut, const void* aIn, size_t aFrames)
  if (!mResampler) {
    return 0;
  }
-  uint32_t outframes;
-  if (!ResampleRecipientFrames(aFrames, &outframes)) {
-    return 0;
-  }
-  CheckedUint32 inframesChecked(aFrames);
-  if (!inframesChecked.isValid()) {
-    return 0;
-  }
-  uint32_t inframes = inframesChecked.value();
+  uint32_t outframes = ResampleRecipientFrames(aFrames);
+  uint32_t inframes = aFrames;

  int error;
  if (mOut.Format() == AudioConfig::FORMAT_FLT) {
@@ -296,7 +288,7 @@ AudioConverter::ResampleAudio(void* aOut, const void* aIn, size_t aFrames)
    mResampler = nullptr;
    return 0;
  }
-  MOZ_ASSERT(static_cast<size_t>(inframes) == aFrames, "Some frames will be dropped");
+  MOZ_ASSERT(inframes == aFrames, "Some frames will be dropped");
  return outframes;
 }

@@ -381,27 +373,17 @@ AudioConverter::UpmixAudio(void* aOut, const void* aIn, size_t aFrames) const
  return aFrames;
 }

-bool AudioConverter::ResampleRecipientFrames(size_t aFrames,
-                                             uint32_t* aOutFrames) const {
+size_t
+AudioConverter::ResampleRecipientFrames(size_t aFrames) const
+{
  if (!aFrames && mIn.Rate() != mOut.Rate()) {
    if (!mResampler) {
-      *aOutFrames = 0;
-      return true;
+      return 0;
    }
    // We drain by pushing in get_input_latency() samples of 0
    aFrames = speex_resampler_get_input_latency(mResampler);
  }
-  CheckedInt<uint64_t> numerator = CheckedInt<uint64_t>(aFrames) * mOut.Rate();
-  if (!numerator.isValid()) {
-    return false;
-  }
-  CheckedUint32 outFrames(numerator.value() / mIn.Rate());
-  outFrames += 1u;
-  if (!outFrames.isValid()) {
-    return false;
-  }
-  *aOutFrames = outFrames.value();
-  return true;
+  return (uint64_t)aFrames * mOut.Rate() / mIn.Rate() + 1;
 }

 size_t
@@ -7,7 +7,6 @@
 #define AudioConverter_h

 #include "MediaInfo.h"
-#include "mozilla/CheckedInt.h"

 // Forward declaration
 typedef struct SpeexResamplerState_ SpeexResamplerState;
@@ -164,15 +163,9 @@ public:
    AlignedBuffer<Value>* outputBuffer = &temp1;
    AlignedBuffer<Value> temp2;
    if (!frames || mOut.Rate() > mIn.Rate()) {
-      uint32_t resampledFrames;
      // We are upsampling or about to drain, we can't work in place.
      // Allocate another temporary buffer where the upsampling will occur.
-      if (!ResampleRecipientFrames(frames, &resampledFrames)) {
-        return AudioDataBuffer<Format, Value>(std::move(temp2));
-      }
-      CheckedInt<size_t> outputSamples =
-          CheckedInt<size_t>(resampledFrames) * mOut.Channels();
-      if (!outputSamples.isValid() || !temp2.SetLength(outputSamples.value())) {
+      if (!temp2.SetLength(FramesOutToSamples(ResampleRecipientFrames(frames)))) {
        return AudioDataBuffer<Format, Value>(Move(temp2));
      }
      outputBuffer = &temp2;
@@ -236,7 +229,7 @@ private:
  // Resampler context.
  SpeexResamplerState* mResampler;
  size_t ResampleAudio(void* aOut, const void* aIn, size_t aFrames);
-  bool ResampleRecipientFrames(size_t aFrames, uint32_t* aOutFrames) const;
+  size_t ResampleRecipientFrames(size_t aFrames) const;
  void RecreateResampler();
  size_t DrainResampler(void* aOut);
 };
@@ -121,13 +121,19 @@ AudioSegment::Mix(AudioMixer& aMixer, uint32_t aOutputChannels,
      }
      if (channelData.Length() < aOutputChannels) {
        // Up-mix.
-        AudioChannelsUpMix(&channelData, aOutputChannels, SilentChannel::ZeroChannel<AudioDataValue>());
+        AudioChannelsUpMix(&channelData, aOutputChannels, static_cast<const AudioDataValue*>(nullptr));
        for (uint32_t channel = 0; channel < aOutputChannels; channel++) {
          AudioDataValue* ptr =
            PointerForOffsetInChannel(buf.Elements(), outBufferLength,
                                      aOutputChannels, channel, offsetSamples);
-          PodCopy(ptr, reinterpret_cast<const AudioDataValue*>(channelData[channel]),
-                  frames);
+          if (channelData[channel]) {
+            PodCopy(
+                ptr,
+                reinterpret_cast<const AudioDataValue*>(channelData[channel]),
+                frames);
+          } else {
+            PodZero(ptr, frames);
+          }
        }
        MOZ_ASSERT(channelData.Length() == aOutputChannels);
      } else if (channelData.Length() > aOutputChannels) {
@@ -61,15 +61,22 @@ template <typename SrcT, typename DestT>
 static void
 InterleaveAndConvertBuffer(const SrcT* const* aSourceChannels,
                           uint32_t aLength, float aVolume,
-                           uint32_t aChannels,
+                           uint32_t aChannelCount,
                           DestT* aOutput)
 {
-  DestT* output = aOutput;
-  for (size_t i = 0; i < aLength; ++i) {
-    for (size_t channel = 0; channel < aChannels; ++channel) {
-      float v = AudioSampleToFloat(aSourceChannels[channel][i])*aVolume;
-      *output = FloatToAudioSample<DestT>(v);
-      ++output;
+  for (size_t channel = 0; channel < aChannelCount; ++channel) {
+    DestT* output = aOutput;
+    if (aSourceChannels[channel]) {
+      for (size_t i = 0; i < aLength; ++i) {
+        float v = AudioSampleToFloat(aSourceChannels[channel][i])*aVolume;
+        *output = FloatToAudioSample<DestT>(v);
+        output += aChannelCount;
+      }
+    } else {
+      for (size_t i = 0; i < aLength; ++i) {
+        *output = static_cast<DestT>(0);
+        output += aChannelCount;
+      }
    }
  }
 }
@@ -93,7 +100,7 @@ DeinterleaveAndConvertBuffer(const SrcT* aSourceBuffer,
 class SilentChannel
 {
 public:
-  static const int AUDIO_PROCESSING_FRAMES = 4096; /* > 10ms of 48KHz audio */
+  static const int AUDIO_PROCESSING_FRAMES = 640; /* > 10ms of 48KHz audio */
  static const uint8_t gZeroChannel[MAX_AUDIO_SAMPLE_SIZE*AUDIO_PROCESSING_FRAMES];
  // We take advantage of the fact that zero in float and zero in int have the
  // same all-zeros bit layout.
@@ -408,7 +415,7 @@ void WriteChunk(AudioChunk& aChunk,
  if (channelData.Length() < aOutputChannels) {
    // Up-mix. Note that this might actually make channelData have more
    // than aOutputChannels temporarily.
-    AudioChannelsUpMix(&channelData, aOutputChannels, SilentChannel::ZeroChannel<SrcT>());
+    AudioChannelsUpMix(&channelData, aOutputChannels, static_cast<const SrcT*>(nullptr));
  }
  if (channelData.Length() > aOutputChannels) {
    // Down-mix.
@@ -265,10 +265,6 @@ VideoData::SetVideoDataToImage(PlanarYCbCrImage* aVideoImage,
    return false;
  }

-  if (!ValidateBufferAndPicture(aBuffer, aPicture)) {
-    return false;
-  }
-
  PlanarYCbCrData data = ConstructPlanarYCbCrData(aInfo, aBuffer, aPicture);

  aVideoImage->SetDelayedConversion(true);
@@ -187,7 +187,7 @@ public:
  {
  }

-  VideoInfo(int32_t aWidth, int32_t aHeight)
+  explicit VideoInfo(int32_t aWidth, int32_t aHeight)
    : VideoInfo(nsIntSize(aWidth, aHeight))
  {
  }
@@ -201,6 +201,7 @@ public:
    , mCodecSpecificConfig(new MediaByteBuffer)
    , mExtraData(new MediaByteBuffer)
    , mRotation(kDegree_0)
+    , mImageRect(nsIntRect(nsIntPoint(), aSize))
  {
  }

@@ -262,28 +263,15 @@ public:

  nsIntRect ImageRect() const
  {
-    if (!mImageRect) {
+    if (mImageRect.width < 0 || mImageRect.height < 0) {
      return nsIntRect(0, 0, mImage.width, mImage.height);
    }
-    return *mImageRect;
+    return mImageRect;
  }

  void SetImageRect(const nsIntRect& aRect)
  {
-    mImageRect = Some(aRect);
-  }
-  void ResetImageRect() {
-    mImageRect.reset();
-  }
-
-  // Adopts an image size decoded from the bitstream. The picture rectangle is
-  // expressed relative to the image size, so a change in size invalidates it
-  // and it is discarded; an unchanged size keeps the existing rectangle.
-  void AdoptImageSize(const gfx::IntSize& aImage) {
-    if (mImage != aImage) {
-      ResetImageRect();
-    }
-    mImage = aImage;
+    mImageRect = aRect;
  }

  // Returned the crop rectangle scaled to aWidth/aHeight size relative to
@@ -344,11 +332,9 @@ public:
  uint8_t mBitDepth = 8;

 private:
-  friend struct IPC::ParamTraits<VideoInfo>;
-  
  // mImage may be cropped; currently only used with the WebM container.
-  // If unset, no cropping is to occur.
-  Maybe<nsIntRect> mImageRect;
+  // A negative width or height indicate that no cropping is to occur.
+  nsIntRect mImageRect;

  // Indicates whether or not frames may contain alpha information.
  bool mAlphaPresent = false;
@@ -381,13 +367,12 @@ public:
  {
  }

-  static const uint32_t MIN_RATE = 8000;
  static const uint32_t MAX_RATE = 640000;

  bool IsValid() const override
  {
    return mChannels > 0 && mChannels <= MAX_AUDIO_CHANNELS
-           && mRate >= MIN_RATE && mRate <= MAX_RATE;
+           && mRate > 0 && mRate <= MAX_RATE;
  }

  AudioInfo* GetAsAudioInfo() override
@@ -111,14 +111,12 @@ private:
  DECL_MEDIA_PREF("media.ffvpx.enabled",                      PDMFFVPXEnabled, bool, true);
 #endif
 #ifdef MOZ_AV1
-  DECL_MEDIA_PREF("media.av1.enabled",                        AV1Enabled, bool, true);
+  DECL_MEDIA_PREF("media.av1.enabled",                        AV1Enabled, bool, false);
 #endif
 #ifdef XP_WIN
  DECL_MEDIA_PREF("media.wmf.enabled",                        PDMWMFEnabled, bool, true);
  DECL_MEDIA_PREF("media.wmf.skip-blacklist",                 PDMWMFSkipBlacklist, bool, false);
  DECL_MEDIA_PREF("media.decoder-doctor.wmf-disabled-is-failure", DecoderDoctorWMFDisabledIsFailure, bool, false);
-  DECL_MEDIA_PREF("media.wmf.vp9.dxva2.enabled",              PDMWMFVP9DXVA2Enabled, bool, true);
-  DECL_MEDIA_PREF("media.wmf.vp9.mft.enabled",                PDMWMFVP9MFTEnabled, bool, true);
  DECL_MEDIA_PREF("media.wmf.vp9.enabled",                    PDMWMFVP9DecoderEnabled, bool, true);
  DECL_MEDIA_PREF("media.wmf.decoder.thread-count",           PDMWMFThreadCount, int32_t, -1);
 #endif
@@ -179,18 +179,12 @@ IsValidVideoRegion(const nsIntSize& aFrame, const nsIntRect& aPicture,
    aFrame.height <= PlanarYCbCrImage::MAX_DIMENSION &&
    aFrame.width * aFrame.height <= MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
    aFrame.width * aFrame.height != 0 &&
-    aPicture.width > 0 &&
    aPicture.width <= PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.x >= 0 &&
    aPicture.x < PlanarYCbCrImage::MAX_DIMENSION &&
    aPicture.x + aPicture.width < PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.XMost() <= aFrame.width &&
-    aPicture.height > 0 &&
    aPicture.height <= PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.y >= 0 &&
    aPicture.y < PlanarYCbCrImage::MAX_DIMENSION &&
    aPicture.y + aPicture.height < PlanarYCbCrImage::MAX_DIMENSION &&
-    aPicture.YMost() <= aFrame.height &&
    aPicture.width * aPicture.height <= MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
    aPicture.width * aPicture.height != 0 &&
    aDisplay.width <= PlanarYCbCrImage::MAX_DIMENSION &&
@@ -25,7 +25,7 @@ namespace IPC {
      WriteParam(aMsg, aParam.mDisplay);
      WriteParam(aMsg, aParam.mStereoMode);
      WriteParam(aMsg, aParam.mImage);
-      WriteParam(aMsg, aParam.mImageRect);
+      WriteParam(aMsg, aParam.ImageRect());
    }

    static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
@@ -35,7 +35,8 @@ namespace IPC {
          ReadParam(aMsg, aIter, &aResult->mDisplay) &&
          ReadParam(aMsg, aIter, &aResult->mStereoMode) &&
          ReadParam(aMsg, aIter, &aResult->mImage) &&
-          ReadParam(aMsg, aIter, &aResult->mImageRect)) {
+          ReadParam(aMsg, aIter, &imageRect)) {
+        aResult->SetImageRect(imageRect);
        return true;
      }
      return false;
@@ -439,7 +439,7 @@ private:
    Maybe<size_t> mInitOffset;
    Maybe<size_t> mMediaOffset;
    bool mValid = true;
-    char mLastInvalidBox[5]{};
+    char mLastInvalidBox[5];
  };

 public:
@@ -13,11 +13,7 @@
 #include "TheoraDecoder.h"

 #ifdef MOZ_AV1
-#ifdef AV1_USE_AOM
 #include "AOMDecoder.h"
-#else
-#include "Dav1dDecoder.h"
-#endif
 #endif

 namespace mozilla {
@@ -34,11 +30,7 @@ AgnosticDecoderModule::SupportsMimeType(const nsACString& aMimeType,
    TheoraDecoder::IsTheora(aMimeType);
 #ifdef MOZ_AV1
  if (MediaPrefs::AV1Enabled()) {
-#ifdef AV1_USE_AOM
    supports |= AOMDecoder::IsAV1(aMimeType);
-#else
-    supports |= Dav1dDecoder::IsAV1(aMimeType);
-#endif
  }
 #endif
  MOZ_LOG(sPDMLog, LogLevel::Debug, ("Agnostic decoder %s requested type",
@@ -55,17 +47,10 @@ AgnosticDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
    m = new VPXDecoder(aParams);
  }
 #ifdef MOZ_AV1
-#ifdef AV1_USE_AOM
  else if (AOMDecoder::IsAV1(aParams.mConfig.mMimeType) &&
           MediaPrefs::AV1Enabled()) {
    m = new AOMDecoder(aParams);
  }
-#else
-  else if (Dav1dDecoder::IsAV1(aParams.mConfig.mMimeType) &&
-           MediaPrefs::AV1Enabled()) {
-    m = new Dav1dDecoder(aParams);
-  }
-#endif
 #endif
  else if (TheoraDecoder::IsTheora(aParams.mConfig.mMimeType)) {
    m = new TheoraDecoder(aParams);
@@ -1,376 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "Dav1dDecoder.h"
-#include "MediaResult.h"
-#include "TimeUnits.h"
-#include "dav1d/dav1d.h"
-#include "mozilla/CheckedInt.h"
-#include "mozilla/PodOperations.h"
-#include "mozilla/SyncRunnable.h"
-#include "mozilla/UniquePtr.h"
-#include "mozilla/UniquePtrExtensions.h"
-#include "nsError.h"
-#include "prsystem.h"
-
-#include <algorithm>
-#include <errno.h>
-#include <string.h>
-
-#undef LOG
-#define LOG(arg, ...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, ("Dav1dDecoder(%p)::%s: " arg, this, __func__, ##__VA_ARGS__))
-
-namespace mozilla {
-
-using namespace gfx;
-using namespace layers;
-
-Dav1dDecoder::Dav1dDecoder(const CreateDecoderParams& aParams)
-  : mImageContainer(aParams.mImageContainer)
-  , mTaskQueue(aParams.mTaskQueue)
-  , mCallback(aParams.mCallback)
-  , mIsFlushing(false)
-  , mDecoder(nullptr)
-  , mInfo(aParams.VideoConfig())
-{
-}
-
-Dav1dDecoder::~Dav1dDecoder()
-{
-}
-
-void
-Dav1dDecoder::Shutdown()
-{
-  if (mDecoder) {
-    dav1d_close(&mDecoder);
-  }
-}
-
-RefPtr<MediaDataDecoder::InitPromise>
-Dav1dDecoder::Init()
-{
-  int decodeThreads = 2;
-  if (mInfo.mDisplay.width >= 2048) {
-    decodeThreads = 8;
-  } else if (mInfo.mDisplay.width >= 1024) {
-    decodeThreads = 4;
-  }
-  decodeThreads = std::min(decodeThreads, PR_GetNumberOfProcessors());
-
-  Dav1dSettings settings;
-  dav1d_default_settings(&settings);
-  settings.n_threads = decodeThreads;
-  settings.logger.callback = nullptr;
-
-  if (dav1d_open(&mDecoder, &settings) < 0) {
-    return InitPromise::CreateAndReject(NS_ERROR_DOM_MEDIA_FATAL_ERR, __func__);
-  }
-  return InitPromise::CreateAndResolve(TrackInfo::kVideoTrack, __func__);
-}
-
-void
-Dav1dDecoder::Flush()
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  mIsFlushing = true;
-  nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction([this] () {
-    if (mDecoder) {
-      dav1d_flush(mDecoder);
-    }
-  });
-  SyncRunnable::DispatchToThread(mTaskQueue, r);
-  mIsFlushing = false;
-}
-
-static bool
-GetPlaneSize(int aWidth, int aHeight, size_t* aSize)
-{
-  CheckedInt<size_t> size = aWidth;
-  size *= aHeight;
-  if (!size.isValid()) {
-    return false;
-  }
-  *aSize = size.value();
-  return true;
-}
-
-static void
-DownshiftPlane(uint8_t* aDst, int aDstStride, const uint8_t* aSrc,
-               ptrdiff_t aSrcStride, int aWidth, int aHeight, int aShift)
-{
-  for (int y = 0; y < aHeight; y++) {
-    const uint16_t* src =
-      reinterpret_cast<const uint16_t*>(aSrc + y * aSrcStride);
-    uint8_t* dst = aDst + y * aDstStride;
-    for (int x = 0; x < aWidth; x++) {
-      dst[x] = (src[x] >> aShift) & 0xff;
-    }
-  }
-}
-
-MediaResult
-Dav1dDecoder::OutputPicture(const Dav1dPicture& aPicture)
-{
-  const int width = aPicture.p.w;
-  const int height = aPicture.p.h;
-  if (width <= 0 || height <= 0) {
-    return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-                       RESULT_DETAIL("dav1d returned invalid AV1 picture size"));
-  }
-
-  int chromaWidth = width;
-  int chromaHeight = height;
-  switch (aPicture.p.layout) {
-    case DAV1D_PIXEL_LAYOUT_I420:
-      chromaWidth = (width + 1) >> 1;
-      chromaHeight = (height + 1) >> 1;
-      break;
-    case DAV1D_PIXEL_LAYOUT_I422:
-      chromaWidth = (width + 1) >> 1;
-      chromaHeight = height;
-      break;
-    case DAV1D_PIXEL_LAYOUT_I444:
-      break;
-    default:
-      return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-                         RESULT_DETAIL("dav1d returned unsupported AV1 pixel layout: %d",
-                                       int(aPicture.p.layout)));
-  }
-
-  const int planeWidths[3] = { width, chromaWidth, chromaWidth };
-  const int planeHeights[3] = { height, chromaHeight, chromaHeight };
-  const ptrdiff_t srcStrides[3] = {
-    aPicture.stride[0],
-    aPicture.stride[1],
-    aPicture.stride[1]
-  };
-  uint8_t* planeData[3] = {
-    static_cast<uint8_t*>(aPicture.data[0]),
-    static_cast<uint8_t*>(aPicture.data[1]),
-    static_cast<uint8_t*>(aPicture.data[2])
-  };
-  uint32_t planeStrides[3] = { 0, 0, 0 };
-  UniquePtr<uint8_t[]> downshifted[3];
-
-  if (aPicture.p.bpc > 8) {
-    const int shift = aPicture.p.bpc - 8;
-    for (int plane = 0; plane < 3; plane++) {
-      size_t planeSize;
-      if (!GetPlaneSize(planeWidths[plane], planeHeights[plane], &planeSize)) {
-        return MediaResult(NS_ERROR_OUT_OF_MEMORY,
-                           RESULT_DETAIL("AV1 downshift plane size overflow"));
-      }
-      downshifted[plane] = MakeUniqueFallible<uint8_t[]>(planeSize);
-      if (!downshifted[plane]) {
-        return MediaResult(NS_ERROR_OUT_OF_MEMORY,
-                           RESULT_DETAIL("Couldn't allocate AV1 conversion buffer"));
-      }
-      DownshiftPlane(downshifted[plane].get(), planeWidths[plane],
-                     planeData[plane], srcStrides[plane],
-                     planeWidths[plane], planeHeights[plane], shift);
-      planeData[plane] = downshifted[plane].get();
-      planeStrides[plane] = planeWidths[plane];
-    }
-  } else {
-    for (int plane = 0; plane < 3; plane++) {
-      CheckedInt<uint32_t> stride(srcStrides[plane]);
-      if (srcStrides[plane] < 0 || !stride.isValid()) {
-        return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-                           RESULT_DETAIL("dav1d returned invalid AV1 stride"));
-      }
-      planeStrides[plane] = stride.value();
-    }
-  }
-
-  VideoData::YCbCrBuffer b;
-  for (int plane = 0; plane < 3; plane++) {
-    b.mPlanes[plane].mData = planeData[plane];
-    b.mPlanes[plane].mStride = planeStrides[plane];
-    b.mPlanes[plane].mHeight = planeHeights[plane];
-    b.mPlanes[plane].mWidth = planeWidths[plane];
-    b.mPlanes[plane].mOffset = 0;
-    b.mPlanes[plane].mSkip = 0;
-  }
-
-  if (aPicture.seq_hdr) {
-    switch (aPicture.seq_hdr->mtrx) {
-      case DAV1D_MC_BT601:
-      case DAV1D_MC_BT470BG:
-        b.mYUVColorSpace = YUVColorSpace::BT601;
-        break;
-      case DAV1D_MC_BT709:
-        b.mYUVColorSpace = YUVColorSpace::BT709;
-        break;
-      case DAV1D_MC_IDENTITY:
-        b.mYUVColorSpace = YUVColorSpace::IDENTITY;
-        break;
-      default:
-        LOG("Unhandled colorspace %d", aPicture.seq_hdr->mtrx);
-        break;
-    }
-    b.mColorRange = aPicture.seq_hdr->color_range ? ColorRange::FULL
-                                                  : ColorRange::LIMITED;
-  }
-
-  const int64_t time =
-    aPicture.m.timestamp == INT64_MIN ? 0 : aPicture.m.timestamp;
-  const int64_t duration = aPicture.m.duration;
-  const int64_t offset = aPicture.m.offset;
-  const bool keyframe =
-    aPicture.frame_hdr &&
-    aPicture.frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY;
-
-  RefPtr<VideoData> v =
-    VideoData::CreateAndCopyData(mInfo,
-                                 mImageContainer,
-                                 offset,
-                                 time,
-                                 duration,
-                                 b,
-                                 keyframe,
-                                 time,
-                                 mInfo.ScaledImageRect(width, height));
-
-  if (!v) {
-    LOG("Image allocation error source %dx%d display %ux%u picture %ux%u",
-        width, height, mInfo.mDisplay.width, mInfo.mDisplay.height,
-        mInfo.mImage.width, mInfo.mImage.height);
-    return MediaResult(NS_ERROR_OUT_OF_MEMORY, __func__);
-  }
-  mCallback->Output(v);
-  return NS_OK;
-}
-
-MediaResult
-Dav1dDecoder::DrainOutput()
-{
-  while (true) {
-    Dav1dPicture picture;
-    PodZero(&picture);
-    const int res = dav1d_get_picture(mDecoder, &picture);
-    if (res == DAV1D_ERR(EAGAIN)) {
-      return NS_OK;
-    }
-    if (res < 0) {
-      return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-                         RESULT_DETAIL("dav1d error getting AV1 picture: %d",
-                                       res));
-    }
-
-    MediaResult rv = OutputPicture(picture);
-    dav1d_picture_unref(&picture);
-    if (NS_FAILED(rv)) {
-      return rv;
-    }
-  }
-}
-
-MediaResult
-Dav1dDecoder::DoDecode(MediaRawData* aSample)
-{
-  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-
-  Dav1dData data;
-  PodZero(&data);
-  uint8_t* dst = dav1d_data_create(&data, aSample->Size());
-  if (!dst) {
-    return MediaResult(NS_ERROR_OUT_OF_MEMORY,
-                       RESULT_DETAIL("Couldn't allocate dav1d AV1 input buffer"));
-  }
-  memcpy(dst, aSample->Data(), aSample->Size());
-  data.m.timestamp = aSample->mTime;
-  data.m.duration = aSample->mDuration;
-  data.m.offset = aSample->mOffset;
-  data.m.size = aSample->Size();
-
-  while (data.sz) {
-    const int res = dav1d_send_data(mDecoder, &data);
-    if (res == DAV1D_ERR(EAGAIN)) {
-      MediaResult rv = DrainOutput();
-      if (NS_FAILED(rv)) {
-        dav1d_data_unref(&data);
-        return rv;
-      }
-      continue;
-    }
-    if (res < 0) {
-      dav1d_data_unref(&data);
-      return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
-                         RESULT_DETAIL("dav1d error decoding AV1 sample: %d",
-                                       res));
-    }
-  }
-
-  dav1d_data_unref(&data);
-  return DrainOutput();
-}
-
-void
-Dav1dDecoder::ProcessDecode(MediaRawData* aSample)
-{
-  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-  if (mIsFlushing) {
-    return;
-  }
-  MediaResult rv = DoDecode(aSample);
-  if (NS_FAILED(rv)) {
-    mCallback->Error(rv);
-  } else {
-    mCallback->InputExhausted();
-  }
-}
-
-void
-Dav1dDecoder::Input(MediaRawData* aSample)
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  mTaskQueue->Dispatch(NewRunnableMethod<RefPtr<MediaRawData>>(
-                       this, &Dav1dDecoder::ProcessDecode, aSample));
-}
-
-void
-Dav1dDecoder::ProcessDrain()
-{
-  MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
-  MediaResult rv = DrainOutput();
-  if (NS_FAILED(rv)) {
-    mCallback->Error(rv);
-  } else {
-    mCallback->DrainComplete();
-  }
-}
-
-void
-Dav1dDecoder::Drain()
-{
-  MOZ_ASSERT(mCallback->OnReaderTaskQueue());
-  mTaskQueue->Dispatch(NewRunnableMethod(this, &Dav1dDecoder::ProcessDrain));
-}
-
-/* static */
-bool
-Dav1dDecoder::IsAV1(const nsACString& aMimeType)
-{
-  return aMimeType.EqualsLiteral("video/webm; codecs=av1") ||
-         aMimeType.EqualsLiteral("video/av1");
-}
-
-/* static */
-nsIntSize
-Dav1dDecoder::GetFrameSize(Span<const uint8_t> aBuffer)
-{
-  Dav1dSequenceHeader seqHdr;
-  PodZero(&seqHdr);
-  if (dav1d_parse_sequence_header(&seqHdr,
-                                  aBuffer.Elements(),
-                                  aBuffer.Length()) < 0) {
-    return nsIntSize(0, 0);
-  }
-  return nsIntSize(seqHdr.max_width, seqHdr.max_height);
-}
-
-} // namespace mozilla
-#undef LOG
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#if !defined(Dav1dDecoder_h_)
-#define Dav1dDecoder_h_
-
-#include "PlatformDecoderModule.h"
-#include "mozilla/Span.h"
-
-#include <stdint.h>
-
-typedef struct Dav1dContext Dav1dContext;
-typedef struct Dav1dPicture Dav1dPicture;
-
-namespace mozilla {
-
-class Dav1dDecoder : public MediaDataDecoder
-{
-public:
-  explicit Dav1dDecoder(const CreateDecoderParams& aParams);
-
-  RefPtr<InitPromise> Init() override;
-  void Input(MediaRawData* aSample) override;
-  void Flush() override;
-  void Drain() override;
-  void Shutdown() override;
-  const char* GetDescriptionName() const override
-  {
-    return "dav1d (AV1) video decoder";
-  }
-
-  // Return true if aMimeType is a one of the strings used
-  // by our demuxers to identify AV1 streams.
-  static bool IsAV1(const nsACString& aMimeType);
-
-  // Return the frame dimensions from a sequence header, when one is present.
-  static nsIntSize GetFrameSize(Span<const uint8_t> aBuffer);
-
-private:
-  ~Dav1dDecoder();
-  void ProcessDecode(MediaRawData* aSample);
-  MediaResult DoDecode(MediaRawData* aSample);
-  MediaResult DrainOutput();
-  MediaResult OutputPicture(const Dav1dPicture& aPicture);
-  void ProcessDrain();
-
-  const RefPtr<layers::ImageContainer> mImageContainer;
-  const RefPtr<TaskQueue> mTaskQueue;
-  MediaDataDecoderCallback* mCallback;
-  Atomic<bool> mIsFlushing;
-
-  Dav1dContext* mDecoder;
-
-  const VideoInfo& mInfo;
-};
-
-} // namespace mozilla
-
-#endif // Dav1dDecoder_h_
@@ -85,12 +85,8 @@ FFmpegDataDecoder<LIBAV_VER>::InitDecoder()

  if (mLib->avcodec_open2(mCodecContext, codec, nullptr) < 0) {
    NS_WARNING("Couldn't initialize ffmpeg decoder");
-#if LIBAVCODEC_VERSION_MAJOR >= 62
-    mLib->avcodec_free_context(&mCodecContext);
-#else
    mLib->avcodec_close(mCodecContext);
    mLib->av_freep(&mCodecContext);
-#endif
    return NS_ERROR_FAILURE;
  }

@@ -167,15 +163,11 @@ FFmpegDataDecoder<LIBAV_VER>::ProcessShutdown()
  StaticMutexAutoLock mon(sMonitor);

  if (mCodecContext) {
-#if LIBAVCODEC_VERSION_MAJOR >= 62
-    mLib->avcodec_free_context(&mCodecContext);
-#else
    if (mCodecContext->extradata) {
      mLib->av_freep(&mCodecContext->extradata);
    }
    mLib->avcodec_close(mCodecContext);
    mLib->av_freep(&mCodecContext);
-#endif
    mLib->av_frame_free(&mFrame);
  }
 }
@@ -50,14 +50,11 @@ FFmpegLibWrapper::Link()
    AV_FUNC_59 = 1 << 1,
    AV_FUNC_60 = 1 << 2,
    AV_FUNC_61 = 1 << 3,
-    AV_FUNC_62 = 1 << 4,
    AV_FUNC_AVUTIL_58 = AV_FUNC_58 | AV_FUNC_AVUTIL_MASK,
    AV_FUNC_AVUTIL_59 = AV_FUNC_59 | AV_FUNC_AVUTIL_MASK,
    AV_FUNC_AVUTIL_60 = AV_FUNC_60 | AV_FUNC_AVUTIL_MASK,
    AV_FUNC_AVUTIL_61 = AV_FUNC_61 | AV_FUNC_AVUTIL_MASK,
-    AV_FUNC_AVUTIL_62 = AV_FUNC_62 | AV_FUNC_AVUTIL_MASK,
-    AV_FUNC_AVCODEC_ALL =
-      AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61 | AV_FUNC_62,
+    AV_FUNC_AVCODEC_ALL = AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61,
    AV_FUNC_AVUTIL_ALL = AV_FUNC_AVCODEC_ALL | AV_FUNC_AVUTIL_MASK
  };

@@ -74,9 +71,6 @@ FFmpegLibWrapper::Link()
    case 61:
      version = AV_FUNC_61;
      break;
-    case 62:
-      version = AV_FUNC_62;
-      break;
    default:
      FFMPEG_LOG("Unknown avcodec version: %d", macro);
      Unlink();
@@ -101,8 +95,7 @@ FFmpegLibWrapper::Link()

  AV_FUNC(av_lockmgr_register, AV_FUNC_58)
  AV_FUNC(avcodec_alloc_context3, AV_FUNC_AVCODEC_ALL)
-  AV_FUNC(avcodec_free_context, AV_FUNC_62)
-  AV_FUNC(avcodec_close, (AV_FUNC_58 | AV_FUNC_59 | AV_FUNC_60 | AV_FUNC_61))
+  AV_FUNC(avcodec_close, AV_FUNC_AVCODEC_ALL)
  AV_FUNC(avcodec_decode_audio4, AV_FUNC_58)
  AV_FUNC(avcodec_decode_video2, AV_FUNC_58)
  AV_FUNC(avcodec_find_decoder, AV_FUNC_AVCODEC_ALL)
@@ -115,8 +108,8 @@ FFmpegLibWrapper::Link()
  AV_FUNC(av_parser_parse2, AV_FUNC_AVCODEC_ALL)
  AV_FUNC(avcodec_send_packet, AV_FUNC_AVCODEC_ALL)
  AV_FUNC(avcodec_receive_frame, AV_FUNC_AVCODEC_ALL)
-  AV_FUNC(av_packet_alloc, (AV_FUNC_61 | AV_FUNC_62))
-  AV_FUNC(av_packet_free, (AV_FUNC_61 | AV_FUNC_62))
+  AV_FUNC(av_packet_alloc, AV_FUNC_61)
+  AV_FUNC(av_packet_free, AV_FUNC_61)
  AV_FUNC(av_log_set_level, AV_FUNC_AVUTIL_ALL)
  AV_FUNC(av_malloc, AV_FUNC_AVUTIL_ALL)
  AV_FUNC(av_freep, AV_FUNC_AVUTIL_ALL)
@@ -49,7 +49,6 @@ struct FFmpegLibWrapper
  unsigned (*avcodec_version)();
  int (*av_lockmgr_register)(int (*cb)(void** mutex, int op));
  AVCodecContext* (*avcodec_alloc_context3)(const AVCodec* codec);
-  void (*avcodec_free_context)(AVCodecContext** avctx);
  int (*avcodec_close)(AVCodecContext* avctx);
  int (*avcodec_decode_audio4)(AVCodecContext* avctx, AVFrame* frame, int* got_frame_ptr, const AVPacket* avpkt);
  int (*avcodec_decode_video2)(AVCodecContext* avctx, AVFrame* picture, int* got_picture_ptr, const AVPacket* avpkt);
@@ -26,13 +26,11 @@ static FFmpegLibWrapper sLibAV;

 static const char* sLibs[] = {
 #if defined(XP_DARWIN)
-  "libavcodec.62.dylib",
  "libavcodec.61.dylib",
  "libavcodec.60.dylib",
  "libavcodec.59.dylib",
  "libavcodec.58.dylib",
 #else
-  "libavcodec.so.62",
  "libavcodec.so.61",
  "libavcodec.so.60",
  "libavcodec.so.59",
@@ -106,7 +104,6 @@ FFmpegRuntimeLinker::CreateDecoderModule()
    case 59: module = FFmpegDecoderModule<59>::Create(&sLibAV); break;
    case 60: module = FFmpegDecoderModule<60>::Create(&sLibAV); break;
    case 61: module = FFmpegDecoderModule<61>::Create(&sLibAV); break;
-    case 62: module = FFmpegDecoderModule<62>::Create(&sLibAV); break;
    default: module = nullptr;
  }
  return module.forget();
@@ -266,11 +266,8 @@ FFmpegVideoDecoder<LIBAV_VER>::DoDecode(MediaRawData* aSample,
      return MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
                         RESULT_DETAIL("avcodec_receive_frame error: %d", res));
    }
-    int64_t offset = 0;
-#if LIBAVCODEC_VERSION_MAJOR < 62
-    offset = mFrame->pkt_pos;
-#endif
-    MediaResult rv = CreateImage(offset, GetFramePts(mFrame), Duration(mFrame));
+    MediaResult rv = CreateImage(mFrame->pkt_pos, GetFramePts(mFrame),
+                                 Duration(mFrame));
    if (NS_FAILED(rv)) {
      return rv;
    }
@@ -351,11 +348,7 @@ FFmpegVideoDecoder<LIBAV_VER>::CreateImage(int64_t aOffset, int64_t aPts,
                                  aPts,
                                  aDuration,
                                  b,
-#if LIBAVCODEC_VERSION_MAJOR >= 62
-                                  !!(mFrame->flags & AV_FRAME_FLAG_KEY),
-#else
                                  !!mFrame->key_frame,
-#endif
                                  -1,
                                  mInfo.ScaledImageRect(mFrame->width,
                                                        mFrame->height),
@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
@@ -1,367 +0,0 @@
-/*
- * AVCodec public API
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_CODEC_H
-#define AVCODEC_CODEC_H
-
-#include <stdint.h>
-
-#include "libavutil/avutil.h"
-#include "libavutil/hwcontext.h"
-#include "libavutil/log.h"
-#include "libavutil/pixfmt.h"
-#include "libavutil/rational.h"
-#include "libavutil/samplefmt.h"
-
-#include "libavcodec/codec_id.h"
-#include "libavcodec/version_major.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * Decoder can use draw_horiz_band callback.
- */
-#define AV_CODEC_CAP_DRAW_HORIZ_BAND     (1 <<  0)
-/**
- * Codec uses get_buffer() or get_encode_buffer() for allocating buffers and
- * supports custom allocators.
- * If not set, it might not use get_buffer() or get_encode_buffer() at all, or
- * use operations that assume the buffer was allocated by
- * avcodec_default_get_buffer2 or avcodec_default_get_encode_buffer.
- */
-#define AV_CODEC_CAP_DR1                 (1 <<  1)
-/**
- * Encoder or decoder requires flushing with NULL input at the end in order to
- * give the complete and correct output.
- *
- * NOTE: If this flag is not set, the codec is guaranteed to never be fed with
- *       with NULL data. The user can still send NULL data to the public encode
- *       or decode function, but libavcodec will not pass it along to the codec
- *       unless this flag is set.
- *
- * Decoders:
- * The decoder has a non-zero delay and needs to be fed with avpkt->data=NULL,
- * avpkt->size=0 at the end to get the delayed data until the decoder no longer
- * returns frames.
- *
- * Encoders:
- * The encoder needs to be fed with NULL data at the end of encoding until the
- * encoder no longer returns data.
- *
- * NOTE: For encoders implementing the AVCodec.encode2() function, setting this
- *       flag also means that the encoder must set the pts and duration for
- *       each output packet. If this flag is not set, the pts and duration will
- *       be determined by libavcodec from the input frame.
- */
-#define AV_CODEC_CAP_DELAY               (1 <<  5)
-/**
- * Codec can be fed a final frame with a smaller size.
- * This can be used to prevent truncation of the last audio samples.
- */
-#define AV_CODEC_CAP_SMALL_LAST_FRAME    (1 <<  6)
-
-/**
- * Codec is experimental and is thus avoided in favor of non experimental
- * encoders
- */
-#define AV_CODEC_CAP_EXPERIMENTAL        (1 <<  9)
-/**
- * Codec should fill in channel configuration and samplerate instead of container
- */
-#define AV_CODEC_CAP_CHANNEL_CONF        (1 << 10)
-/**
- * Codec supports frame-level multithreading.
- */
-#define AV_CODEC_CAP_FRAME_THREADS       (1 << 12)
-/**
- * Codec supports slice-based (or partition-based) multithreading.
- */
-#define AV_CODEC_CAP_SLICE_THREADS       (1 << 13)
-/**
- * Codec supports changed parameters at any point.
- */
-#define AV_CODEC_CAP_PARAM_CHANGE        (1 << 14)
-/**
- * Codec supports multithreading through a method other than slice- or
- * frame-level multithreading. Typically this marks wrappers around
- * multithreading-capable external libraries.
- */
-#define AV_CODEC_CAP_OTHER_THREADS       (1 << 15)
-/**
- * Audio encoder supports receiving a different number of samples in each call.
- */
-#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE (1 << 16)
-/**
- * Decoder is not a preferred choice for probing.
- * This indicates that the decoder is not a good choice for probing.
- * It could for example be an expensive to spin up hardware decoder,
- * or it could simply not provide a lot of useful information about
- * the stream.
- * A decoder marked with this flag should only be used as last resort
- * choice for probing.
- */
-#define AV_CODEC_CAP_AVOID_PROBING       (1 << 17)
-
-/**
- * Codec is backed by a hardware implementation. Typically used to
- * identify a non-hwaccel hardware decoder. For information about hwaccels, use
- * avcodec_get_hw_config() instead.
- */
-#define AV_CODEC_CAP_HARDWARE            (1 << 18)
-
-/**
- * Codec is potentially backed by a hardware implementation, but not
- * necessarily. This is used instead of AV_CODEC_CAP_HARDWARE, if the
- * implementation provides some sort of internal fallback.
- */
-#define AV_CODEC_CAP_HYBRID              (1 << 19)
-
-/**
- * This encoder can reorder user opaque values from input AVFrames and return
- * them with corresponding output packets.
- * @see AV_CODEC_FLAG_COPY_OPAQUE
- */
-#define AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE (1 << 20)
-
-/**
- * This encoder can be flushed using avcodec_flush_buffers(). If this flag is
- * not set, the encoder must be closed and reopened to ensure that no frames
- * remain pending.
- */
-#define AV_CODEC_CAP_ENCODER_FLUSH   (1 << 21)
-
-/**
- * The encoder is able to output reconstructed frame data, i.e. raw frames that
- * would be produced by decoding the encoded bitstream.
- *
- * Reconstructed frame output is enabled by the AV_CODEC_FLAG_RECON_FRAME flag.
- */
-#define AV_CODEC_CAP_ENCODER_RECON_FRAME (1 << 22)
-
-/**
- * AVProfile.
- */
-typedef struct AVProfile {
-    int profile;
-    const char *name; ///< short name for the profile
-} AVProfile;
-
-/**
- * AVCodec.
- */
-typedef struct AVCodec {
-    /**
-     * Name of the codec implementation.
-     * The name is globally unique among encoders and among decoders (but an
-     * encoder and a decoder can share the same name).
-     * This is the primary way to find a codec from the user perspective.
-     */
-    const char *name;
-    /**
-     * Descriptive name for the codec, meant to be more human readable than name.
-     * You should use the NULL_IF_CONFIG_SMALL() macro to define it.
-     */
-    const char *long_name;
-    enum AVMediaType type;
-    enum AVCodecID id;
-    /**
-     * Codec capabilities.
-     * see AV_CODEC_CAP_*
-     */
-    int capabilities;
-    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
-
-    /**
-     * Deprecated codec capabilities.
-     */
-    attribute_deprecated
-    const AVRational *supported_framerates; ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const enum AVPixelFormat *pix_fmts;     ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const int *supported_samplerates;       ///< @deprecated use avcodec_get_supported_config()
-    attribute_deprecated
-    const enum AVSampleFormat *sample_fmts; ///< @deprecated use avcodec_get_supported_config()
-
-    const AVClass *priv_class;              ///< AVClass for the private context
-    const AVProfile *profiles;              ///< array of recognized profiles, or NULL if unknown, array is terminated by {AV_PROFILE_UNKNOWN}
-
-    /**
-     * Group name of the codec implementation.
-     * This is a short symbolic name of the wrapper backing this codec. A
-     * wrapper uses some kind of external implementation for the codec, such
-     * as an external library, or a codec implementation provided by the OS or
-     * the hardware.
-     * If this field is NULL, this is a builtin, libavcodec native codec.
-     * If non-NULL, this will be the suffix in AVCodec.name in most cases
-     * (usually AVCodec.name will be of the form "<codec_name>_<wrapper_name>").
-     */
-    const char *wrapper_name;
-
-    /**
-     * Array of supported channel layouts, terminated with a zeroed layout.
-     * @deprecated use avcodec_get_supported_config()
-     */
-    attribute_deprecated
-    const AVChannelLayout *ch_layouts;
-} AVCodec;
-
-/**
- * Iterate over all registered codecs.
- *
- * @param opaque a pointer where libavcodec will store the iteration state. Must
- *               point to NULL to start the iteration.
- *
- * @return the next registered codec or NULL when the iteration is
- *         finished
- */
-const AVCodec *av_codec_iterate(void **opaque);
-
-/**
- * Find a registered decoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_decoder(enum AVCodecID id);
-
-/**
- * Find a registered decoder with the specified name.
- *
- * @param name name of the requested decoder
- * @return A decoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_decoder_by_name(const char *name);
-
-/**
- * Find a registered encoder with a matching codec ID.
- *
- * @param id AVCodecID of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_encoder(enum AVCodecID id);
-
-/**
- * Find a registered encoder with the specified name.
- *
- * @param name name of the requested encoder
- * @return An encoder if one was found, NULL otherwise.
- */
-const AVCodec *avcodec_find_encoder_by_name(const char *name);
-/**
- * @return a non-zero number if codec is an encoder, zero otherwise
- */
-int av_codec_is_encoder(const AVCodec *codec);
-
-/**
- * @return a non-zero number if codec is a decoder, zero otherwise
- */
-int av_codec_is_decoder(const AVCodec *codec);
-
-/**
- * Return a name for the specified profile, if available.
- *
- * @param codec the codec that is searched for the given profile
- * @param profile the profile value for which a name is requested
- * @return A name for the profile if found, NULL otherwise.
- */
-const char *av_get_profile_name(const AVCodec *codec, int profile);
-
-enum {
-    /**
-     * The codec supports this format via the hw_device_ctx interface.
-     *
-     * When selecting this format, AVCodecContext.hw_device_ctx should
-     * have been set to a device of the specified type before calling
-     * avcodec_open2().
-     */
-    AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX = 0x01,
-    /**
-     * The codec supports this format via the hw_frames_ctx interface.
-     *
-     * When selecting this format for a decoder,
-     * AVCodecContext.hw_frames_ctx should be set to a suitable frames
-     * context inside the get_format() callback.  The frames context
-     * must have been created on a device of the specified type.
-     *
-     * When selecting this format for an encoder,
-     * AVCodecContext.hw_frames_ctx should be set to the context which
-     * will be used for the input frames before calling avcodec_open2().
-     */
-    AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX = 0x02,
-    /**
-     * The codec supports this format by some internal method.
-     *
-     * This format can be selected without any additional configuration -
-     * no device or frames context is required.
-     */
-    AV_CODEC_HW_CONFIG_METHOD_INTERNAL      = 0x04,
-    /**
-     * The codec supports this format by some ad-hoc method.
-     *
-     * Additional settings and/or function calls are required.  See the
-     * codec-specific documentation for details.  (Methods requiring
-     * this sort of configuration are deprecated and others should be
-     * used in preference.)
-     */
-    AV_CODEC_HW_CONFIG_METHOD_AD_HOC        = 0x08,
-};
-
-typedef struct AVCodecHWConfig {
-    /**
-     * For decoders, a hardware pixel format which that decoder may be
-     * able to decode to if suitable hardware is available.
-     *
-     * For encoders, a pixel format which the encoder may be able to
-     * accept.  If set to AV_PIX_FMT_NONE, this applies to all pixel
-     * formats supported by the codec.
-     */
-    enum AVPixelFormat pix_fmt;
-    /**
-     * Bit set of AV_CODEC_HW_CONFIG_METHOD_* flags, describing the possible
-     * setup methods which can be used with this configuration.
-     */
-    int methods;
-    /**
-     * The device type associated with the configuration.
-     *
-     * Must be set for AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX and
-     * AV_CODEC_HW_CONFIG_METHOD_HW_FRAMES_CTX, otherwise unused.
-     */
-    enum AVHWDeviceType device_type;
-} AVCodecHWConfig;
-
-/**
- * Retrieve supported hardware configurations for a codec.
- *
- * Values of index from zero to some maximum return the indexed configuration
- * descriptor; all other values return NULL.  If the codec does not support
- * any hardware configurations then it will always return NULL.
- */
-const AVCodecHWConfig *avcodec_get_hw_config(const AVCodec *codec, int index);
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_CODEC_H */
@@ -1,142 +0,0 @@
-/*
- * Codec descriptors public API
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_CODEC_DESC_H
-#define AVCODEC_CODEC_DESC_H
-
-#include "libavutil/avutil.h"
-
-#include "codec_id.h"
-
-/**
- * @addtogroup lavc_core
- * @{
- */
-
-/**
- * This struct describes the properties of a single codec described by an
- * AVCodecID.
- * @see avcodec_descriptor_get()
- */
-typedef struct AVCodecDescriptor {
-    enum AVCodecID     id;
-    enum AVMediaType type;
-    /**
-     * Name of the codec described by this descriptor. It is non-empty and
-     * unique for each codec descriptor. It should contain alphanumeric
-     * characters and '_' only.
-     */
-    const char      *name;
-    /**
-     * A more descriptive name for this codec. May be NULL.
-     */
-    const char *long_name;
-    /**
-     * Codec properties, a combination of AV_CODEC_PROP_* flags.
-     */
-    int             props;
-    /**
-     * MIME type(s) associated with the codec.
-     * May be NULL; if not, a NULL-terminated array of MIME types.
-     * The first item is always non-NULL and is the preferred MIME type.
-     */
-    const char *const *mime_types;
-    /**
-     * If non-NULL, an array of profiles recognized for this codec.
-     * Terminated with AV_PROFILE_UNKNOWN.
-     */
-    const struct AVProfile *profiles;
-} AVCodecDescriptor;
-
-/**
- * Codec uses only intra compression.
- * Video and audio codecs only.
- */
-#define AV_CODEC_PROP_INTRA_ONLY    (1 << 0)
-/**
- * Codec supports lossy compression. Audio and video codecs only.
- * @note a codec may support both lossy and lossless
- * compression modes
- */
-#define AV_CODEC_PROP_LOSSY         (1 << 1)
-/**
- * Codec supports lossless compression. Audio and video codecs only.
- */
-#define AV_CODEC_PROP_LOSSLESS      (1 << 2)
-/**
- * Codec supports frame reordering. That is, the coded order (the order in which
- * the encoded packets are output by the encoders / stored / input to the
- * decoders) may be different from the presentation order of the corresponding
- * frames.
- *
- * For codecs that do not have this property set, PTS and DTS should always be
- * equal.
- */
-#define AV_CODEC_PROP_REORDER       (1 << 3)
-
-/**
- * Video codec supports separate coding of fields in interlaced frames.
- */
-#define AV_CODEC_PROP_FIELDS        (1 << 4)
-
-/**
- * Video codec contains enhancement information meant to be applied to other
- * existing frames, and can't generate usable image data on its own.
- * A standalone decoder is unlikely to be available for it and should not
- * be expected.
- */
-#define AV_CODEC_PROP_ENHANCEMENT   (1 << 5)
-
-/**
- * Subtitle codec is bitmap based
- * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
- */
-#define AV_CODEC_PROP_BITMAP_SUB    (1 << 16)
-/**
- * Subtitle codec is text based.
- * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
- */
-#define AV_CODEC_PROP_TEXT_SUB      (1 << 17)
-
-/**
- * @return descriptor for given codec ID or NULL if no descriptor exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get(enum AVCodecID id);
-
-/**
- * Iterate over all codec descriptors known to libavcodec.
- *
- * @param prev previous descriptor. NULL to get the first descriptor.
- *
- * @return next descriptor or NULL after the last descriptor
- */
-const AVCodecDescriptor *avcodec_descriptor_next(const AVCodecDescriptor *prev);
-
-/**
- * @return codec descriptor with the given name or NULL if no such descriptor
- *         exists.
- */
-const AVCodecDescriptor *avcodec_descriptor_get_by_name(const char *name);
-
-/**
- * @}
- */
-
-#endif // AVCODEC_CODEC_DESC_H
Author	SHA1	Message	Date
Basilisk-Dev	3ed4888c06	Safely parallelize GC background finalization Parallelize background finalization across zones within each finalize phase while preserving phase ordering and falling back to serial work when no helper thread is idle. Make compacting GC pointer updates schedule background work per zone and only when enough background-safe arenas exist.	2026-05-18 09:56:40 +02:00
Basilisk-Dev	a6166027fa	Fix unsafe GC multithreading changes	2026-05-18 09:56:32 +02:00
ownedbywuigi	cc40df4933	close tab = quick gc pass	2026-05-18 09:56:17 +02:00
ownedbywuigi	7fe7fa64da	Initial idle GC implementation	2026-05-18 09:55:25 +02:00
ownedbywuigi	c6c5bcb1ee	Implement parallel sweeping and compaction tasks for improved garbage collection performance	2026-05-18 09:54:22 +02:00
ownedbywuigi	028d533884	Implement BackgroundFinalizeTask for parallel garbage collection finalization	2026-05-18 09:53:21 +02:00
ownedbywuigi	1decb66e13	Add new GC sweep tasks for saved stacks, self-hosting scripts, and native iterators	2026-05-18 09:52:10 +02:00
ownedbywuigi	73d9a067bd	Refactor wasm compilation handling	2026-05-18 09:52:05 +02:00