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 17:00:06 -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
1594 changed files with 71991 additions and 377636 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 removal of network tickler
+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
@@ -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);
@@ -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,7 +111,7 @@ 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);
@@ -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_
@@ -55,20 +55,12 @@ if CONFIG['MOZ_FFMPEG']:
    ]

 if CONFIG['MOZ_AV1']:
-    if CONFIG['AV1_USE_AOM']:
-        EXPORTS += [
-            'agnostic/AOMDecoder.h',
-        ]
-        UNIFIED_SOURCES += [
-            'agnostic/AOMDecoder.cpp',
-        ]
-    else:
-        EXPORTS += [
-            'agnostic/Dav1dDecoder.h',
-        ]
-        UNIFIED_SOURCES += [
-            'agnostic/Dav1dDecoder.cpp',
-        ]
+    EXPORTS += [
+        'agnostic/AOMDecoder.h',
+    ]
+    UNIFIED_SOURCES += [
+        'agnostic/AOMDecoder.cpp',
+    ]

 if CONFIG['MOZ_APPLEMEDIA']:
  EXPORTS += [
@@ -847,15 +847,12 @@ WMFVideoMFTManager::CreateBasicVideoFrame(IMFSample* aSample,
  RefPtr<layers::PlanarYCbCrImage> image =
    new IMFYCbCrImage(buffer, twoDBuffer);

-  if (!VideoData::SetVideoDataToImage(image,
-                                      mVideoInfo,
-                                      b,
-                                      pictureRegion,
-                                      false)) {
-    LOG("CreateBasicVideoFrame: failed to set video data to image (shmem path)");
-    return E_FAIL;
-  }
-  
+  VideoData::SetVideoDataToImage(image,
+                                 mVideoInfo,
+                                 b,
+                                 pictureRegion,
+                                 false);
+
  RefPtr<VideoData> v =
    VideoData::CreateFromImage(mVideoInfo,
                               aStreamOffset,
@@ -307,7 +307,8 @@ H264Converter::UpdateConfigFromExtraData(MediaByteBuffer* aExtraData)
  if (mp4_demuxer::H264::DecodeSPSFromExtraData(aExtraData, spsdata) &&
      spsdata.pic_width > 0 && spsdata.pic_height > 0) {
    mp4_demuxer::H264::EnsureSPSIsSane(spsdata);
-    mCurrentConfig.AdoptImageSize(gfx::IntSize(spsdata.pic_width, spsdata.pic_height));
+    mCurrentConfig.mImage.width = spsdata.pic_width;
+    mCurrentConfig.mImage.height = spsdata.pic_height;
    mCurrentConfig.mDisplay.width = spsdata.display_width;
    mCurrentConfig.mDisplay.height = spsdata.display_height;
  }
@@ -26,7 +26,7 @@ ThreadSharedFloatArrayBufferList::Create(uint32_t aChannelCount,
    new ThreadSharedFloatArrayBufferList(aChannelCount);

  for (uint32_t i = 0; i < aChannelCount; ++i) {
-    float* channelData = js_pod_calloc<float>(aLength);
+    float* channelData = js_pod_malloc<float>(aLength);
    if (!channelData) {
      return nullptr;
    }
@@ -40,8 +40,8 @@ public:
  }
  /**
   * Create with buffers suitable for transfer to
-   * JS_NewArrayBufferWithContents().  The buffer contents are
-   * zero-initialized; callers should set them using GetDataForWrite().
+   * JS_NewArrayBufferWithContents().  The buffer contents are uninitialized
+   * and so should be set using GetDataForWrite().
   */
  static already_AddRefed<ThreadSharedFloatArrayBufferList>
  Create(uint32_t aChannelCount, size_t aLength, const mozilla::fallible_t&);
@@ -4,7 +4,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 #include "mozilla/Preferences.h"
-#if defined(MOZ_AV1) && defined(AV1_USE_AOM)
+#ifdef MOZ_AV1
 #include "AOMDecoder.h"
 #endif
 #include "MediaPrefs.h"
@@ -136,3 +136,4 @@ WebMDecoder::GetMozDebugReaderData(nsAString& aString)
 }

 } // namespace mozilla
+
@@ -24,11 +24,6 @@ if CONFIG['MOZ_WEBM_ENCODER']:
        'WebMWriter.cpp',
    ]

-if CONFIG['MOZ_AV1']:
-    LOCAL_INCLUDES += [
-        '/dom/media/platforms/agnostic',
-    ]
-
 CXXFLAGS += CONFIG['MOZ_LIBVPX_CFLAGS']

 FINAL_LIBRARY = 'xul'
@@ -29,7 +29,8 @@ enum {
 * Abstract interface for managing audio and video devices. Each platform
 * must implement a concrete class that will map these classes and methods
 * to the appropriate backend. For example, on Desktop platforms, these will
- * correspond to equivalent webrtc (GIPS) calls.
+ * correspond to equivalent webrtc (GIPS) calls, and on B2G they will map to
+ * a Gonk interface.
 */
 class MediaEngineVideoSource;
 class MediaEngineAudioSource;
@@ -301,6 +302,7 @@ public:

  /* If implementation of MediaEngineSource supports TakePhoto(), the picture
   * should be return via aCallback object. Otherwise, it returns NS_ERROR_NOT_IMPLEMENTED.
+   * Currently, only Gonk MediaEngineSource implementation supports it.
   */
  virtual nsresult TakePhoto(MediaEnginePhotoCallback* aCallback) = 0;

@@ -36,8 +36,8 @@ bool MediaEngineCameraVideoSource::AppendToTrack(SourceMediaStream* aSource,
  return aSource->AppendToTrack(aID, &(segment));
 }

-// Subclasses should overload one or both of these methods to provide
-// capabilities.
+// Sub-classes (B2G or desktop) should overload one of both of these two methods
+// to provide capabilities
 size_t
 MediaEngineCameraVideoSource::NumCapabilities() const
 {
@@ -324,6 +324,21 @@ MediaEngineCameraVideoSource::SetName(nsString aName)
  bool hasFacingMode = false;
  VideoFacingModeEnum facingMode = VideoFacingModeEnum::User;

+  // Set facing mode based on device name.
+#if defined(ANDROID)
+  // Names are generated. Example: "Camera 0, Facing back, Orientation 90"
+  //
+  // See media/webrtc/trunk/webrtc/modules/video_capture/android/java/src/org/
+  // webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java
+
+  if (aName.Find(NS_LITERAL_STRING("Facing back")) != kNotFound) {
+    hasFacingMode = true;
+    facingMode = VideoFacingModeEnum::Environment;
+  } else if (aName.Find(NS_LITERAL_STRING("Facing front")) != kNotFound) {
+    hasFacingMode = true;
+    facingMode = VideoFacingModeEnum::User;
+  }
+#endif // ANDROID
 #ifdef XP_MACOSX
  // Kludge to test user-facing cameras on OSX.
  if (aName.Find(NS_LITERAL_STRING("Face")) != -1) {
@@ -108,7 +108,7 @@ protected:
  nsTArray<PrincipalHandle> mPrincipalHandles; // Directly mapped to mSources.
  RefPtr<layers::Image> mImage;
  RefPtr<layers::ImageContainer> mImageContainer;
-  int mWidth, mHeight; // protected with mMonitor
+  int mWidth, mHeight; // protected with mMonitor on Gonk due to different threading
  // end of data protected by mMonitor
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