Issue #3020 - Clear currentScript after running microtasks

Per HTML spec:

`document.currentScript` Returns null if the Document is not currently
executing a script or SVG script element (e.g., because the running
script is an event handler, or a timeout), or if the currently executing
script or SVG script element represents a module script.

---

It's ambiguous about whether, for micro tasks, it should return null.
(This section is labelled as "non-normative", as well.)
However, mainstream browsers handle this differently and don't return
null after running microtasks, so we need to clear this and not assume
null persistently, and run the auto-updater for it, regardless if
it's a module or not.

CLOBBER

@@ -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 CSS rule processor refactoring
+Clobber for libvpx changes

accessible/atk/Platform.cpp

@@ -6,7 +6,7 @@
 #include "Platform.h"
 
 #include "nsIAccessibleEvent.h"
-#include "nsIGConfService.h"
+#include "nsIGSettingsService.h"
 #include "nsIServiceManager.h"
 #include "nsMai.h"
 #include "AtkSocketAccessible.h"
@@ -360,13 +360,22 @@ dbus_done:
     return sShouldEnable;
 #endif
 
-  //check gconf-2 setting
-#define GCONF_A11Y_KEY "/desktop/gnome/interface/accessibility"
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsIGConfService> gconf =
-    do_GetService(NS_GCONFSERVICE_CONTRACTID, &rv);
-  if (NS_SUCCEEDED(rv) && gconf)
-    gconf->GetBool(NS_LITERAL_CSTRING(GCONF_A11Y_KEY), &sShouldEnable);
+// check GSettings
+#define GSETINGS_A11Y_INTERFACE "org.gnome.desktop.interface"
+#define GSETINGS_A11Y_KEY       "toolkit-accessibility"
+  nsCOMPtr<nsIGSettingsService> gsettings =
+      do_GetService(NS_GSETTINGSSERVICE_CONTRACTID);
+  nsCOMPtr<nsIGSettingsCollection> a11y_settings;
+
+  if (gsettings) {
+	gsettings->GetCollectionForSchema(NS_LITERAL_CSTRING(GSETINGS_A11Y_INTERFACE),
+	                                  getter_AddRefs(a11y_settings));
+
+    if (a11y_settings) {
+	  a11y_settings->GetBoolean(NS_LITERAL_CSTRING(GSETINGS_A11Y_KEY),
+	                            &sShouldEnable);
+    }
+  }
 
   return sShouldEnable;
 }

build/autoconf/config.guess

@@ -982,6 +982,9 @@ EOF
     k1om:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    loongarch64:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+        exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;

build/moz.configure/init.configure

@@ -375,6 +375,9 @@ def split_triplet(triplet):
     elif cpu.startswith('aarch64'):
         canonical_cpu = 'aarch64'
         endianness = 'little'
+    elif cpu.startswith('loongarch64'):
+        canonical_cpu = 'loongarch64'
+        endianness = 'little'
     else:
         die('Unknown CPU type: %s' % cpu)
 

build/moz.configure/memory.configure

@@ -11,9 +11,14 @@ def moz_jemalloc4(value):
 
 option('--enable-jemalloc', env='MOZ_MEMORY',
        help='Replace system memory allocator with jemalloc')
+option('--enable-mimalloc',
+       help='Replace system memory allocator with mimalloc')
 
-@depends('--enable-jemalloc', target, build_project, c_compiler)
-def jemalloc(value, target, build_project, c_compiler):
+@depends('--enable-jemalloc', '--enable-mimalloc', target, build_project,
+         c_compiler)
+def jemalloc(value, mimalloc, target, build_project, c_compiler):
+    if value and mimalloc:
+        die('--enable-jemalloc and --enable-mimalloc cannot be used together')
     if value.origin != 'default':
         return bool(value) or None
 
@@ -30,11 +35,38 @@ def jemalloc(value, target, build_project, c_compiler):
     if target.kernel == 'Linux':
         return True
 
+@depends('--enable-mimalloc', '--enable-jemalloc', target)
+def mimalloc(value, jemalloc, target):
+    if value and jemalloc:
+        die('--enable-jemalloc and --enable-mimalloc cannot be used together')
+    if value.origin != 'default':
+        if not value:
+            return None
+        if target.kernel not in ('Darwin', 'WINNT', 'Linux', 'kFreeBSD', 'FreeBSD',
+                                 'NetBSD', 'OpenBSD', 'DragonFly'):
+            die('--enable-mimalloc is not supported on %s', target.kernel)
+        return True
+
+@depends('--enable-mimalloc', '--enable-jemalloc')
+def mimalloc_requires_disable(mimalloc, jemalloc):
+    if not mimalloc:
+        return
+    if jemalloc or jemalloc.origin not in ('command-line', 'mozconfig'):
+        die('--enable-mimalloc requires --disable-jemalloc to be passed explicitly')
+
 
 set_config('MOZ_MEMORY', jemalloc)
 set_define('MOZ_MEMORY', jemalloc)
 add_old_configure_assignment('MOZ_MEMORY', jemalloc)
 
+@depends(mimalloc)
+def mimalloc_config(mimalloc):
+    return True if mimalloc else False
+
+set_config('MOZ_MIMALLOC', mimalloc_config)
+set_define('MOZ_MIMALLOC', mimalloc)
+add_old_configure_assignment('MOZ_MIMALLOC', mimalloc_config)
+
 
 # Because --enable-jemalloc doesn't use a default because of the dependency
 # on the target, we can't use a js_option for it to propagate to js/src

build/moz.configure/old.configure

@@ -127,7 +127,6 @@ def old_configure_options(*options):
     '--enable-alsa',
     '--enable-appcompat-guid',
     '--enable-av1',
-    '--enable-jxl',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',
@@ -153,10 +152,7 @@ def old_configure_options(*options):
     '--enable-faststripe',
     '--enable-feeds',
     '--enable-gamepad',
-    '--enable-gconf',
     '--enable-gczeal',
-    '--enable-gio',
-    '--enable-gnomeui',
     '--enable-gold',
     '--enable-hardware-aec-ns',
     '--enable-icf',

caps/nsPrincipal.cpp

@@ -464,6 +464,18 @@ nsPrincipal::Write(nsIObjectOutputStream* aStream)
   rv = aStream->WriteStringZ(suffix.get());
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // This is an ugly hack to prevent re-entrancy calls into nsPrincipal::Write()
+  // because of repeat CSP processing.
+  // We refcount the context and if found 3+ refcounts on the same, skip writing
+  // the mCSP compound object.
+  // TODO: figure out exactly why this happens and fix the root cause.
+  nsCSPContext* CSPContext = static_cast<nsCSPContext*>(mCSP.get());
+  if(CSPContext) {
+    auto CSPDepth = CSPContext->AddRef();
+    CSPContext->Release();
+    if(CSPDepth > 2) return NS_OK;
+  }
+
   rv = NS_WriteOptionalCompoundObject(aStream, mCSP,
                                       NS_GET_IID(nsIContentSecurityPolicy),
                                       true);

config/external/icu/common/sources.mozbuild

@@ -18,20 +18,30 @@ sources = [
    '/intl/icu/source/common/dictionarydata.cpp',
    '/intl/icu/source/common/dtintrv.cpp',
    '/intl/icu/source/common/edits.cpp',
+   '/intl/icu/source/common/emojiprops.cpp',
    '/intl/icu/source/common/errorcode.cpp',
    '/intl/icu/source/common/filteredbrk.cpp',
    '/intl/icu/source/common/filterednormalizer2.cpp',
+   '/intl/icu/source/common/fixedstring.cpp',
    '/intl/icu/source/common/loadednormalizer2impl.cpp',
+   '/intl/icu/source/common/localebuilder.cpp',
+   '/intl/icu/source/common/localematcher.cpp',
+   '/intl/icu/source/common/localeprioritylist.cpp',
    '/intl/icu/source/common/locavailable.cpp',
    '/intl/icu/source/common/locbased.cpp',
    '/intl/icu/source/common/locdispnames.cpp',
+   '/intl/icu/source/common/locdistance.cpp',
    '/intl/icu/source/common/locdspnm.cpp',
    '/intl/icu/source/common/locid.cpp',
    '/intl/icu/source/common/loclikely.cpp',
+   '/intl/icu/source/common/loclikelysubtags.cpp',
    '/intl/icu/source/common/locmap.cpp',
    '/intl/icu/source/common/locresdata.cpp',
    '/intl/icu/source/common/locutil.cpp',
+   '/intl/icu/source/common/lsr.cpp',
+   '/intl/icu/source/common/lstmbe.cpp',
    '/intl/icu/source/common/messagepattern.cpp',
+   '/intl/icu/source/common/mlbe.cpp',
    '/intl/icu/source/common/normalizer2.cpp',
    '/intl/icu/source/common/normalizer2impl.cpp',
    '/intl/icu/source/common/normlzr.cpp',
@@ -51,6 +61,7 @@ sources = [
    '/intl/icu/source/common/rbbitblb.cpp',
    '/intl/icu/source/common/resbund.cpp',
    '/intl/icu/source/common/resource.cpp',
+   '/intl/icu/source/common/restrace.cpp',
    '/intl/icu/source/common/ruleiter.cpp',
    '/intl/icu/source/common/schriter.cpp',
    '/intl/icu/source/common/serv.cpp',
@@ -110,6 +121,8 @@ sources = [
    '/intl/icu/source/common/uloc.cpp',
    '/intl/icu/source/common/uloc_keytype.cpp',
    '/intl/icu/source/common/uloc_tag.cpp',
+   '/intl/icu/source/common/ulocale.cpp',
+   '/intl/icu/source/common/ulocbuilder.cpp',
    '/intl/icu/source/common/umapfile.cpp',
    '/intl/icu/source/common/umath.cpp',
    '/intl/icu/source/common/umutablecptrie.cpp',
@@ -151,6 +164,7 @@ sources = [
    '/intl/icu/source/common/utext.cpp',
    '/intl/icu/source/common/utf_impl.cpp',
    '/intl/icu/source/common/util.cpp',
+   '/intl/icu/source/common/util_props.cpp',
    '/intl/icu/source/common/utrace.cpp',
    '/intl/icu/source/common/utrie.cpp',
    '/intl/icu/source/common/utrie2.cpp',
@@ -190,7 +204,6 @@ other_sources = [
    '/intl/icu/source/common/usc_impl.cpp',
    '/intl/icu/source/common/ushape.cpp',
    '/intl/icu/source/common/ustr_wcs.cpp',
-   '/intl/icu/source/common/util_props.cpp',
 ]
 EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/appendable.h',
@@ -212,6 +225,8 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/icudataver.h',
    '/intl/icu/source/common/unicode/icuplug.h',
    '/intl/icu/source/common/unicode/idna.h',
+   '/intl/icu/source/common/unicode/localebuilder.h',
+   '/intl/icu/source/common/unicode/localematcher.h',
    '/intl/icu/source/common/unicode/localpointer.h',
    '/intl/icu/source/common/unicode/locdspnm.h',
    '/intl/icu/source/common/unicode/locid.h',
@@ -259,6 +274,8 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/uiter.h',
    '/intl/icu/source/common/unicode/uldnames.h',
    '/intl/icu/source/common/unicode/uloc.h',
+   '/intl/icu/source/common/unicode/ulocale.h',
+   '/intl/icu/source/common/unicode/ulocbuilder.h',
    '/intl/icu/source/common/unicode/umachine.h',
    '/intl/icu/source/common/unicode/umisc.h',
    '/intl/icu/source/common/unicode/umutablecptrie.h',
@@ -286,6 +303,8 @@ EXPORTS.unicode += [
    '/intl/icu/source/common/unicode/utf32.h',
    '/intl/icu/source/common/unicode/utf8.h',
    '/intl/icu/source/common/unicode/utf_old.h',
+   '/intl/icu/source/common/unicode/utfiterator.h',
+   '/intl/icu/source/common/unicode/utfstring.h',
    '/intl/icu/source/common/unicode/utrace.h',
    '/intl/icu/source/common/unicode/utypes.h',
    '/intl/icu/source/common/unicode/uvernum.h',

config/external/icu/defs.mozbuild

@@ -3,12 +3,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# Also see <http://www.icu-project.org/repos/icu/tags/latest/icu4c/readme.html#RecBuild> for the
+# recommended build options when compiling ICU.
 DEFINES.update(
     # Don't use icu namespace automatically in client code.
     U_USING_ICU_NAMESPACE = 0,
 
     # Don't include obsolete header files.
     U_NO_DEFAULT_INCLUDE_UTF_HEADERS = 1,
+    U_HIDE_OBSOLETE_UTF_OLD_H = 1,
 
     # Remove chunks of the library that we don't need (yet).
     UCONFIG_NO_LEGACY_CONVERSION = True,
@@ -17,6 +20,13 @@ DEFINES.update(
 
     # We don't need to pass data to and from legacy char* APIs.
     U_CHARSET_IS_UTF8 = True,
+
+    # Add 'explicit' keyword to UnicodeString constructors.
+    UNISTR_FROM_CHAR_EXPLICIT = 'explicit',
+    UNISTR_FROM_STRING_EXPLICIT = 'explicit',
+
+    # Disable dynamic loading of ICU data as a loadable library.
+    U_ENABLE_DYLOAD = 0,
 )
 
 if not CONFIG['HAVE_LANGINFO_CODESET']:
@@ -38,12 +48,24 @@ ALLOW_COMPILER_WARNINGS = True
 # warnings that get triggered for every file.
 if CONFIG['CLANG_CL']:
     CFLAGS += [
+        '-Wno-c++20-compat',
+        '-Wno-comma',
+        '-Wno-implicit-const-int-float-conversion',
         '-Wno-macro-redefined',
         '-Wno-microsoft-include',
+        '-Wno-tautological-unsigned-enum-zero-compare',
+        '-Wno-unreachable-code-loop-increment',
+        '-Wno-unreachable-code-return',
     ]
     CXXFLAGS += [
+        '-Wno-c++20-compat',
+        '-Wno-comma',
+        '-Wno-implicit-const-int-float-conversion',
         '-Wno-macro-redefined',
         '-Wno-microsoft-include',
+        '-Wno-tautological-unsigned-enum-zero-compare',
+        '-Wno-unreachable-code-loop-increment',
+        '-Wno-unreachable-code-return',
     ]
 
 if CONFIG['_MSC_VER'] and not CONFIG['CLANG_CL']:

config/external/icu/i18n/sources.mozbuild

@@ -42,13 +42,14 @@ sources = [
    '/intl/icu/source/i18n/decContext.cpp',
    '/intl/icu/source/i18n/decimfmt.cpp',
    '/intl/icu/source/i18n/decNumber.cpp',
+   '/intl/icu/source/i18n/displayoptions.cpp',
    '/intl/icu/source/i18n/double-conversion-bignum-dtoa.cpp',
    '/intl/icu/source/i18n/double-conversion-bignum.cpp',
    '/intl/icu/source/i18n/double-conversion-cached-powers.cpp',
-   '/intl/icu/source/i18n/double-conversion-diy-fp.cpp',
+   '/intl/icu/source/i18n/double-conversion-double-to-string.cpp',
    '/intl/icu/source/i18n/double-conversion-fast-dtoa.cpp',
+   '/intl/icu/source/i18n/double-conversion-string-to-double.cpp',
    '/intl/icu/source/i18n/double-conversion-strtod.cpp',
-   '/intl/icu/source/i18n/double-conversion.cpp',
    '/intl/icu/source/i18n/dtfmtsym.cpp',
    '/intl/icu/source/i18n/dtitvfmt.cpp',
    '/intl/icu/source/i18n/dtitvinf.cpp',
@@ -58,6 +59,10 @@ sources = [
    '/intl/icu/source/i18n/ethpccal.cpp',
    '/intl/icu/source/i18n/fmtable.cpp',
    '/intl/icu/source/i18n/format.cpp',
+   '/intl/icu/source/i18n/formatted_string_builder.cpp',
+   '/intl/icu/source/i18n/formattedval_iterimpl.cpp',
+   '/intl/icu/source/i18n/formattedval_sbimpl.cpp',
+   '/intl/icu/source/i18n/formattedvalue.cpp',
    '/intl/icu/source/i18n/fphdlimp.cpp',
    '/intl/icu/source/i18n/fpositer.cpp',
    '/intl/icu/source/i18n/gregocal.cpp',
@@ -65,16 +70,28 @@ sources = [
    '/intl/icu/source/i18n/hebrwcal.cpp',
    '/intl/icu/source/i18n/indiancal.cpp',
    '/intl/icu/source/i18n/islamcal.cpp',
+   '/intl/icu/source/i18n/iso8601cal.cpp',
    '/intl/icu/source/i18n/japancal.cpp',
    '/intl/icu/source/i18n/listformatter.cpp',
    '/intl/icu/source/i18n/measfmt.cpp',
    '/intl/icu/source/i18n/measunit.cpp',
+   '/intl/icu/source/i18n/measunit_extra.cpp',
    '/intl/icu/source/i18n/measure.cpp',
+   '/intl/icu/source/i18n/messageformat2.cpp',
+   '/intl/icu/source/i18n/messageformat2_arguments.cpp',
+   '/intl/icu/source/i18n/messageformat2_checker.cpp',
+   '/intl/icu/source/i18n/messageformat2_data_model.cpp',
+   '/intl/icu/source/i18n/messageformat2_errors.cpp',
+   '/intl/icu/source/i18n/messageformat2_evaluation.cpp',
+   '/intl/icu/source/i18n/messageformat2_formattable.cpp',
+   '/intl/icu/source/i18n/messageformat2_formatter.cpp',
+   '/intl/icu/source/i18n/messageformat2_function_registry.cpp',
+   '/intl/icu/source/i18n/messageformat2_parser.cpp',
+   '/intl/icu/source/i18n/messageformat2_serializer.cpp',
    '/intl/icu/source/i18n/msgfmt.cpp',
    '/intl/icu/source/i18n/nfrs.cpp',
    '/intl/icu/source/i18n/nfrule.cpp',
    '/intl/icu/source/i18n/nfsubs.cpp',
-   '/intl/icu/source/i18n/nounit.cpp',
    '/intl/icu/source/i18n/number_affixutils.cpp',
    '/intl/icu/source/i18n/number_asformat.cpp',
    '/intl/icu/source/i18n/number_capi.cpp',
@@ -91,13 +108,16 @@ sources = [
    '/intl/icu/source/i18n/number_modifiers.cpp',
    '/intl/icu/source/i18n/number_multiplier.cpp',
    '/intl/icu/source/i18n/number_notation.cpp',
+   '/intl/icu/source/i18n/number_output.cpp',
    '/intl/icu/source/i18n/number_padding.cpp',
    '/intl/icu/source/i18n/number_patternmodifier.cpp',
    '/intl/icu/source/i18n/number_patternstring.cpp',
    '/intl/icu/source/i18n/number_rounding.cpp',
    '/intl/icu/source/i18n/number_scientific.cpp',
+   '/intl/icu/source/i18n/number_simple.cpp',
    '/intl/icu/source/i18n/number_skeletons.cpp',
-   '/intl/icu/source/i18n/number_stringbuilder.cpp',
+   '/intl/icu/source/i18n/number_symbolswrapper.cpp',
+   '/intl/icu/source/i18n/number_usageprefs.cpp',
    '/intl/icu/source/i18n/number_utils.cpp',
    '/intl/icu/source/i18n/numfmt.cpp',
    '/intl/icu/source/i18n/numparse_affixes.cpp',
@@ -107,14 +127,15 @@ sources = [
    '/intl/icu/source/i18n/numparse_impl.cpp',
    '/intl/icu/source/i18n/numparse_parsednumber.cpp',
    '/intl/icu/source/i18n/numparse_scientific.cpp',
-   '/intl/icu/source/i18n/numparse_stringsegment.cpp',
    '/intl/icu/source/i18n/numparse_symbols.cpp',
    '/intl/icu/source/i18n/numparse_validators.cpp',
+   '/intl/icu/source/i18n/numrange_capi.cpp',
    '/intl/icu/source/i18n/numrange_fluent.cpp',
    '/intl/icu/source/i18n/numrange_impl.cpp',
    '/intl/icu/source/i18n/numsys.cpp',
    '/intl/icu/source/i18n/olsontz.cpp',
    '/intl/icu/source/i18n/persncal.cpp',
+   '/intl/icu/source/i18n/pluralranges.cpp',
    '/intl/icu/source/i18n/plurfmt.cpp',
    '/intl/icu/source/i18n/plurrule.cpp',
    '/intl/icu/source/i18n/quantityformatter.cpp',
@@ -133,6 +154,7 @@ sources = [
    '/intl/icu/source/i18n/smpdtfst.cpp',
    '/intl/icu/source/i18n/sortkey.cpp',
    '/intl/icu/source/i18n/standardplural.cpp',
+   '/intl/icu/source/i18n/string_segment.cpp',
    '/intl/icu/source/i18n/stsearch.cpp',
    '/intl/icu/source/i18n/taiwncal.cpp',
    '/intl/icu/source/i18n/timezone.cpp',
@@ -157,6 +179,10 @@ sources = [
    '/intl/icu/source/i18n/uitercollationiterator.cpp',
    '/intl/icu/source/i18n/ulistformatter.cpp',
    '/intl/icu/source/i18n/umsg.cpp',
+   '/intl/icu/source/i18n/units_complexconverter.cpp',
+   '/intl/icu/source/i18n/units_converter.cpp',
+   '/intl/icu/source/i18n/units_data.cpp',
+   '/intl/icu/source/i18n/units_router.cpp',
    '/intl/icu/source/i18n/unum.cpp',
    '/intl/icu/source/i18n/unumsys.cpp',
    '/intl/icu/source/i18n/upluralrules.cpp',
@@ -245,6 +271,7 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/datefmt.h',
    '/intl/icu/source/i18n/unicode/dcfmtsym.h',
    '/intl/icu/source/i18n/unicode/decimfmt.h',
+   '/intl/icu/source/i18n/unicode/displayoptions.h',
    '/intl/icu/source/i18n/unicode/dtfmtsym.h',
    '/intl/icu/source/i18n/unicode/dtitvfmt.h',
    '/intl/icu/source/i18n/unicode/dtitvinf.h',
@@ -253,6 +280,8 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/fieldpos.h',
    '/intl/icu/source/i18n/unicode/fmtable.h',
    '/intl/icu/source/i18n/unicode/format.h',
+   '/intl/icu/source/i18n/unicode/formattednumber.h',
+   '/intl/icu/source/i18n/unicode/formattedvalue.h',
    '/intl/icu/source/i18n/unicode/fpositer.h',
    '/intl/icu/source/i18n/unicode/gender.h',
    '/intl/icu/source/i18n/unicode/gregocal.h',
@@ -260,6 +289,12 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/measfmt.h',
    '/intl/icu/source/i18n/unicode/measunit.h',
    '/intl/icu/source/i18n/unicode/measure.h',
+   '/intl/icu/source/i18n/unicode/messageformat2.h',
+   '/intl/icu/source/i18n/unicode/messageformat2_arguments.h',
+   '/intl/icu/source/i18n/unicode/messageformat2_data_model.h',
+   '/intl/icu/source/i18n/unicode/messageformat2_data_model_names.h',
+   '/intl/icu/source/i18n/unicode/messageformat2_formattable.h',
+   '/intl/icu/source/i18n/unicode/messageformat2_function_registry.h',
    '/intl/icu/source/i18n/unicode/msgfmt.h',
    '/intl/icu/source/i18n/unicode/nounit.h',
    '/intl/icu/source/i18n/unicode/numberformatter.h',
@@ -276,6 +311,7 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/scientificnumberformatter.h',
    '/intl/icu/source/i18n/unicode/search.h',
    '/intl/icu/source/i18n/unicode/selfmt.h',
+   '/intl/icu/source/i18n/unicode/simplenumberformatter.h',
    '/intl/icu/source/i18n/unicode/simpletz.h',
    '/intl/icu/source/i18n/unicode/smpdtfmt.h',
    '/intl/icu/source/i18n/unicode/sortkey.h',
@@ -297,8 +333,11 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/udat.h',
    '/intl/icu/source/i18n/unicode/udateintervalformat.h',
    '/intl/icu/source/i18n/unicode/udatpg.h',
+   '/intl/icu/source/i18n/unicode/udisplayoptions.h',
    '/intl/icu/source/i18n/unicode/ufieldpositer.h',
    '/intl/icu/source/i18n/unicode/uformattable.h',
+   '/intl/icu/source/i18n/unicode/uformattednumber.h',
+   '/intl/icu/source/i18n/unicode/uformattedvalue.h',
    '/intl/icu/source/i18n/unicode/ugender.h',
    '/intl/icu/source/i18n/unicode/ulistformatter.h',
    '/intl/icu/source/i18n/unicode/ulocdata.h',
@@ -306,12 +345,15 @@ EXPORTS.unicode += [
    '/intl/icu/source/i18n/unicode/unirepl.h',
    '/intl/icu/source/i18n/unicode/unum.h',
    '/intl/icu/source/i18n/unicode/unumberformatter.h',
+   '/intl/icu/source/i18n/unicode/unumberoptions.h',
+   '/intl/icu/source/i18n/unicode/unumberrangeformatter.h',
    '/intl/icu/source/i18n/unicode/unumsys.h',
    '/intl/icu/source/i18n/unicode/upluralrules.h',
    '/intl/icu/source/i18n/unicode/uregex.h',
    '/intl/icu/source/i18n/unicode/uregion.h',
    '/intl/icu/source/i18n/unicode/ureldatefmt.h',
    '/intl/icu/source/i18n/unicode/usearch.h',
+   '/intl/icu/source/i18n/unicode/usimplenumberformatter.h',
    '/intl/icu/source/i18n/unicode/uspoof.h',
    '/intl/icu/source/i18n/unicode/utmscale.h',
    '/intl/icu/source/i18n/unicode/utrans.h',

config/milestone.txt

@@ -8,4 +8,4 @@
 # Referenced by milestone.py.
 #--------------------------------------------------------
 
-6.8.0
+6.8.1

config/rules.mk

@@ -348,11 +348,7 @@ ifdef SHARED_LIBRARY
 ifdef IS_COMPONENT
 EXTRA_DSO_LDOPTS	+= -bundle
 else
-ifdef MOZ_IOS
-_LOADER_PATH := @rpath
-else
 _LOADER_PATH := @executable_path
-endif
 EXTRA_DSO_LDOPTS	+= -dynamiclib -install_name $(_LOADER_PATH)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 -single_module
 endif
 endif

config/system-headers

@@ -424,7 +424,6 @@ fstream
 fstream.h
 ft2build.h
 fts.h
-gconf/gconf-client.h
 Gdiplus.h
 gdk/gdk.h
 gdk/gdkkeysyms.h
@@ -1050,9 +1049,7 @@ hunspell.hxx
 #if MOZ_SYSTEM_BZ2==1
 bzlib.h
 #endif
-#ifdef MOZ_ENABLE_GIO
 gio/gio.h
-#endif
 sys/event.h
 #ifdef MOZ_ENABLE_LIBPROXY
 proxy.h

devtools/client/responsive.html/index.css

@@ -78,7 +78,7 @@ html, body {
 }
 
 select {
-  -moz-appearance: none;
+  appearance: none;
   background-color: var(--theme-toolbar-background);
   background-image: var(--viewport-selection-arrow);
   background-position: 100% 50%;

devtools/client/shared/curl.js

@@ -427,7 +427,8 @@ const CurlUtils = {
         .replace(/[`$]/g, "\\$&")
         // Then escape all characters we are not sure about with ^ to ensure it
         // gets to the MS CRT parser safely.
-        .replace(/[^a-zA-Z0-9\s_\-:=+~\/.',?;()*\$&\\{}\"`]/g, "^$&")
+        // Note: Do not escape unicode control non-printable characters (0000-001f + 007f-009f)
+        .replace(/[^a-zA-Z0-9\s_\-:=+~\/.',?;()*\$&\\{}\"`\u0000-\u001f\u007f-\u009f]/g, "^$&")
         // The % character is special because MS CRT parser will try and look for
         // ENV variables and fill them in its place. We cannot escape them with %
         // and cannot escape them with ^ (because it's cmd.exe's escape not MS CRT
@@ -436,14 +437,17 @@ const CurlUtils = {
         // This ensures we do not try and double escape another ^ if it was placed
         // by the previous replace.
         .replace(/%(?=[a-zA-Z0-9_])/g, "%^")
-        // We replace \r and \r\n with \n, this allows to consistently escape all new
-        // lines in the next replace
-        .replace(/\r\n?/g, "\n")
+        // All other whitespace characters are replaced with a single space, as there
+        // is no way to enter their literal values in a command line, and they do break
+        // the command sequence, allowing for injection.
+        // Since want to keep line breaks, we need to exclude them in the regex (`[^\r\n]`),
+        // and use double negations to get the other whitespace chars (`[^\S]` translates
+        // to "not not whitespace")
+        .replace(/[^\S\r\n]/g, " ")
         // Lastly we replace new lines with ^ and TWO new lines because the first
         // new line is there to enact the escape command the second is the character
         // to escape (in this case new line).
-        // The extra " enables escaping new lines with ^ within quotes in cmd.exe.
-        .replace(/\n/g, '"^\r\n\r\n"')
+        .replace(/\r?\n|\r/g, "^\n\n")
       + encapsChars
     );
   }

devtools/client/themes/animationinspector.css

@@ -188,7 +188,7 @@ body {
 }
 
 #timeline-rate select.devtools-button {
-  -moz-appearance: none;
+  appearance: none;
   text-align: center;
   font-family: inherit;
   color: var(--theme-body-color);

devtools/client/themes/commandline.inc.css

@@ -34,7 +34,7 @@
 }
 
 #developer-toolbar {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   min-height: 32px;
   background-color: var(--gcli-background-color);
@@ -42,7 +42,7 @@
 }
 
 #developer-toolbar > toolbarbutton {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background-color: transparent;
   margin: 0;
@@ -122,7 +122,7 @@ html|*#gcli-output-frame {
 #gcli-tooltip {
   border-width: 0;
   background-color: transparent;
-  -moz-appearance: none;
+  appearance: none;
 }
 
 .gclitoolbar-input-node,
@@ -140,7 +140,7 @@ html|*#gcli-output-frame {
 }
 
 .gclitoolbar-input-node {
-  -moz-appearance: none;
+  appearance: none;
   color: var(--gcli-input-color);
   background-color: var(--gcli-input-background);
   background-repeat: no-repeat;

devtools/client/themes/common.css

@@ -70,7 +70,7 @@ html|button, html|select {
 }
 
 .devtools-autocomplete-listbox {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background-color: transparent;
   border-width: 0px !important;
   margin: 0;
@@ -243,7 +243,7 @@ checkbox:-moz-focusring {
 .devtools-menulist,
 .devtools-toolbarbutton,
 .devtools-button {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   min-height: 18px;
   text-shadow: none;
@@ -334,7 +334,7 @@ checkbox:-moz-focusring {
 
 /* Menu button styles (eg. web console filters) */
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   border-width: 0;
   -moz-box-orient: horizontal;
@@ -351,7 +351,7 @@ checkbox:-moz-focusring {
 }
 
 .devtools-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
+  appearance: none;
   display: -moz-box;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
@@ -360,7 +360,7 @@ checkbox:-moz-focusring {
 
 .devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
@@ -491,7 +491,7 @@ checkbox:-moz-focusring {
  * @TODO : Fix when https://bugzilla.mozilla.org/show_bug.cgi?id=1255116 lands
  */
 .menu-filter-button {
-  -moz-appearance: none;
+  appearance: none;
   background: rgba(128,128,128,0.1);
   border: none;
   border-radius: 2px;
@@ -519,7 +519,7 @@ checkbox:-moz-focusring {
 .devtools-textinput,
 .devtools-searchinput,
 .devtools-filterinput {
-  -moz-appearance: none;
+  appearance: none;
   margin: 1px 3px;
   border: 1px solid;
   border-radius: 2px;

devtools/client/themes/debugger.css

@@ -61,7 +61,7 @@
 /* Firebug theme uses breakpoint icon istead of a checkbox */
 
 .theme-firebug #sources-pane .dbg-breakpoint-checkbox .checkbox-check {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background: url(chrome://devtools/skin/images/firebug/breakpoint.svg) no-repeat 50% 50%;
 }
@@ -326,7 +326,7 @@
 }
 
 .dbg-expression-button {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   background: none;
   text-decoration: underline;

devtools/client/themes/devtools-browser.css

@@ -18,7 +18,7 @@
 
 .devtools-eyedropper-panel {
   pointer-events: none;
-  -moz-appearance: none;
+  appearance: none;
   width: 156px;
   height: 120px;
   background-color: transparent;

devtools/client/themes/floating-scrollbars-dark-theme.css

@@ -7,7 +7,7 @@
    well as any overflow: scroll elements within the page, while excluding
    <select>. */
 *|*:not(html|select) > scrollbar {
-  -moz-appearance: none !important;
+  appearance: none !important;
   position: relative;
   background-color: transparent;
   background-image: none;
@@ -37,14 +37,14 @@
 
 *|*:not(html|select) > scrollbar thumb {
   background-color: rgba(170, 170, 170, .2) !important; /* --toolbar-tab-hover */
-  -moz-appearance: none !important;
+  appearance: none !important;
   border-width: 0px !important;
   border-radius: 3px !important;
 }
 
 *|*:root[platform="mac"] > scrollbar slider,
 *|*:root[platform="mac"] *|*:not(html|select) > scrollbar slider {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 *|*:root[platform="win"] > scrollbar scrollbarbutton,

devtools/client/themes/floating-scrollbars-responsive-design.css

@@ -7,7 +7,7 @@
    well as any overflow: scroll elements within the page, while excluding
    <select>. */
 *|*:not(html|select) > scrollbar {
-  -moz-appearance: none !important;
+  appearance: none !important;
   position: relative;
   background-color: transparent;
   background-image: none;
@@ -31,11 +31,11 @@
 }
 
 *|*:not(html|select) > scrollbar slider {
-  -moz-appearance: none !important;
+  appearance: none !important;
 }
 
 *|*:not(html|select) > scrollbar thumb {
-  -moz-appearance: none !important;
+  appearance: none !important;
   background-color: rgba(0,0,0,0.2);
   border-width: 0px !important;
   border-radius: 3px !important;

devtools/client/themes/netmonitor.css

@@ -148,7 +148,7 @@
 }
 
 .requests-menu-header-button {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
   border-image: linear-gradient(transparent 15%,
                                 var(--theme-splitter-color) 15%,

devtools/client/themes/projecteditor/projecteditor.css

@@ -11,13 +11,13 @@
 }
 
 .arrow {
-  -moz-appearance: treetwisty;
+  appearance: treetwisty;
   width: 20px;
   height: 20px;
 }
 
 .arrow[open] {
-  -moz-appearance: treetwistyopen;
+  appearance: treetwistyopen;
 }
 
 .arrow[invisible] {

devtools/client/themes/responsivedesign.inc.css

@@ -16,7 +16,7 @@
 }
 
 .devtools-responsiveui-toolbar {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   /* text color is textColor from dark theme, since no theme is applied to
    * the responsive toolbar.
@@ -29,7 +29,7 @@
 }
 
 .devtools-responsiveui-textinput {
-  -moz-appearance: none;
+  appearance: none;
   background: #333;
   color: #fff;
   border: 1px solid #111;
@@ -46,7 +46,7 @@
 
 .devtools-responsiveui-menulist,
 .devtools-responsiveui-toolbarbutton {
-  -moz-appearance: none;
+  appearance: none;
   -moz-box-align: center;
   min-width: 32px;
   min-height: 22px;
@@ -60,12 +60,12 @@
 }
 
 .devtools-responsiveui-menulist .menulist-editable-box {
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
 }
 
 .devtools-responsiveui-menulist html|*.menulist-editable-input {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   text-align: center;
 }
@@ -124,7 +124,7 @@
 }
 
 .devtools-responsiveui-menulist > .menulist-dropmarker {
-  -moz-appearance: none;
+  appearance: none;
   display: -moz-box;
   background-color: transparent;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
@@ -134,7 +134,7 @@
 }
 
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button {
-  -moz-appearance: none;
+  appearance: none;
   color: inherit;
   border-width: 0;
   border-inline-end: 1px solid hsla(210,8%,5%,.45);
@@ -152,7 +152,7 @@
 
 .devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
 .devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
-  -moz-appearance: none !important;
+  appearance: none !important;
   list-style-image: url("chrome://devtools/skin/images/dropmarker.svg");
   -moz-box-align: center;
   padding: 0 3px;
@@ -266,7 +266,7 @@
 }
 
 .devtools-responsiveui-hardware-buttons {
-  -moz-appearance: none;
+  appearance: none;
   padding: 20px;
 
   border: 1px solid #FFFFFF;
@@ -288,7 +288,7 @@
 
 .devtools-responsiveui-sleep-button {
   -moz-user-focus: ignore;
-  -moz-appearance: none;
+  appearance: none;
   /* compensate browserStack top padding */
   margin-top: -67px;
   margin-right: 10px;
@@ -316,7 +316,7 @@
 .devtools-responsiveui-volume-up-button,
 .devtools-responsiveui-volume-down-button {
   -moz-user-focus: ignore;
-  -moz-appearance: none;
+  appearance: none;
   border: 1px solid red;
   min-width: 8px;
   height: 40px;

devtools/client/themes/shadereditor.css

@@ -28,7 +28,7 @@
 }
 
 .side-menu-widget-item-checkbox {
-  -moz-appearance: none;
+  appearance: none;
   opacity: 0;
   transition: opacity .15s ease-out 0s;
 }
@@ -43,7 +43,7 @@
 }
 
 .side-menu-widget-item-checkbox .checkbox-check {
-  -moz-appearance: none;
+  appearance: none;
   background-image: url(images/item-toggle.svg);
   background-color: transparent;
   width: 16px;

devtools/client/themes/splitters.css

@@ -32,7 +32,7 @@
 
 .devtools-horizontal-splitter,
 .devtools-side-splitter {
-  -moz-appearance: none;
+  appearance: none;
   background-image: none;
   border: 0;
   border-style: solid;

devtools/client/themes/toolbars.css

@@ -45,7 +45,7 @@
 /* Toolbars */
 .devtools-toolbar,
 .devtools-sidebar-tabs tabs {
-  -moz-appearance: none;
+  appearance: none;
   padding: 0;
   border-width: 0;
   border-bottom-width: 1px;
@@ -91,13 +91,13 @@
 
 /* In-tools sidebar */
 .devtools-sidebar-tabs {
-  -moz-appearance: none;
+  appearance: none;
   margin: 0;
   height: 100%;
 }
 
 .devtools-sidebar-tabs > tabpanels {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   padding: 0;
   border: 0;
@@ -116,7 +116,7 @@
 }
 
 .devtools-sidebar-alltabs {
-  -moz-appearance: none;
+  appearance: none;
   height: 24px;
   line-height: 24px;
   padding: 0 4px;
@@ -136,7 +136,7 @@
 }
 
 .devtools-sidebar-tabs tabs > tab {
-  -moz-appearance: none;
+  appearance: none;
   /* We want to match the height of a toolbar with a toolbarbutton
    * First, we need to replicated the padding of toolbar (4px),
    * then we need to take the border of the buttons into account (1px).

devtools/client/themes/toolbox.css

@@ -41,7 +41,7 @@
 /* Toolbox tabbar */
 
 .devtools-tabbar {
-  -moz-appearance: none;
+  appearance: none;
   min-height: 24px;
   border: 0px solid;
   border-bottom-width: 1px;
@@ -67,7 +67,7 @@
 /* Toolbox tabs */
 
 .devtools-tab {
-  -moz-appearance: none;
+  appearance: none;
   -moz-binding: url("chrome://global/content/bindings/general.xml#control-item");
   -moz-box-align: center;
   min-width: 32px;
@@ -224,7 +224,7 @@
 
 #toolbox-controls > button,
 #toolbox-dock-buttons > button {
-  -moz-appearance: none;
+  appearance: none;
   border: none;
   margin: 0 4px;
   min-width: 16px;

devtools/client/themes/tooltips.css

@@ -108,7 +108,7 @@
 }
 
 .tooltip-xul-wrapper {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   overflow: visible;
   border-style: none;

devtools/client/themes/webaudioeditor.css

@@ -125,7 +125,7 @@ text {
 .web-audio-inspector .error {
   background-image: url(images/alerticon-warning.png);
   background-size: 13px 12px;
-  -moz-appearance: none;
+  appearance: none;
   opacity: 0;
   transition: opacity .5s ease-out 0s;
 }

devtools/client/themes/webconsole.css

@@ -424,7 +424,7 @@ a {
   padding: 0;
   padding-inline-start: 20px;
   margin: 0;
-  -moz-appearance: none;
+  appearance: none;
   background-color: transparent;
 }
 

devtools/client/themes/widgets.css

@@ -122,7 +122,7 @@
 
 .scrollbutton-up,
 .scrollbutton-down {
-  -moz-appearance: none;
+  appearance: none;
   background: transparent;
   box-shadow: none;
   border: none;
@@ -133,7 +133,7 @@
 
 .scrollbutton-up > .toolbarbutton-icon,
 .scrollbutton-down > .toolbarbutton-icon {
-  -moz-appearance: none;
+  appearance: none;
   width: 7px;
   height: 16px;
   background-size: 14px 16px;
@@ -190,7 +190,7 @@
 
 .breadcrumbs-widget-item {
   background-color: transparent;
-  -moz-appearance: none;
+  appearance: none;
   min-height: 24px;
   min-width: 65px;
   margin: 0;

devtools/shared/css/generated/properties-db.js

@@ -7223,6 +7223,26 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "inset-block": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-block-start",
+      "inset-block-end"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "revert",
+      "unset"
+    ]
+  },
   "inset-block-end": {
     "isInherited": false,
     "subproperties": [
@@ -7261,6 +7281,26 @@ exports.CSS_PROPERTIES = {
       "unset"
     ]
   },
+  "inset-inline": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-inline-start",
+      "inset-inline-end"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "revert",
+      "unset"
+    ]
+  },
   "inset-inline-end": {
     "isInherited": false,
     "subproperties": [

dom/base/WebSocket.cpp

@@ -17,6 +17,7 @@
 #include "mozilla/dom/MessageEventBinding.h"
 #include "mozilla/dom/nsCSPContext.h"
 #include "mozilla/dom/nsCSPUtils.h"
+#include "mozilla/dom/nsMixedContentBlocker.h"
 #include "mozilla/dom/ScriptSettings.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
@@ -1604,10 +1605,10 @@ WebSocketImpl::Init(JSContext* aCx,
                         mInnerWindowID);
   }
 
-  // Don't allow https:// to open ws://
+  // Don't allow https:// to open ws://, except when explicitly preffed or a loopback address.
   if (!mIsServerSide && !mSecure &&
-      !Preferences::GetBool("network.websocket.allowInsecureFromHTTPS",
-                            false)) {
+      !Preferences::GetBool("network.websocket.allowInsecureFromHTTPS", false) &&
+      !nsMixedContentBlocker::IsPotentiallyTrustworthyLoopbackHost(mAsciiHost)) {
     // Confirmed we are opening plain ws:// and want to prevent this from a
     // secure context (e.g. https).
     nsCOMPtr<nsIPrincipal> principal;

dom/base/nsGkAtomList.h

@@ -101,6 +101,8 @@ GK_ATOM(animations, "animations")
 GK_ATOM(anonid, "anonid")
 GK_ATOM(anonlocation, "anonlocation")
 GK_ATOM(any, "any")
+GK_ATOM(any_hover, "any-hover")
+GK_ATOM(any_pointer, "any-pointer")
 GK_ATOM(applet, "applet")
 GK_ATOM(applyImports, "apply-imports")
 GK_ATOM(applyTemplates, "apply-templates")
@@ -1533,6 +1535,7 @@ GK_ATOM(patternContentUnits, "patternContentUnits")
 GK_ATOM(patternTransform, "patternTransform")
 GK_ATOM(patternUnits, "patternUnits")
 GK_ATOM(pc, "pc")
+GK_ATOM(pointer, "pointer")
 GK_ATOM(pointer_events, "pointer-events")
 GK_ATOM(points, "points")
 GK_ATOM(pointsAtX, "pointsAtX")

dom/base/nsINode.cpp

@@ -16,6 +16,7 @@
 #include "mozilla/CORSMode.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
+#include "mozilla/HTMLEditor.h"
 #include "mozilla/InternalMutationEvent.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"

dom/bindings/Errors.msg

@@ -111,3 +111,4 @@ MSG_DEF(MSG_PMO_INVALID_MEMBERS, 0, JSEXN_TYPEERR, "PerformanceMeasureOptions ca
 MSG_DEF(MSG_PMO_CONSTRUCTOR_INACCESSIBLE, 0, JSEXN_TYPEERR, "Can't access PerformanceMark constructor, performance is null.")
 MSG_DEF(MSG_PMO_UNEXPECTED_START_TIME, 0, JSEXN_TYPEERR, "Expected startTime >= 0.")
 MSG_DEF(MSG_PMO_INVALID_ATTR_FOR_NON_GLOBAL, 1, JSEXN_TYPEERR, "Cannot get PerformanceTiming attribute values for non-Window global object. Given: {0}.")
+MSG_DEF(MSG_NOT_SUBMIT_BUTTON, 0, JSEXN_TYPEERR, "The submitter is not a submit button.")

dom/canvas/TexUnpackBlob.cpp

@@ -308,6 +308,17 @@ TexUnpackBlob::ConvertIfNeeded(WebGLContext* webgl, const char* funcName,
     if (!rowLength || !rowCount)
         return true;
 
+    auto minSrcStride =
+        CheckedInt<size_t>(WebGLTexelConversions::TexelBytesForFormat(srcFormat)) * rowLength;
+    auto minDstStride =
+        CheckedInt<size_t>(WebGLTexelConversions::TexelBytesForFormat(dstFormat)) * rowLength;
+    if (srcStride <= 0 || dstStride <= 0 || !minSrcStride.isValid() ||
+        !minDstStride.isValid() || size_t(srcStride) < minSrcStride.value() ||
+        size_t(dstStride) < minDstStride.value()) {
+      webgl->ErrorInvalidOperation("Invalid stride.");
+      return false;
+    }
+
     const auto& dstIsPremult = webgl->mPixelStore_PremultiplyAlpha;
     const auto srcOrigin = (webgl->mPixelStore_FlipY ? gl::OriginPos::TopLeft
                                                      : gl::OriginPos::BottomLeft);

dom/canvas/WebGLContextDraw.cpp

@@ -9,6 +9,7 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsPrintfCString.h"
+#include "WebGLActiveInfo.h"
 #include "WebGLBuffer.h"
 #include "WebGLContextUtils.h"
 #include "WebGLFramebuffer.h"
@@ -27,6 +28,30 @@ namespace mozilla {
 // For a Tegra workaround.
 static const int MAX_DRAW_CALLS_SINCE_FLUSH = 100;
 
+static uint8_t
+NumUsedLocationsByElemTypeForDraw(GLenum elemType)
+{
+    switch (elemType) {
+    case LOCAL_GL_FLOAT_MAT2:
+    case LOCAL_GL_FLOAT_MAT2x3:
+    case LOCAL_GL_FLOAT_MAT2x4:
+        return 2;
+
+    case LOCAL_GL_FLOAT_MAT3x2:
+    case LOCAL_GL_FLOAT_MAT3:
+    case LOCAL_GL_FLOAT_MAT3x4:
+        return 3;
+
+    case LOCAL_GL_FLOAT_MAT4x2:
+    case LOCAL_GL_FLOAT_MAT4x3:
+    case LOCAL_GL_FLOAT_MAT4:
+        return 4;
+
+    default:
+        return 1;
+    }
+}
+
 ////////////////////////////////////////
 
 class ScopedResolveTexturesForDraw
@@ -331,6 +356,7 @@ class ScopedDrawHelper final
 {
     WebGLContext* const mWebGL;
     bool mDidFake;
+    std::vector<GLuint> mDisabledUnusedAttribs;
 
 public:
     ScopedDrawHelper(WebGLContext* webgl, const char* funcName, uint32_t firstVertex,
@@ -367,11 +393,43 @@ public:
         }
         mDidFake = true;
 
+        const auto& linkInfo = mWebGL->mActiveProgramLinkInfo;
+
+#ifdef XP_MACOSX
+        if (mWebGL->gl->WorkAroundDriverBugs()) {
+            std::vector<bool> isActiveAttrib(mWebGL->mBoundVertexArray->mAttribs.Length(),
+                                             false);
+            for (const auto& progAttrib : linkInfo->attribs) {
+                const auto loc = progAttrib.mLoc;
+                if (loc < 0) {
+                    continue;
+                }
+
+                const auto usedLocs =
+                    NumUsedLocationsByElemTypeForDraw(progAttrib.mActiveInfo->mElemType);
+                for (uint32_t i = 0; i < usedLocs; ++i) {
+                    const auto usedLoc = static_cast<uint32_t>(loc) + i;
+                    if (usedLoc < isActiveAttrib.size()) {
+                        isActiveAttrib[usedLoc] = true;
+                    }
+                }
+            }
+
+            for (uint32_t i = 0; i < mWebGL->mBoundVertexArray->mAttribs.Length(); ++i) {
+                const auto& attrib = mWebGL->mBoundVertexArray->mAttribs[i];
+                if (!attrib.mEnabled || isActiveAttrib[i]) {
+                    continue;
+                }
+
+                mWebGL->gl->fDisableVertexAttribArray(i);
+                mDisabledUnusedAttribs.push_back(i);
+            }
+        }
+#endif
+
         ////
         // Check UBO sizes.
 
-        const auto& linkInfo = mWebGL->mActiveProgramLinkInfo;
-
         for (const auto& cur : linkInfo->uniformBlocks) {
             const auto& dataSize = cur->mDataSize;
             const auto& binding = cur->mBinding;
@@ -477,6 +535,10 @@ public:
         if (mDidFake) {
             mWebGL->UndoFakeVertexAttrib0();
         }
+
+        for (const auto loc : mDisabledUnusedAttribs) {
+            mWebGL->gl->fEnableVertexAttribArray(loc);
+        }
     }
 };
 
@@ -607,12 +669,12 @@ WebGLContext::DrawArraysInstanced(GLenum mode, GLint first, GLsizei vertCount,
         return;
 
     MakeContextCurrent();
-    
-    if (vertCount > mMaxVertIdsPerDraw) {
-      ErrorOutOfMemory(
-          "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
-      return;
-    }
+
+    if (vertCount > mMaxVertIdsPerDraw) {
+      ErrorOutOfMemory(
+          "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
+      return;
+    }
 
     bool error = false;
     ScopedResolveTexturesForDraw scopedResolve(this, funcName, &error);
@@ -855,12 +917,12 @@ WebGLContext::DrawElementsInstanced(GLenum mode, GLsizei vertCount, GLenum type,
         return;
 
     MakeContextCurrent();
-
-    if (vertCount > mMaxVertIdsPerDraw) {
-      ErrorOutOfMemory(
-        "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
-      return;
-    }
+
+    if (vertCount > mMaxVertIdsPerDraw) {
+      ErrorOutOfMemory(
+        "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
+      return;
+    }
 
     bool error = false;
     ScopedResolveTexturesForDraw scopedResolve(this, funcName, &error);

dom/events/EventDispatcher.cpp

@@ -40,6 +40,7 @@
 #include "mozilla/dom/ScrollAreaEvent.h"
 #include "mozilla/dom/SimpleGestureEvent.h"
 #include "mozilla/dom/StorageEvent.h"
+#include "mozilla/dom/SubmitEvent.h"
 #include "mozilla/dom/TimeEvent.h"
 #include "mozilla/dom/TouchEvent.h"
 #include "mozilla/dom/TransitionEvent.h"
@@ -1066,6 +1067,12 @@ EventDispatcher::CreateEvent(EventTarget* aOwner,
     case eAnimationEventClass:
       return NS_NewDOMAnimationEvent(aOwner, aPresContext,
                                      aEvent->AsAnimationEvent());
+    case eFormEventClass:
+      if (aEvent->mMessage == eFormSubmit) {
+        return NS_NewDOMSubmitEvent(aOwner, aPresContext,
+                                    aEvent->AsFormEvent());
+      }
+      return NS_NewDOMEvent(aOwner, aPresContext, aEvent);
     default:
       // For all other types of events, create a vanilla event object.
       return NS_NewDOMEvent(aOwner, aPresContext, aEvent);

dom/events/SubmitEvent.cpp

@@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/SubmitEvent.h"
+
+#include "mozilla/ContentEvents.h"
+#include "nsIContent.h"
+
+namespace mozilla {
+namespace dom {
+
+NS_IMPL_CYCLE_COLLECTION_INHERITED(SubmitEvent, Event, mSubmitter)
+
+NS_IMPL_ADDREF_INHERITED(SubmitEvent, Event)
+NS_IMPL_RELEASE_INHERITED(SubmitEvent, Event)
+
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SubmitEvent)
+NS_INTERFACE_MAP_END_INHERITING(Event)
+
+SubmitEvent::SubmitEvent(EventTarget* aOwner,
+                         nsPresContext* aPresContext,
+                         InternalFormEvent* aEvent)
+  : Event(aOwner, aPresContext, aEvent)
+{
+  if (aEvent) {
+    nsIContent* originator = aEvent->mOriginator;
+    if (originator && originator->IsHTMLElement()) {
+      mSubmitter = static_cast<::nsGenericHTMLElement*>(originator);
+    }
+  }
+}
+
+already_AddRefed<SubmitEvent>
+SubmitEvent::Constructor(const GlobalObject& aGlobal,
+                         const nsAString& aType,
+                         const SubmitEventInit& aParam,
+                         ErrorResult& aRv)
+{
+  nsCOMPtr<EventTarget> t = do_QueryInterface(aGlobal.GetAsSupports());
+  RefPtr<SubmitEvent> e = new SubmitEvent(t, nullptr, nullptr);
+  bool trusted = e->Init(t);
+  e->InitEvent(aType, aParam.mBubbles, aParam.mCancelable);
+  e->mSubmitter = aParam.mSubmitter;
+  e->SetTrusted(trusted);
+  e->SetComposed(aParam.mComposed);
+  return e.forget();
+}
+
+} // namespace dom
+} // namespace mozilla
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+already_AddRefed<SubmitEvent>
+NS_NewDOMSubmitEvent(EventTarget* aOwner,
+                     nsPresContext* aPresContext,
+                     InternalFormEvent* aEvent)
+{
+  RefPtr<SubmitEvent> it = new SubmitEvent(aOwner, aPresContext, aEvent);
+  return it.forget();
+}

dom/events/SubmitEvent.h

@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_SubmitEvent_h_
+#define mozilla_dom_SubmitEvent_h_
+
+#include "mozilla/dom/Event.h"
+#include "mozilla/dom/SubmitEventBinding.h"
+#include "mozilla/EventForwards.h"
+
+class nsGenericHTMLElement;
+
+namespace mozilla {
+namespace dom {
+
+class SubmitEvent final : public Event
+{
+public:
+  SubmitEvent(EventTarget* aOwner,
+              nsPresContext* aPresContext,
+              InternalFormEvent* aEvent);
+
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(SubmitEvent, Event)
+
+  // Forward to base class
+  NS_FORWARD_TO_EVENT
+
+  static already_AddRefed<SubmitEvent> Constructor(const GlobalObject& aGlobal,
+                                                   const nsAString& aType,
+                                                   const SubmitEventInit& aParam,
+                                                   ErrorResult& aRv);
+
+  ::nsGenericHTMLElement* GetSubmitter() const
+  {
+    return mSubmitter;
+  }
+
+  virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override
+  {
+    return SubmitEventBinding::Wrap(aCx, this, aGivenProto);
+  }
+
+protected:
+  ~SubmitEvent() {}
+
+private:
+  RefPtr<::nsGenericHTMLElement> mSubmitter;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+already_AddRefed<mozilla::dom::SubmitEvent>
+NS_NewDOMSubmitEvent(mozilla::dom::EventTarget* aOwner,
+                     nsPresContext* aPresContext,
+                     mozilla::InternalFormEvent* aEvent);
+
+#endif // mozilla_dom_SubmitEvent_h_

dom/events/moz.build

@@ -65,6 +65,7 @@ EXPORTS.mozilla.dom += [
     'ScrollAreaEvent.h',
     'SimpleGestureEvent.h',
     'StorageEvent.h',
+    'SubmitEvent.h',
     'TextClause.h',
     'Touch.h',
     'TouchEvent.h',
@@ -115,6 +116,7 @@ UNIFIED_SOURCES += [
     'ScrollAreaEvent.cpp',
     'SimpleGestureEvent.cpp',
     'StorageEvent.cpp',
+    'SubmitEvent.cpp',
     'TextClause.cpp',
     'TextComposition.cpp',
     'Touch.cpp',

dom/events/test/mochitest.ini

@@ -170,6 +170,7 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 skip-if = toolkit == 'android' #TIMED_OUT
 [test_eventctors.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
+[test_submit_event.html]
 [test_eventhandler_scoping.html]
 [test_eventTimeStamp.html]
 [test_focus_disabled.html]

dom/events/test/test_submit_event.html

@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Test for SubmitEvent and submitter</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<pre id="test">
+<script type="application/javascript">
+var hasSimpleTest = typeof SimpleTest !== "undefined";
+function finishIfPossible() {
+  if (hasSimpleTest) {
+    SimpleTest.finish();
+  }
+}
+function okMaybe(cond, msg) {
+  if (hasSimpleTest) {
+    ok(cond, msg);
+  } else {
+    console.log((cond ? "OK: " : "FAIL: ") + msg);
+  }
+}
+function isMaybe(a, b, msg) {
+  if (hasSimpleTest) {
+    is(a, b, msg);
+  } else {
+    console.log((a === b ? "OK: " : "FAIL: ") + msg + " (got " + a + " expected " + b + ")");
+  }
+}
+if (hasSimpleTest) {
+  SimpleTest.waitForExplicitFinish();
+}
+
+function testConstructor() {
+  okMaybe("SubmitEvent" in window, "SubmitEvent constructor exists");
+
+  var button = document.createElement("button");
+  var ev = new SubmitEvent("submit", { submitter: button, bubbles: true, cancelable: true });
+  isMaybe(ev.type, "submit", "constructor type matches");
+  okMaybe(!ev.isTrusted, "constructed SubmitEvent is not trusted");
+  isMaybe(ev.submitter, button, "constructor submitter matches");
+
+  var ev2 = new SubmitEvent("submit");
+  isMaybe(ev2.submitter, null, "default submitter is null");
+}
+
+function testDispatch() {
+  var form = document.createElement("form");
+  var button = document.createElement("button");
+  button.type = "submit";
+  button.textContent = "Submit";
+  form.appendChild(button);
+  document.body.appendChild(form);
+
+  form.addEventListener("submit", function(e) {
+    okMaybe(e instanceof SubmitEvent, "submit event is SubmitEvent");
+    isMaybe(e.submitter, button, "submitter is the clicked button");
+    e.preventDefault();
+    form.remove();
+    finishIfPossible();
+  });
+
+  if (hasSimpleTest) {
+    SimpleTest.executeSoon(function() {
+      button.click();
+    });
+  } else {
+    setTimeout(function() {
+      button.click();
+    }, 0);
+  }
+}
+
+testConstructor();
+testDispatch();
+</script>
+</pre>
+</body>
+</html>

dom/html/HTMLFormElement.cpp

@@ -276,6 +276,41 @@ HTMLFormElement::Submit()
   return rv.StealNSResult();
 }
 
+// https://html.spec.whatwg.org/multipage/forms.html#dom-form-requestsubmit
+void
+HTMLFormElement::RequestSubmit(nsGenericHTMLElement* aSubmitter,
+                               ErrorResult& aRv) {
+  // 1. If submitter is not null, then:
+  if (aSubmitter) {
+    nsCOMPtr<nsIFormControl> fc = do_QueryObject(aSubmitter);
+
+    // 1.1. If submitter is not a submit button, then throw a TypeError.
+    if (!fc || !fc->IsSubmitControl()) {
+      aRv.ThrowTypeError<MSG_NOT_SUBMIT_BUTTON>();
+      return;
+    }
+
+    // 1.2. If submitter's form owner is not this form element, then throw a
+    //      "NotFoundError" DOMException.
+    if (fc->GetFormElement() != this) {
+      aRv.Throw(NS_ERROR_DOM_NOT_FOUND_ERR);
+      return;
+    }
+  }
+
+  // 2. Otherwise, set submitter to this form element.
+  // 3. Submit this form element, from submitter.
+  // We go through the presShell here for the corner case a submit event
+  // is pending while the window is being destroyed.
+  InternalFormEvent event(true, eFormSubmit);
+  event.mOriginator = aSubmitter;
+  nsEventStatus status = nsEventStatus_eIgnore;
+  nsCOMPtr<nsIPresShell> presShell = GetComposedDoc()->GetShell();
+  if (MOZ_LIKELY(presShell)) {
+    presShell->HandleDOMEventWithTarget(this, &event, &status);
+  }
+}
+
 NS_IMETHODIMP
 HTMLFormElement::Reset()
 {

dom/html/HTMLFormElement.h

@@ -391,6 +391,19 @@ public:
 
   void Submit(ErrorResult& aRv);
 
+  /**
+   * Requests to submit the form. Unlike submit(), this method includes
+   * interactive constraint validation and firing a submit event,
+   * either of which can cancel submission.
+   *
+   * @param aSubmitter The submitter argument can be used to point to a specific
+   *                   submit button.
+   * @param aRv        An ErrorResult.
+   * @see
+   * https://html.spec.whatwg.org/multipage/forms.html#dom-form-requestsubmit
+   */
+  void RequestSubmit(nsGenericHTMLElement* aSubmitter, ErrorResult& aRv);
+
   // XPCOM Reset() is OK
 
   bool CheckValidity()

dom/media/MediaFormatReader.cpp

@@ -371,6 +371,9 @@ MediaFormatReader::DecoderFactory::DoCreateDecoder(TrackType aTrack)
     case TrackType::kVideoTrack: {
       // Decoders use the layers backend to decide if they can use hardware decoding,
       // so specify LAYERS_NONE if we want to forcibly disable it.
+      using Option = CreateDecoderParams::Option;
+      using OptionSet = CreateDecoderParams::OptionSet;
+
       data.mDecoder = mOwner->mPlatform->CreateDecoder({
         ownerData.mInfo
         ? *ownerData.mInfo->GetAsVideoInfo()
@@ -383,7 +386,10 @@ MediaFormatReader::DecoderFactory::DoCreateDecoder(TrackType aTrack)
         mOwner->mCrashHelper,
 #endif
         ownerData.mIsBlankDecode,
-        &result
+        &result,
+        OptionSet(ownerData.mHardwareDecodingDisabled
+                    ? Option::HardwareDecoderNotAllowed
+                    : Option::Default)
       });
       break;
     }
@@ -921,6 +927,8 @@ MediaFormatReader::NotifyNewOutput(TrackType aTrack, MediaData* aSample)
   decoder.mOutput.AppendElement(aSample);
   decoder.mNumSamplesOutput++;
   decoder.mNumOfConsecutiveError = 0;
+  // We have decoded our first frame, we can now start to skip future errors.
+  decoder.mFirstFrameTime.reset();
   ScheduleUpdate(aTrack);
 }
 
@@ -1415,7 +1423,7 @@ MediaFormatReader::Update(TrackType aTrack)
       RefPtr<MediaData> output = decoder.mOutput[0];
       decoder.mOutput.RemoveElementAt(0);
       decoder.mSizeOfQueue -= 1;
-      decoder.mLastSampleTime =
+      decoder.mLastDecodedSampleTime =
         Some(TimeInterval(TimeUnit::FromMicroseconds(output->mTime),
                           TimeUnit::FromMicroseconds(output->GetEndTime())));
       decoder.mNumSamplesOutputTotal++;
@@ -1463,14 +1471,14 @@ MediaFormatReader::Update(TrackType aTrack)
         LOG("Rejecting %s promise: EOS", TrackTypeToStr(aTrack));
         decoder.RejectPromise(NS_ERROR_DOM_MEDIA_END_OF_STREAM, __func__);
       } else if (decoder.mWaitingForData) {
-        if (wasDraining && decoder.mLastSampleTime &&
+        if (wasDraining && decoder.mLastDecodedSampleTime &&
             !decoder.mNextStreamSourceID) {
           // We have completed draining the decoder following WaitingForData.
           // Set up the internal seek machinery to be able to resume from the
           // last sample decoded.
           LOG("Seeking to last sample time: %lld",
-              decoder.mLastSampleTime.ref().mStart.ToMicroseconds());
-          InternalSeek(aTrack, InternalSeekTarget(decoder.mLastSampleTime.ref(), true));
+              decoder.mLastDecodedSampleTime.ref().mStart.ToMicroseconds());
+          InternalSeek(aTrack, InternalSeekTarget(decoder.mLastDecodedSampleTime.ref(), true));
         }
         if (!decoder.mReceivedNewData) {
           LOG("Rejecting %s promise: WAITING_FOR_DATA", TrackTypeToStr(aTrack));
@@ -1506,24 +1514,52 @@ MediaFormatReader::Update(TrackType aTrack)
 
   if (decoder.mError && !decoder.HasFatalError()) {
     decoder.mDecodePending = false;
-    bool needsNewDecoder = decoder.mError.ref() == NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER;
+
+    MOZ_RELEASE_ASSERT(!decoder.HasInternalSeekPending(),
+                       "No error can occur while an internal seek is pending");
+
+    nsCString error;
+    bool firstFrameDecodingFailedWithHardware =
+      decoder.mFirstFrameTime &&
+      decoder.mError.ref() == NS_ERROR_DOM_MEDIA_DECODE_ERR &&
+      decoder.mDecoder && decoder.mDecoder->IsHardwareAccelerated(error) &&
+      !decoder.mHardwareDecodingDisabled;
+    bool needsNewDecoder =
+      decoder.mError.ref() == NS_ERROR_DOM_MEDIA_NEED_NEW_DECODER ||
+      firstFrameDecodingFailedWithHardware;
     if (!needsNewDecoder && ++decoder.mNumOfConsecutiveError > decoder.mMaxConsecutiveError) {
       NotifyError(aTrack, decoder.mError.ref());
       return;
     }
+    if (firstFrameDecodingFailedWithHardware) {
+      decoder.mHardwareDecodingDisabled = true;
+    }
     decoder.mError.reset();
     LOG("%s decoded error count %d", TrackTypeToStr(aTrack),
                                      decoder.mNumOfConsecutiveError);
+
+    if (needsNewDecoder) {
+      LOG("Error: Need new decoder");
+      decoder.ShutdownDecoder();
+    }
+    if (decoder.mFirstFrameTime) {
+      TimeInterval seekInterval = TimeInterval(decoder.mFirstFrameTime.ref(),
+                                               decoder.mFirstFrameTime.ref());
+      InternalSeek(aTrack, InternalSeekTarget(seekInterval, false));
+      return;
+    }
+
     media::TimeUnit nextKeyframe;
     if (aTrack == TrackType::kVideoTrack && !decoder.HasInternalSeekPending() &&
-        NS_SUCCEEDED(decoder.mTrackDemuxer->GetNextRandomAccessPoint(&nextKeyframe))) {
-      if (needsNewDecoder) {
-        decoder.ShutdownDecoder();
-      }
-      SkipVideoDemuxToNextKeyFrame(decoder.mLastSampleTime.refOr(TimeInterval()).Length());
+        NS_SUCCEEDED(decoder.mTrackDemuxer->GetNextRandomAccessPoint(&nextKeyframe)) &&
+        !nextKeyframe.IsInfinite()) {
+      SkipVideoDemuxToNextKeyFrame(decoder.mLastDecodedSampleTime.refOr(TimeInterval()).Length());
       return;
     } else if (aTrack == TrackType::kAudioTrack) {
       decoder.Flush();
+    } else {
+      // We can't recover from this error.
+      NotifyError(aTrack, NS_ERROR_DOM_MEDIA_FATAL_ERR);
     }
   }
 
@@ -1664,6 +1700,7 @@ MediaFormatReader::ResetDecode(TrackSet aTracks)
 
   if (HasVideo() && aTracks.contains(TrackInfo::kVideoTrack)) {
     mVideo.ResetDemuxer();
+    mVideo.mFirstFrameTime = Some(media::TimeUnit());
     Reset(TrackInfo::kVideoTrack);
     if (mVideo.HasPromise()) {
       mVideo.RejectPromise(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
@@ -1672,6 +1709,7 @@ MediaFormatReader::ResetDecode(TrackSet aTracks)
 
   if (HasAudio() && aTracks.contains(TrackInfo::kAudioTrack)) {
     mAudio.ResetDemuxer();
+    mVideo.mFirstFrameTime = Some(media::TimeUnit());
     Reset(TrackInfo::kAudioTrack);
     if (mAudio.HasPromise()) {
       mAudio.RejectPromise(NS_ERROR_DOM_MEDIA_CANCELED, __func__);
@@ -2030,6 +2068,7 @@ MediaFormatReader::OnVideoSeekCompleted(media::TimeUnit aTime)
   LOGV("Video seeked to %lld", aTime.ToMicroseconds());
   mVideo.mSeekRequest.Complete();
 
+  mVideo.mFirstFrameTime = Some(aTime);
   mPreviousDecodedKeyframeTime_us = sNoPreviousDecodedKeyframe;
 
   SetVideoDecodeThreshold();
@@ -2111,6 +2150,7 @@ MediaFormatReader::OnAudioSeekCompleted(media::TimeUnit aTime)
   MOZ_ASSERT(OnTaskQueue());
   LOGV("Audio seeked to %lld", aTime.ToMicroseconds());
   mAudio.mSeekRequest.Complete();
+  mAudio.mFirstFrameTime = Some(aTime);
   mPendingSeekTime.reset();
   mSeekPromise.Resolve(aTime, __func__);
 }

dom/media/MediaFormatReader.h

@@ -235,6 +235,7 @@ private:
       , mDrainComplete(false)
       , mNumOfConsecutiveError(0)
       , mMaxConsecutiveError(aNumOfMaxError)
+      , mFirstFrameTime(Some(media::TimeUnit()))
       , mNumSamplesInput(0)
       , mNumSamplesOutput(0)
       , mNumSamplesOutputTotal(0)
@@ -243,6 +244,7 @@ private:
       , mIsHardwareAccelerated(false)
       , mLastStreamSourceID(UINT32_MAX)
       , mIsBlankDecode(false)
+      , mHardwareDecodingDisabled(false)
     {}
 
     MediaFormatReader* mOwner;
@@ -316,6 +318,11 @@ private:
 
     uint32_t mNumOfConsecutiveError;
     uint32_t mMaxConsecutiveError;
+    // Set when we haven't yet decoded the first frame.
+    // Cleared once the first frame has been decoded.
+    // This is used to determine, upon error, if we should try again to decode
+    // the frame, or skip to the next keyframe.
+    Maybe<media::TimeUnit> mFirstFrameTime;
 
     Maybe<MediaResult> mError;
     bool HasFatalError() const
@@ -341,8 +348,8 @@ private:
     // Used for internal seeking when a change of stream is detected or when
     // encountering data discontinuity.
     Maybe<InternalSeekTarget> mTimeThreshold;
-    // Time of last sample returned.
-    Maybe<media::TimeInterval> mLastSampleTime;
+    // Time of last decoded sample returned.
+    Maybe<media::TimeInterval> mLastDecodedSampleTime;
 
     // Decoded samples returned my mDecoder awaiting being returned to
     // state machine upon request.
@@ -405,7 +412,7 @@ private:
       mDraining = false;
       mDrainComplete = false;
       mTimeThreshold.reset();
-      mLastSampleTime.reset();
+      mLastDecodedSampleTime.reset();
       mOutput.Clear();
       mNumSamplesInput = 0;
       mNumSamplesOutput = 0;
@@ -437,6 +444,7 @@ private:
     Maybe<media::TimeUnit> mFirstDemuxedSampleTime;
     // Use BlankDecoderModule or not.
     bool mIsBlankDecode;
+    bool mHardwareDecodingDisabled;
 
   };
 

dom/media/gmp/rlz/GMPDeviceBinding.h

@@ -7,6 +7,7 @@
 #define GMP_DEVICE_BINDING_h_
 
 #include <string>
+#include <cstdint>
 
 namespace mozilla {
 namespace gmp {

dom/media/platforms/PlatformDecoderModule.h

@@ -10,6 +10,7 @@
 #include "ImageContainer.h"
 #include "MediaDecoderReader.h"
 #include "MediaInfo.h"
+#include "mozilla/EnumSet.h"
 #include "mozilla/MozPromise.h"
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/KnowsCompositor.h"
@@ -47,6 +48,13 @@ struct MOZ_STACK_CLASS CreateDecoderParams final {
     : mConfig(aConfig)
   {}
 
+  enum class Option
+  {
+    Default,
+    HardwareDecoderNotAllowed,
+  };
+  using OptionSet = EnumSet<Option>;
+
   template <typename T1, typename... Ts>
   CreateDecoderParams(const TrackInfo& aConfig, T1&& a1, Ts&&... args)
     : mConfig(aConfig)
@@ -85,6 +93,7 @@ struct MOZ_STACK_CLASS CreateDecoderParams final {
   RefPtr<GMPCrashHelper> mCrashHelper;
 #endif
   bool mUseBlankDecoder = false;
+  OptionSet mOptions = OptionSet(Option::Default);
 
 private:
   void Set(TaskQueue* aTaskQueue) { mTaskQueue = aTaskQueue; }
@@ -96,6 +105,7 @@ private:
   void Set(GMPCrashHelper* aCrashHelper) { mCrashHelper = aCrashHelper; }
 #endif
   void Set(bool aUseBlankDecoder) { mUseBlankDecoder = aUseBlankDecoder; }
+  void Set(OptionSet aOptions) { mOptions = aOptions; }
   void Set(layers::KnowsCompositor* aKnowsCompositor) { mKnowsCompositor = aKnowsCompositor; }
   template <typename T1, typename T2, typename... Ts>
   void Set(T1&& a1, T2&& a2, Ts&&... args)

dom/media/platforms/agnostic/VPXDecoder.cpp

@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "VPXDecoder.h"
+#include "mp4_demuxer/BitReader.h"
 #include "gfx2DGlue.h"
 #include "nsError.h"
 #include "TimeUnits.h"
@@ -383,5 +384,32 @@ VPXDecoder::GetFrameSize(Span<const uint8_t> aBuffer, Codec aCodec)
   return nsIntSize(si.w, si.h);
 }
 
+/* static */
+int
+VPXDecoder::GetVP9Profile(Span<const uint8_t> aBuffer)
+{
+  if (aBuffer.Length() < 2) {
+    // Can't be good.
+    return -1;
+  }
+  mp4_demuxer::BitReader br(aBuffer.Elements(), aBuffer.Length() * 8);
+
+  uint32_t frameMarker = br.ReadBits(2); // frame_marker
+  if (frameMarker != 2) {
+    // That's not a valid vp9 header.
+    return -1;
+  }
+  uint32_t profile = br.ReadBits(1); // profile_low_bit
+  profile |= br.ReadBits(1) << 1; // profile_high_bit
+  if (profile == 3) {
+    profile += br.ReadBits(1); // reserved_zero
+    if (profile > 3) {
+      // reserved_zero wasn't zero.
+      return -1;
+    }
+  }
+  return profile;
+}
+
 } // namespace mozilla
 #undef LOG

dom/media/platforms/agnostic/VPXDecoder.h

@@ -53,6 +53,10 @@ public:
   // Return the frame dimensions for a sample for the specified codec.
   static nsIntSize GetFrameSize(Span<const uint8_t> aBuffer, Codec aCodec);
 
+  // Return the VP9 profile as per https://www.webmproject.org/vp9/profiles/
+  // Return negative value if error.
+  static int GetVP9Profile(Span<const uint8_t> aBuffer);
+
 private:
   void ProcessDecode(MediaRawData* aSample);
   MediaResult DoDecode(MediaRawData* aSample);

dom/media/platforms/apple/AppleVTDecoder.cpp

@@ -40,11 +40,7 @@ AppleVTDecoder::AppleVTDecoder(const VideoInfo& aConfig,
   , mMaxRefFrames(mp4_demuxer::H264::ComputeMaxRefFrames(aConfig.mExtraData))
   , mImageContainer(aImageContainer)
   , mIsShutDown(false)
-#ifdef MOZ_WIDGET_UIKIT
-  , mUseSoftwareImages(true)
-#else
   , mUseSoftwareImages(false)
-#endif
   , mIsFlushing(false)
   , mMonitor("AppleVideoDecoder")
   , mFormat(nullptr)
@@ -356,7 +352,6 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
     // Unlock the returned image data.
     CVPixelBufferUnlockBaseAddress(aImage, kCVPixelBufferLock_ReadOnly);
   } else {
-#ifndef MOZ_WIDGET_UIKIT
     IOSurfacePtr surface = MacIOSurfaceLib::CVPixelBufferGetIOSurface(aImage);
     MOZ_ASSERT(surface, "Decoder didn't return an IOSurface backed buffer");
 
@@ -373,9 +368,6 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
                                  aFrameRef.is_sync_point,
                                  aFrameRef.decode_timestamp.ToMicroseconds(),
                                  visible);
-#else
-    MOZ_ASSERT_UNREACHABLE("No MacIOSurface on iOS");
-#endif
   }
 
   if (!data) {

dom/media/platforms/wmf/WMFDecoderModule.cpp

@@ -91,11 +91,12 @@ WMFDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
     return nullptr;
   }
 
-  nsAutoPtr<WMFVideoMFTManager> manager(
-    new WMFVideoMFTManager(aParams.VideoConfig(),
-                           aParams.mKnowsCompositor,
-                           aParams.mImageContainer,
-                           sDXVAEnabled));
+  nsAutoPtr<WMFVideoMFTManager> manager(new WMFVideoMFTManager(
+    aParams.VideoConfig(),
+    aParams.mKnowsCompositor,
+    aParams.mImageContainer,
+    sDXVAEnabled && !aParams.mOptions.contains(
+                      CreateDecoderParams::Option::HardwareDecoderNotAllowed)));
 
   if (!manager->Init()) {
     return nullptr;

dom/media/platforms/wmf/WMFVideoMFTManager.cpp

@@ -576,6 +576,16 @@ WMFVideoMFTManager::Input(MediaRawData* aSample)
     return E_FAIL;
   }
 
+  if (mStreamType == VP9 && aSample->mKeyframe) {
+    // Check the VP9 profile. the VP9 MFT can only handle correctly profile 0
+    // and 2 (yuv420 8/10/12 bits)
+    int profile =
+      VPXDecoder::GetVP9Profile(MakeSpan(aSample->Data(), aSample->Size()));
+    if (profile != 0 && profile != 2) {
+      return E_FAIL;
+    }
+  }
+
   HRESULT hr = mDecoder->CreateInputSample(aSample->Data(),
                                            uint32_t(aSample->Size()),
                                            aSample->mTime,
@@ -990,7 +1000,12 @@ WMFVideoMFTManager::Output(int64_t aStreamOffset,
   aOutData = frame;
   // Set the potentially corrected pts and duration.
   aOutData->mTime = pts.ToMicroseconds();
-  aOutData->mDuration = duration.ToMicroseconds();
+  // The VP9 decoder doesn't provide a valid duration. AS VP9 doesn't have a
+  // concept of pts vs dts and have no latency. We can as such use the last
+  // known input duration.
+  aOutData->mDuration = (mStreamType == VP9 && duration == media::TimeUnit())
+                        ? mLastDuration
+                        : duration.ToMicroseconds();
 
   if (mNullOutputCount) {
     mGotValidOutputAfterNullOutput = true;

dom/media/webaudio/AnalyserNode.cpp

@@ -100,6 +100,45 @@ public:
   uint32_t mChunksToProcess = 0;
 };
 
+/* static */ already_AddRefed<AnalyserNode>
+AnalyserNode::Create(AudioContext& aAudioContext,
+                     const AnalyserOptions& aOptions,
+                     ErrorResult& aRv)
+{
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<AnalyserNode> analyserNode = new AnalyserNode(&aAudioContext);
+
+  analyserNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  analyserNode->SetFftSize(aOptions.mFftSize, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  analyserNode->SetMinDecibels(aOptions.mMinDecibels, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  analyserNode->SetMaxDecibels(aOptions.mMaxDecibels, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  analyserNode->SetSmoothingTimeConstant(aOptions.mSmoothingTimeConstant, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  return analyserNode.forget();
+}
+
 AnalyserNode::AnalyserNode(AudioContext* aContext)
   : AudioNode(aContext,
               1,

dom/media/webaudio/AnalyserNode.h

@@ -14,16 +14,26 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct AnalyserOptions;
 
 class AnalyserNode final : public AudioNode
 {
 public:
-  explicit AnalyserNode(AudioContext* aContext);
+  static already_AddRefed<AnalyserNode>
+  Create(AudioContext& aAudioContext, const AnalyserOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
 
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
+  static already_AddRefed<AnalyserNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const AnalyserOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   void GetFloatFrequencyData(const Float32Array& aArray);
   void GetByteFrequencyData(const Uint8Array& aArray);
   void GetFloatTimeDomainData(const Float32Array& aArray);
@@ -61,10 +71,9 @@ public:
   virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  ~AnalyserNode() {}
-
 private:
+  ~AnalyserNode() = default;
+
   friend class AnalyserNodeEngine;
   void AppendChunk(const AudioChunk& aChunk);
   bool AllocateBuffer();
@@ -73,6 +82,8 @@ private:
   void GetTimeDomainData(float* aData, size_t aLength);
 
 private:
+  explicit AnalyserNode(AudioContext* aContext);
+
   FFTBlock mAnalysisBlock;
   nsTArray<AudioChunk> mChunks;
   double mMinDecibels;

dom/media/webaudio/AudioBuffer.cpp

@@ -178,6 +178,24 @@ AudioBuffer::~AudioBuffer()
   mozilla::DropJSObjects(this);
 }
 
+/* static */ already_AddRefed<AudioBuffer>
+AudioBuffer::Constructor(const GlobalObject& aGlobal,
+                         AudioContext& aAudioContext,
+                         const AudioBufferOptions& aOptions,
+                         ErrorResult& aRv)
+{
+  if (!aOptions.mNumberOfChannels) {
+    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    return nullptr;
+  }
+
+  float sampleRate = aOptions.mSampleRate.WasPassed()
+                       ? aOptions.mSampleRate.Value()
+                       : aAudioContext.SampleRate();
+  return Create(&aAudioContext, aOptions.mNumberOfChannels, aOptions.mLength,
+                sampleRate, aRv);
+}
+
 void
 AudioBuffer::ClearJSChannels()
 {

dom/media/webaudio/AudioBuffer.h

@@ -24,6 +24,7 @@ class ThreadSharedFloatArrayBufferList;
 
 namespace dom {
 
+struct AudioBufferOptions;
 class AudioContext;
 
 /**
@@ -56,6 +57,10 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AudioBuffer)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(AudioBuffer)
 
+  static already_AddRefed<AudioBuffer>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const AudioBufferOptions& aOptions, ErrorResult& aRv);
+
   nsPIDOMWindowInner* GetParentObject() const
   {
     nsCOMPtr<nsPIDOMWindowInner> parentObject = do_QueryReferent(mOwnerWindow);
@@ -134,4 +139,3 @@ protected:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/AudioBufferSourceNode.cpp

@@ -607,10 +607,30 @@ AudioBufferSourceNode::AudioBufferSourceNode(AudioContext* aContext)
   mStream->AddMainThreadListener(this);
 }
 
-AudioBufferSourceNode::~AudioBufferSourceNode()
+/* static */ already_AddRefed<AudioBufferSourceNode>
+AudioBufferSourceNode::Create(JSContext* aCx, AudioContext& aAudioContext,
+                              const AudioBufferSourceOptions& aOptions,
+                              ErrorResult& aRv)
 {
-}
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
 
+  RefPtr<AudioBufferSourceNode> audioNode = new AudioBufferSourceNode(&aAudioContext);
+
+  if (aOptions.mBuffer.WasPassed()) {
+    MOZ_ASSERT(aCx);
+    audioNode->SetBuffer(aCx, aOptions.mBuffer.Value());
+  }
+
+  audioNode->Detune()->SetValue(aOptions.mDetune);
+  audioNode->SetLoop(aOptions.mLoop);
+  audioNode->SetLoopEnd(aOptions.mLoopEnd);
+  audioNode->SetLoopStart(aOptions.mLoopStart);
+  audioNode->PlaybackRate()->SetValue(aOptions.mPlaybackRate);
+
+  return audioNode.forget();
+}
 void
 AudioBufferSourceNode::DestroyMediaStream()
 {

dom/media/webaudio/AudioBufferSourceNode.h

@@ -12,13 +12,16 @@
 namespace mozilla {
 namespace dom {
 
+struct AudioBufferSourceOptions;
 class AudioParam;
 
-class AudioBufferSourceNode final : public AudioNode,
-                                    public MainThreadMediaStreamListener
+class AudioBufferSourceNode final : public AudioNode
+                                  , public MainThreadMediaStreamListener
 {
 public:
-  explicit AudioBufferSourceNode(AudioContext* aContext);
+  static already_AddRefed<AudioBufferSourceNode>
+  Create(JSContext* aCx, AudioContext& aAudioContext,
+         const AudioBufferSourceOptions& aOptions, ErrorResult& aRv);
 
   void DestroyMediaStream() override;
 
@@ -33,6 +36,13 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(AudioBufferSourceNode, AudioNode)
 
+  static already_AddRefed<AudioBufferSourceNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const AudioBufferSourceOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aGlobal.Context(), aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void Start(double aWhen, double aOffset,
@@ -98,10 +108,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~AudioBufferSourceNode();
-
 private:
+  explicit AudioBufferSourceNode(AudioContext* aContext);
+  ~AudioBufferSourceNode() = default;
+
   friend class AudioBufferSourceNodeEngine;
   // START is sent during Start().
   // STOP is sent during Stop().
@@ -129,7 +139,6 @@ private:
   void SendBufferParameterToStream(JSContext* aCx);
   void SendOffsetAndDurationParametersToStream(AudioNodeStream* aStream);
 
-private:
   double mLoopStart;
   double mLoopEnd;
   double mOffset;
@@ -145,4 +154,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/AudioContext.cpp

@@ -11,10 +11,26 @@
 #include "mozilla/OwningNonNull.h"
 
 #include "mozilla/dom/AnalyserNode.h"
+#include "mozilla/dom/AnalyserNodeBinding.h"
+#include "mozilla/dom/AudioBufferSourceNodeBinding.h"
 #include "mozilla/dom/AudioContextBinding.h"
+#include "mozilla/dom/BiquadFilterNodeBinding.h"
+#include "mozilla/dom/ChannelMergerNodeBinding.h"
+#include "mozilla/dom/ChannelSplitterNodeBinding.h"
+#include "mozilla/dom/ConvolverNodeBinding.h"
+#include "mozilla/dom/DelayNodeBinding.h"
+#include "mozilla/dom/DynamicsCompressorNodeBinding.h"
+#include "mozilla/dom/GainNodeBinding.h"
+#include "mozilla/dom/IIRFilterNodeBinding.h"
 #include "mozilla/dom/HTMLMediaElement.h"
+#include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
+#include "mozilla/dom/MediaStreamAudioSourceNodeBinding.h"
 #include "mozilla/dom/OfflineAudioContextBinding.h"
+#include "mozilla/dom/OscillatorNodeBinding.h"
+#include "mozilla/dom/PannerNodeBinding.h"
 #include "mozilla/dom/Promise.h"
+#include "mozilla/dom/StereoPannerNodeBinding.h"
+#include "mozilla/dom/WaveShaperNodeBinding.h"
 
 #include "AudioBuffer.h"
 #include "AudioBufferSourceNode.h"
@@ -245,13 +261,9 @@ bool AudioContext::CheckClosed(ErrorResult& aRv)
 already_AddRefed<AudioBufferSourceNode>
 AudioContext::CreateBufferSource(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<AudioBufferSourceNode> bufferNode =
-    new AudioBufferSourceNode(this);
-  return bufferNode.forget();
+  return AudioBufferSourceNode::Create(nullptr, *this,
+                                       AudioBufferSourceOptions(),
+                                       aRv);
 }
 
 already_AddRefed<ConstantSourceNode>
@@ -303,18 +315,8 @@ bool IsValidBufferSize(uint32_t aBufferSize) {
 already_AddRefed<MediaStreamAudioDestinationNode>
 AudioContext::CreateMediaStreamDestination(ErrorResult& aRv)
 {
-  if (mIsOffline) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<MediaStreamAudioDestinationNode> node =
-      new MediaStreamAudioDestinationNode(this);
-  return node.forget();
+  return MediaStreamAudioDestinationNode::Create(*this, AudioNodeOptions(),
+                                                 aRv);
 }
 
 already_AddRefed<ScriptProcessorNode>
@@ -344,181 +346,93 @@ AudioContext::CreateScriptProcessor(uint32_t aBufferSize,
 already_AddRefed<AnalyserNode>
 AudioContext::CreateAnalyser(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<AnalyserNode> analyserNode = new AnalyserNode(this);
-  return analyserNode.forget();
+  return AnalyserNode::Create(*this, AnalyserOptions(), aRv);
 }
 
 already_AddRefed<StereoPannerNode>
 AudioContext::CreateStereoPanner(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<StereoPannerNode> stereoPannerNode = new StereoPannerNode(this);
-  return stereoPannerNode.forget();
+  return StereoPannerNode::Create(*this, StereoPannerOptions(), aRv);
 }
 
 already_AddRefed<MediaElementAudioSourceNode>
 AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
                                        ErrorResult& aRv)
 {
-  if (mIsOffline) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
+  MediaElementAudioSourceOptions options;
+  options.mMediaElement = aMediaElement;
 
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<DOMMediaStream> stream =
-    aMediaElement.CaptureAudio(aRv, mDestination->Stream()->Graph());
-  if (aRv.Failed()) {
-    return nullptr;
-  }
-  return MediaElementAudioSourceNode::Create(this, stream, aRv);
+  return MediaElementAudioSourceNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<MediaStreamAudioSourceNode>
 AudioContext::CreateMediaStreamSource(DOMMediaStream& aMediaStream,
                                       ErrorResult& aRv)
 {
-  if (mIsOffline) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
+  MediaStreamAudioSourceOptions options;
+  options.mMediaStream = aMediaStream;
 
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  return MediaStreamAudioSourceNode::Create(this, &aMediaStream, aRv);
+  return MediaStreamAudioSourceNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<GainNode>
 AudioContext::CreateGain(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<GainNode> gainNode = new GainNode(this);
-  return gainNode.forget();
+  return GainNode::Create(*this, GainOptions(), aRv);
 }
 
 already_AddRefed<WaveShaperNode>
 AudioContext::CreateWaveShaper(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<WaveShaperNode> waveShaperNode = new WaveShaperNode(this);
-  return waveShaperNode.forget();
+  return WaveShaperNode::Create(*this, WaveShaperOptions(), aRv);
 }
 
 already_AddRefed<DelayNode>
 AudioContext::CreateDelay(double aMaxDelayTime, ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aMaxDelayTime > 0. && aMaxDelayTime < 180.) {
-    RefPtr<DelayNode> delayNode = new DelayNode(this, aMaxDelayTime);
-    return delayNode.forget();
-  }
-
-  aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-  return nullptr;
+  DelayOptions options;
+  options.mMaxDelayTime = aMaxDelayTime;
+  return DelayNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<PannerNode>
 AudioContext::CreatePanner(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<PannerNode> pannerNode = new PannerNode(this);
-  mPannerNodes.PutEntry(pannerNode);
-  return pannerNode.forget();
+  return PannerNode::Create(*this, PannerOptions(), aRv);
 }
 
 already_AddRefed<ConvolverNode>
 AudioContext::CreateConvolver(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<ConvolverNode> convolverNode = new ConvolverNode(this);
-  return convolverNode.forget();
+  return ConvolverNode::Create(nullptr, *this, ConvolverOptions(), aRv);
 }
 
 already_AddRefed<ChannelSplitterNode>
 AudioContext::CreateChannelSplitter(uint32_t aNumberOfOutputs, ErrorResult& aRv)
 {
-  if (aNumberOfOutputs == 0 ||
-      aNumberOfOutputs > WebAudioUtils::MaxChannelCount) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return nullptr;
-  }
-
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<ChannelSplitterNode> splitterNode =
-    new ChannelSplitterNode(this, aNumberOfOutputs);
-  return splitterNode.forget();
+  ChannelSplitterOptions options;
+  options.mNumberOfOutputs = aNumberOfOutputs;
+  return ChannelSplitterNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<ChannelMergerNode>
 AudioContext::CreateChannelMerger(uint32_t aNumberOfInputs, ErrorResult& aRv)
 {
-  if (aNumberOfInputs == 0 ||
-      aNumberOfInputs > WebAudioUtils::MaxChannelCount) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return nullptr;
-  }
-
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<ChannelMergerNode> mergerNode =
-    new ChannelMergerNode(this, aNumberOfInputs);
-  return mergerNode.forget();
+  ChannelMergerOptions options;
+  options.mNumberOfInputs = aNumberOfInputs;
+  return ChannelMergerNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<DynamicsCompressorNode>
 AudioContext::CreateDynamicsCompressor(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<DynamicsCompressorNode> compressorNode =
-    new DynamicsCompressorNode(this);
-  return compressorNode.forget();
+  return DynamicsCompressorNode::Create(*this, DynamicsCompressorOptions(), aRv);
 }
 
 already_AddRefed<BiquadFilterNode>
 AudioContext::CreateBiquadFilter(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<BiquadFilterNode> filterNode =
-    new BiquadFilterNode(this);
-  return filterNode.forget();
+  return BiquadFilterNode::Create(*this, BiquadFilterOptions(), aRv);
 }
 
 already_AddRefed<IIRFilterNode>
@@ -526,47 +440,16 @@ AudioContext::CreateIIRFilter(const mozilla::dom::binding_detail::AutoSequence<d
                               const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback,
                               mozilla::ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aFeedforward.Length() == 0 || aFeedforward.Length() > 20) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (aFeedback.Length() == 0 || aFeedback.Length() > 20) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  bool feedforwardAllZeros = true;
-  for (size_t i = 0; i < aFeedforward.Length(); ++i) {
-    if (aFeedforward.Elements()[i] != 0.0) {
-      feedforwardAllZeros = false;
-    }
-  }
-
-  if (feedforwardAllZeros || aFeedback.Elements()[0] == 0.0) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return nullptr;
-  }
-
-  RefPtr<IIRFilterNode> filterNode =
-    new IIRFilterNode(this, aFeedforward, aFeedback);
-  return filterNode.forget();
+  IIRFilterOptions options;
+  options.mFeedforward = aFeedforward;
+  options.mFeedback = aFeedback;
+  return IIRFilterNode::Create(*this, options, aRv);
 }
 
 already_AddRefed<OscillatorNode>
 AudioContext::CreateOscillator(ErrorResult& aRv)
 {
-  if (CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<OscillatorNode> oscillatorNode =
-    new OscillatorNode(this);
-  return oscillatorNode.forget();
+  return OscillatorNode::Create(*this, OscillatorOptions(), aRv);
 }
 
 already_AddRefed<PeriodicWave>

dom/media/webaudio/AudioContext.h

@@ -316,6 +316,8 @@ public:
   IMPL_EVENT_HANDLER(mozinterruptbegin)
   IMPL_EVENT_HANDLER(mozinterruptend)
 
+  bool CheckClosed(ErrorResult& aRv);
+
 private:
   void DisconnectFromWindow();
   void RemoveFromDecodeQueue(WebAudioDecodeJob* aDecodeJob);
@@ -326,8 +328,6 @@ private:
 
   friend struct ::mozilla::WebAudioDecodeJob;
 
-  bool CheckClosed(ErrorResult& aRv);
-
   nsTArray<MediaStream*> GetAllStreams() const;
 
 private:

dom/media/webaudio/AudioNode.cpp

@@ -71,6 +71,28 @@ AudioNode::~AudioNode()
   }
 }
 
+void
+AudioNode::Initialize(const AudioNodeOptions& aOptions, ErrorResult& aRv)
+{
+  if (aOptions.mChannelCount.WasPassed()) {
+    SetChannelCount(aOptions.mChannelCount.Value(), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
+  }
+
+  if (aOptions.mChannelCountMode.WasPassed()) {
+    SetChannelCountModeValue(aOptions.mChannelCountMode.Value(), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return;
+    }
+  }
+
+  if (aOptions.mChannelInterpretation.WasPassed()) {
+    SetChannelInterpretationValue(aOptions.mChannelInterpretation.Value());
+  }
+}
+
 size_t
 AudioNode::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {

dom/media/webaudio/AudioNode.h

@@ -250,6 +250,9 @@ private:
   bool DisconnectFromOutputIfConnected(uint32_t aOutputIndex, uint32_t aInputIndex);
 
 protected:
+  // Helper for the Constructors for nodes.
+  void Initialize(const AudioNodeOptions& aOptions, ErrorResult& aRv);
+
   // Helpers for sending different value types to streams
   void SendDoubleParameterToStream(uint32_t aIndex, double aValue);
   void SendInt32ParameterToStream(uint32_t aIndex, int32_t aValue);

dom/media/webaudio/BiquadFilterNode.cpp

@@ -262,8 +262,29 @@ BiquadFilterNode::BiquadFilterNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-BiquadFilterNode::~BiquadFilterNode()
+/* static */ already_AddRefed<BiquadFilterNode>
+BiquadFilterNode::Create(AudioContext& aAudioContext,
+                         const BiquadFilterOptions& aOptions,
+                         ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<BiquadFilterNode> audioNode = new BiquadFilterNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->SetType(aOptions.mType);
+  audioNode->Q()->SetValue(aOptions.mQ);
+  audioNode->Detune()->SetValue(aOptions.mDetune);
+  audioNode->Frequency()->SetValue(aOptions.mFrequency);
+  audioNode->Gain()->SetValue(aOptions.mGain);
+
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/BiquadFilterNode.h

@@ -14,15 +14,25 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct BiquadFilterOptions;
 
 class BiquadFilterNode final : public AudioNode
 {
 public:
-  explicit BiquadFilterNode(AudioContext* aContext);
+  static already_AddRefed<BiquadFilterNode>
+  Create(AudioContext& aAudioContext, const BiquadFilterOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BiquadFilterNode, AudioNode)
 
+  static already_AddRefed<BiquadFilterNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const BiquadFilterOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   BiquadFilterType Type() const
@@ -63,10 +73,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~BiquadFilterNode();
-
 private:
+  explicit BiquadFilterNode(AudioContext* aContext);
+  ~BiquadFilterNode() = default;
+
   BiquadFilterType mType;
   RefPtr<AudioParam> mFrequency;
   RefPtr<AudioParam> mDetune;
@@ -78,4 +88,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/ChannelMergerNode.cpp

@@ -74,8 +74,30 @@ ChannelMergerNode::ChannelMergerNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-ChannelMergerNode::~ChannelMergerNode()
+/* static */ already_AddRefed<ChannelMergerNode>
+ChannelMergerNode::Create(AudioContext& aAudioContext,
+                          const ChannelMergerOptions& aOptions,
+                          ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aOptions.mNumberOfInputs == 0 ||
+      aOptions.mNumberOfInputs > WebAudioUtils::MaxChannelCount) {
+    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    return nullptr;
+  }
+
+  RefPtr<ChannelMergerNode> audioNode =
+    new ChannelMergerNode(&aAudioContext, aOptions.mNumberOfInputs);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  return audioNode.forget();
 }
 
 JSObject*
@@ -86,4 +108,3 @@ ChannelMergerNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 
 } // namespace dom
 } // namespace mozilla
-

dom/media/webaudio/ChannelMergerNode.h

@@ -12,15 +12,24 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct ChannelMergerOptions;
 
 class ChannelMergerNode final : public AudioNode
 {
 public:
-  ChannelMergerNode(AudioContext* aContext,
-                    uint16_t aInputCount);
+  static already_AddRefed<ChannelMergerNode>
+  Create(AudioContext& aAudioContext, const ChannelMergerOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
 
+  static already_AddRefed<ChannelMergerNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const ChannelMergerOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfInputs() const override { return mInputCount; }
@@ -35,10 +44,11 @@ public:
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
-protected:
-  virtual ~ChannelMergerNode();
-
 private:
+  ChannelMergerNode(AudioContext* aContext,
+                    uint16_t aInputCount);
+  ~ChannelMergerNode() = default;
+
   const uint16_t mInputCount;
 };
 
@@ -46,4 +56,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/ChannelSplitterNode.cpp

@@ -65,8 +65,30 @@ ChannelSplitterNode::ChannelSplitterNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-ChannelSplitterNode::~ChannelSplitterNode()
+/* static */ already_AddRefed<ChannelSplitterNode>
+ChannelSplitterNode::Create(AudioContext& aAudioContext,
+                            const ChannelSplitterOptions& aOptions,
+                            ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aOptions.mNumberOfOutputs == 0 ||
+      aOptions.mNumberOfOutputs > WebAudioUtils::MaxChannelCount) {
+    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    return nullptr;
+  }
+
+  RefPtr<ChannelSplitterNode> audioNode =
+    new ChannelSplitterNode(&aAudioContext, aOptions.mNumberOfOutputs);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  return audioNode.forget();
 }
 
 JSObject*
@@ -77,4 +99,3 @@ ChannelSplitterNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProt
 
 } // namespace dom
 } // namespace mozilla
-

dom/media/webaudio/ChannelSplitterNode.h

@@ -12,15 +12,24 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct ChannelSplitterOptions;
 
 class ChannelSplitterNode final : public AudioNode
 {
 public:
-  ChannelSplitterNode(AudioContext* aContext,
-                      uint16_t aOutputCount);
+  static already_AddRefed<ChannelSplitterNode>
+  Create(AudioContext& aAudioContext, const ChannelSplitterOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
 
+  static already_AddRefed<ChannelSplitterNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const ChannelSplitterOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfOutputs() const override { return mOutputCount; }
@@ -35,10 +44,11 @@ public:
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
-protected:
-  virtual ~ChannelSplitterNode();
-
 private:
+  ChannelSplitterNode(AudioContext* aContext,
+                      uint16_t aOutputCount);
+  ~ChannelSplitterNode() = default;
+
   const uint16_t mOutputCount;
 };
 
@@ -46,4 +56,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/ConvolverNode.cpp

@@ -203,8 +203,34 @@ ConvolverNode::ConvolverNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-ConvolverNode::~ConvolverNode()
+/* static */ already_AddRefed<ConvolverNode>
+ConvolverNode::Create(JSContext* aCx, AudioContext& aAudioContext,
+                      const ConvolverOptions& aOptions,
+                      ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<ConvolverNode> audioNode = new ConvolverNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  // This must be done before setting the buffer.
+  audioNode->SetNormalize(!aOptions.mDisableNormalization);
+
+  if (aOptions.mBuffer.WasPassed()) {
+    MOZ_ASSERT(aCx);
+    audioNode->SetBuffer(aCx, aOptions.mBuffer.Value(), aRv);
+    if (NS_WARN_IF(aRv.Failed())) {
+      return nullptr;
+    }
+  }
+
+  return audioNode.forget();
 }
 
 size_t
@@ -291,4 +317,3 @@ ConvolverNode::SetNormalize(bool aNormalize)
 
 } // namespace dom
 } // namespace mozilla
-

dom/media/webaudio/ConvolverNode.h

@@ -12,14 +12,26 @@
 namespace mozilla {
 namespace dom {
 
+class AudioContext;
+struct ConvolverOptions;
+
 class ConvolverNode final : public AudioNode
 {
 public:
-  explicit ConvolverNode(AudioContext* aContext);
+  static already_AddRefed<ConvolverNode>
+  Create(JSContext* aCx, AudioContext& aAudioContext,
+         const ConvolverOptions& aOptions, ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ConvolverNode, AudioNode);
 
+  static already_AddRefed<ConvolverNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const ConvolverOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aGlobal.Context(), aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioBuffer* GetBuffer(JSContext* aCx) const
@@ -27,7 +39,7 @@ public:
     return mBuffer;
   }
 
-  void SetBuffer(JSContext* aCx, AudioBuffer* aBufferi, ErrorResult& aRv);
+  void SetBuffer(JSContext* aCx, AudioBuffer* aBuffer, ErrorResult& aRv);
 
   bool Normalize() const
   {
@@ -61,10 +73,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~ConvolverNode();
-
 private:
+  explicit ConvolverNode(AudioContext* aContext);
+  ~ConvolverNode() = default;
+
   RefPtr<AudioBuffer> mBuffer;
   bool mNormalize;
 };
@@ -74,4 +86,3 @@ private:
 } //end namespace mozilla
 
 #endif
-

dom/media/webaudio/DelayNode.cpp

@@ -205,8 +205,30 @@ DelayNode::DelayNode(AudioContext* aContext, double aMaxDelay)
                                     aContext->Graph());
 }
 
-DelayNode::~DelayNode()
+/* static */ already_AddRefed<DelayNode>
+DelayNode::Create(AudioContext& aAudioContext,
+                  const DelayOptions& aOptions,
+                  ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aOptions.mMaxDelayTime <= 0. || aOptions.mMaxDelayTime >= 180.) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  RefPtr<DelayNode> audioNode = new DelayNode(&aAudioContext,
+                                              aOptions.mMaxDelayTime);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->DelayTime()->SetValue(aOptions.mDelayTime);
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/DelayNode.h

@@ -13,15 +13,25 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct DelayOptions;
 
 class DelayNode final : public AudioNode
 {
 public:
-  DelayNode(AudioContext* aContext, double aMaxDelay);
+  static already_AddRefed<DelayNode>
+  Create(AudioContext& aAudioContext, const DelayOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DelayNode, AudioNode)
 
+  static already_AddRefed<DelayNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const DelayOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* DelayTime() const
@@ -37,13 +47,12 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~DelayNode();
-
 private:
+  DelayNode(AudioContext* aContext, double aMaxDelay);
+  ~DelayNode() = default;
+
   friend class DelayNodeEngine;
 
-private:
   RefPtr<AudioParam> mDelay;
 };
 
@@ -51,4 +60,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/DynamicsCompressorNode.cpp

@@ -204,8 +204,30 @@ DynamicsCompressorNode::DynamicsCompressorNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-DynamicsCompressorNode::~DynamicsCompressorNode()
+/* static */ already_AddRefed<DynamicsCompressorNode>
+DynamicsCompressorNode::Create(AudioContext& aAudioContext,
+                               const DynamicsCompressorOptions& aOptions,
+                               ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<DynamicsCompressorNode> audioNode =
+    new DynamicsCompressorNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->Attack()->SetValue(aOptions.mAttack);
+  audioNode->Knee()->SetValue(aOptions.mKnee);
+  audioNode->Ratio()->SetValue(aOptions.mRatio);
+  audioNode->GetRelease()->SetValue(aOptions.mRelease);
+  audioNode->Threshold()->SetValue(aOptions.mThreshold);
+
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/DynamicsCompressorNode.h

@@ -13,15 +13,25 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct DynamicsCompressorOptions;
 
 class DynamicsCompressorNode final : public AudioNode
 {
 public:
-  explicit DynamicsCompressorNode(AudioContext* aContext);
+  static already_AddRefed<DynamicsCompressorNode>
+  Create(AudioContext& aAudioContext, const DynamicsCompressorOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DynamicsCompressorNode, AudioNode)
 
+  static already_AddRefed<DynamicsCompressorNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const DynamicsCompressorOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* Threshold() const
@@ -69,10 +79,10 @@ public:
     mReduction = aReduction;
   }
 
-protected:
-  virtual ~DynamicsCompressorNode();
-
 private:
+  explicit DynamicsCompressorNode(AudioContext* aContext);
+  ~DynamicsCompressorNode() = default;
+
   RefPtr<AudioParam> mThreshold;
   RefPtr<AudioParam> mKnee;
   RefPtr<AudioParam> mRatio;
@@ -85,4 +95,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/GainNode.cpp

@@ -128,8 +128,24 @@ GainNode::GainNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-GainNode::~GainNode()
+/* static */ already_AddRefed<GainNode>
+GainNode::Create(AudioContext& aAudioContext,
+                 const GainOptions& aOptions,
+                 ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<GainNode> audioNode = new GainNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->Gain()->SetValue(aOptions.mGain);
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/GainNode.h

@@ -13,15 +13,25 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct GainOptions;
 
 class GainNode final : public AudioNode
 {
 public:
-  explicit GainNode(AudioContext* aContext);
+  static already_AddRefed<GainNode>
+  Create(AudioContext& aAudioContext, const GainOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(GainNode, AudioNode)
 
+  static already_AddRefed<GainNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const GainOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* Gain() const
@@ -37,10 +47,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~GainNode();
-
 private:
+  explicit GainNode(AudioContext* aContext);
+  ~GainNode() = default;
+
   RefPtr<AudioParam> mGain;
 };
 
@@ -48,4 +58,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/IIRFilterNode.cpp

@@ -138,8 +138,8 @@ private:
 };
 
 IIRFilterNode::IIRFilterNode(AudioContext* aContext,
-                             const mozilla::dom::binding_detail::AutoSequence<double>& aFeedforward,
-                             const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback)
+                             const Sequence<double>& aFeedforward,
+                             const Sequence<double>& aFeedback)
   : AudioNode(aContext,
               2,
               ChannelCountMode::Max,
@@ -173,8 +173,46 @@ IIRFilterNode::IIRFilterNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-IIRFilterNode::~IIRFilterNode()
+/* static */ already_AddRefed<IIRFilterNode>
+IIRFilterNode::Create(AudioContext& aAudioContext,
+                 const IIRFilterOptions& aOptions,
+                 ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aOptions.mFeedforward.Length() == 0 || aOptions.mFeedforward.Length() > 20) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  if (aOptions.mFeedback.Length() == 0 || aOptions.mFeedback.Length() > 20) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  bool feedforwardAllZeros = true;
+  for (size_t i = 0; i < aOptions.mFeedforward.Length(); ++i) {
+    if (aOptions.mFeedforward.Elements()[i] != 0.0) {
+      feedforwardAllZeros = false;
+    }
+  }
+
+  if (feedforwardAllZeros || aOptions.mFeedback.Elements()[0] == 0.0) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return nullptr;
+  }
+
+  RefPtr<IIRFilterNode> audioNode =
+    new IIRFilterNode(&aAudioContext, aOptions.mFeedforward, aOptions.mFeedback);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/IIRFilterNode.h

@@ -14,18 +14,25 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct IIRFilterOptions;
 
 class IIRFilterNode final : public AudioNode
 {
 public:
-  explicit IIRFilterNode(AudioContext* aContext,
-                         const mozilla::dom::binding_detail::AutoSequence<double>& aFeedforward,
-                         const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback);
+  static already_AddRefed<IIRFilterNode>
+  Create(AudioContext& aAudioContext, const IIRFilterOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  static already_AddRefed<IIRFilterNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const IIRFilterOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
 
+  JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void GetFrequencyResponse(const Float32Array& aFrequencyHz,
                             const Float32Array& aMagResponse,
@@ -39,16 +46,17 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~IIRFilterNode();
-
 private:
-    nsTArray<double> mFeedback;
-    nsTArray<double> mFeedforward;
+  IIRFilterNode(AudioContext* aContext,
+                const Sequence<double>& aFeedforward,
+                const Sequence<double>& aFeedback);
+  ~IIRFilterNode() = default;
+
+  nsTArray<double> mFeedback;
+  nsTArray<double> mFeedforward;
 };
 
 } // namespace dom
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/MediaBufferDecoder.cpp

@@ -262,6 +262,9 @@ public:
   }
   void operator=(SpeexResamplerState* aResampler)
   {
+    if (mResampler) {
+      speex_resampler_destroy(mResampler);
+    }
     mResampler = aResampler;
   }
 
@@ -400,6 +403,28 @@ MediaDecodeTask::FinishDecode()
   while ((mediaData = mAudioQueue.PopFront())) {
     RefPtr<AudioData> audioData = mediaData->As<AudioData>();
     audioData->EnsureAudioBuffer(); // could lead to a copy :(
+
+    if (audioData->mChannels != channelCount) {
+      if (audioData->mChannels > channelCount) {
+        MOZ_LOG(gMediaDecoderLog,
+                LogLevel::Error,
+                ("MediaDecodeTask: Channel count increased from %u to %u mid-stream; "
+                 "this is fatal, stopping decode", channelCount, audioData->mChannels));
+        ReportFailureOnMainThread(WebAudioDecodeJob::InvalidContent);
+        return;
+      }
+        MOZ_LOG(gMediaDecoderLog,
+                LogLevel::Verbose,
+                ("MediaDecodeTask: Channel count changed from %u to %u mid-stream, reinitializing resampler",
+                 channelCount, audioData->mChannels));
+      channelCount = audioData->mChannels;
+      if (sampleRate != destSampleRate) {
+        resampler = speex_resampler_init(channelCount, sampleRate, destSampleRate,
+                                         SPEEX_RESAMPLER_QUALITY_DEFAULT, nullptr);
+        speex_resampler_skip_zeros(resampler);
+      }
+    }
+
     AudioDataValue* bufferData = static_cast<AudioDataValue*>
       (audioData->mAudioBuffer->Data());
 

dom/media/webaudio/MediaElementAudioSourceNode.cpp

@@ -15,13 +15,29 @@ MediaElementAudioSourceNode::MediaElementAudioSourceNode(AudioContext* aContext)
 }
 
 /* static */ already_AddRefed<MediaElementAudioSourceNode>
-MediaElementAudioSourceNode::Create(AudioContext* aContext,
-                                    DOMMediaStream* aStream, ErrorResult& aRv)
+MediaElementAudioSourceNode::Create(AudioContext& aAudioContext,
+                                    const MediaElementAudioSourceOptions& aOptions,
+                                    ErrorResult& aRv)
 {
-  RefPtr<MediaElementAudioSourceNode> node =
-    new MediaElementAudioSourceNode(aContext);
+  if (aAudioContext.IsOffline()) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
 
-  node->Init(aStream, aRv);
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<MediaElementAudioSourceNode> node =
+    new MediaElementAudioSourceNode(&aAudioContext);
+
+  RefPtr<DOMMediaStream> stream =
+    aOptions.mMediaElement->CaptureAudio(aRv, aAudioContext.Destination()->Stream()->Graph());
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  node->Init(stream, aRv);
   if (aRv.Failed()) {
     return nullptr;
   }

dom/media/webaudio/MediaElementAudioSourceNode.h

@@ -11,11 +11,23 @@
 namespace mozilla {
 namespace dom {
 
+class AudioContext;
+struct MediaElementAudioSourceOptions;
+
 class MediaElementAudioSourceNode final : public MediaStreamAudioSourceNode
 {
 public:
   static already_AddRefed<MediaElementAudioSourceNode>
-  Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv);
+  Create(AudioContext& aAudioContext,
+         const MediaElementAudioSourceOptions& aOptions,
+         ErrorResult& aRv);
+
+  static already_AddRefed<MediaElementAudioSourceNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const MediaElementAudioSourceOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 

dom/media/webaudio/MediaStreamAudioDestinationNode.cpp

@@ -15,7 +15,7 @@
 namespace mozilla {
 namespace dom {
 
-class AudioDestinationTrackSource :
+class AudioDestinationTrackSource final :
   public MediaStreamTrackSource
 {
 public:
@@ -49,7 +49,7 @@ public:
   }
 
 private:
-  virtual ~AudioDestinationTrackSource() {}
+  ~AudioDestinationTrackSource() = default;
 
   RefPtr<MediaStreamAudioDestinationNode> mNode;
 };
@@ -101,8 +101,29 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* a
   mPort = outputStream->AllocateInputPort(mStream, AudioNodeStream::AUDIO_TRACK);
 }
 
-MediaStreamAudioDestinationNode::~MediaStreamAudioDestinationNode()
+/* static */ already_AddRefed<MediaStreamAudioDestinationNode>
+MediaStreamAudioDestinationNode::Create(AudioContext& aAudioContext,
+                                        const AudioNodeOptions& aOptions,
+                                        ErrorResult& aRv)
 {
+  if (aAudioContext.IsOffline()) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<MediaStreamAudioDestinationNode> audioNode =
+    new MediaStreamAudioDestinationNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/MediaStreamAudioDestinationNode.h

@@ -11,14 +11,26 @@
 namespace mozilla {
 namespace dom {
 
+class AudioContext;
+struct AudioNodeOptions;
+
 class MediaStreamAudioDestinationNode final : public AudioNode
 {
 public:
-  explicit MediaStreamAudioDestinationNode(AudioContext* aContext);
+  static already_AddRefed<MediaStreamAudioDestinationNode>
+  Create(AudioContext& aAudioContext, const AudioNodeOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamAudioDestinationNode, AudioNode)
 
+  static already_AddRefed<MediaStreamAudioDestinationNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const AudioNodeOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfOutputs() const final override
@@ -41,10 +53,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~MediaStreamAudioDestinationNode();
-
 private:
+  explicit MediaStreamAudioDestinationNode(AudioContext* aContext);
+  ~MediaStreamAudioDestinationNode() = default;
+
   RefPtr<DOMMediaStream> mDOMStream;
   RefPtr<MediaInputPort> mPort;
 };

dom/media/webaudio/MediaStreamAudioSourceNode.cpp

@@ -44,13 +44,23 @@ MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext)
 }
 
 /* static */ already_AddRefed<MediaStreamAudioSourceNode>
-MediaStreamAudioSourceNode::Create(AudioContext* aContext,
-                                   DOMMediaStream* aStream, ErrorResult& aRv)
+MediaStreamAudioSourceNode::Create(AudioContext& aAudioContext,
+                                   const MediaStreamAudioSourceOptions& aOptions,
+                                   ErrorResult& aRv)
 {
-  RefPtr<MediaStreamAudioSourceNode> node =
-    new MediaStreamAudioSourceNode(aContext);
+  if (aAudioContext.IsOffline()) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
 
-  node->Init(aStream, aRv);
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<MediaStreamAudioSourceNode> node =
+    new MediaStreamAudioSourceNode(&aAudioContext);
+
+  node->Init(aOptions.mMediaStream, aRv);
   if (aRv.Failed()) {
     return nullptr;
   }

dom/media/webaudio/MediaStreamAudioSourceNode.h

@@ -14,6 +14,9 @@ namespace mozilla {
 
 namespace dom {
 
+class AudioContext;
+struct MediaStreamAudioSourceOptions;
+
 class MediaStreamAudioSourceNodeEngine final : public AudioNodeEngine
 {
 public:
@@ -45,11 +48,19 @@ class MediaStreamAudioSourceNode : public AudioNode,
 {
 public:
   static already_AddRefed<MediaStreamAudioSourceNode>
-  Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv);
+  Create(AudioContext& aContext, const MediaStreamAudioSourceOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamAudioSourceNode, AudioNode)
 
+  static already_AddRefed<MediaStreamAudioSourceNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const MediaStreamAudioSourceOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void DestroyMediaStream() override;

dom/media/webaudio/OscillatorNode.cpp

@@ -425,8 +425,35 @@ OscillatorNode::OscillatorNode(AudioContext* aContext)
   mStream->AddMainThreadListener(this);
 }
 
-OscillatorNode::~OscillatorNode()
+/* static */ already_AddRefed<OscillatorNode>
+OscillatorNode::Create(AudioContext& aAudioContext,
+                       const OscillatorOptions& aOptions,
+                       ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<OscillatorNode> audioNode = new OscillatorNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->SetType(aOptions.mType, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->Frequency()->SetValue(aOptions.mFrequency);
+  audioNode->Detune()->SetValue(aOptions.mDetune);
+
+  if (aOptions.mPeriodicWave.WasPassed()) {
+    audioNode->SetPeriodicWave(aOptions.mPeriodicWave.Value());
+  }
+
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/OscillatorNode.h

@@ -15,16 +15,26 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct OscillatorOptions;
 
 class OscillatorNode final : public AudioNode,
                              public MainThreadMediaStreamListener
 {
 public:
-  explicit OscillatorNode(AudioContext* aContext);
+  static already_AddRefed<OscillatorNode>
+  Create(AudioContext& aAudioContext, const OscillatorOptions& aOptions,
+         ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(OscillatorNode, AudioNode)
 
+  static already_AddRefed<OscillatorNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const OscillatorOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
+
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void DestroyMediaStream() override;
@@ -81,14 +91,13 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~OscillatorNode();
-
 private:
+  explicit OscillatorNode(AudioContext* aContext);
+  ~OscillatorNode() = default;
+
   void SendTypeToStream();
   void SendPeriodicWaveToStream();
 
-private:
   OscillatorType mType;
   RefPtr<PeriodicWave> mPeriodicWave;
   RefPtr<AudioParam> mFrequency;
@@ -100,4 +109,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/PannerNode.cpp

@@ -329,6 +329,38 @@ PannerNode::~PannerNode()
   }
 }
 
+/* static */ already_AddRefed<PannerNode>
+PannerNode::Create(AudioContext& aAudioContext,
+                   const PannerOptions& aOptions,
+                   ErrorResult& aRv)
+{
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<PannerNode> audioNode = new PannerNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->SetPanningModel(aOptions.mPanningModel);
+  audioNode->SetDistanceModel(aOptions.mDistanceModel);
+  audioNode->SetPosition(aOptions.mPositionX, aOptions.mPositionY,
+                         aOptions.mPositionZ);
+  audioNode->SetOrientation(aOptions.mOrientationX, aOptions.mOrientationY,
+                            aOptions.mOrientationZ);
+  audioNode->SetRefDistance(aOptions.mRefDistance);
+  audioNode->SetMaxDistance(aOptions.mMaxDistance);
+  audioNode->SetRolloffFactor(aOptions.mRolloffFactor);
+  audioNode->SetConeInnerAngle(aOptions.mConeInnerAngle);
+  audioNode->SetConeOuterAngle(aOptions.mConeOuterAngle);
+  audioNode->SetConeOuterGain(aOptions.mConeOuterGain);
+
+  return audioNode.forget();
+}
+
 void PannerNode::SetPanningModel(PanningModelType aPanningModel)
 {
   mPanningModel = aPanningModel;
@@ -784,4 +816,3 @@ PannerNode::SendDopplerToSourcesIfNeeded()
 
 } // namespace dom
 } // namespace mozilla
-

dom/media/webaudio/PannerNode.h

@@ -19,13 +19,24 @@ namespace dom {
 
 class AudioContext;
 class AudioBufferSourceNode;
+struct PannerOptions;
 
 class PannerNode final : public AudioNode,
                          public SupportsWeakPtr<PannerNode>
 {
 public:
+  static already_AddRefed<PannerNode>
+  Create(AudioContext& aAudioContext, const PannerOptions& aOptions,
+         ErrorResult& aRv);
+
   MOZ_DECLARE_WEAKREFERENCE_TYPENAME(PannerNode)
-  explicit PannerNode(AudioContext* aContext);
+
+  static already_AddRefed<PannerNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const PannerOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
@@ -229,10 +240,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~PannerNode();
-
 private:
+  explicit PannerNode(AudioContext* aContext);
+  ~PannerNode();
+
   friend class AudioListener;
   friend class PannerNodeEngine;
   enum EngineParameters {
@@ -292,4 +303,3 @@ private:
 } // namespace mozilla
 
 #endif
-

dom/media/webaudio/PeriodicWave.cpp

@@ -43,6 +43,32 @@ PeriodicWave::PeriodicWave(AudioContext* aContext,
   mCoefficients->SetData(1, nullptr, free, buffer+aLength);
 }
 
+/* static */ already_AddRefed<PeriodicWave>
+PeriodicWave::Constructor(const GlobalObject& aGlobal,
+                          AudioContext& aAudioContext,
+                          const PeriodicWaveOptions& aOptions,
+                          ErrorResult& aRv)
+{
+  if (!aOptions.mReal.WasPassed() || !aOptions.mImag.WasPassed() ||
+      aOptions.mReal.Value().Length() != aOptions.mImag.Value().Length() ||
+      aOptions.mReal.Value().Length() == 0) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  RefPtr<PeriodicWave> wave =
+    new PeriodicWave(&aAudioContext, aOptions.mReal.Value().Elements(),
+                     aOptions.mImag.Value().Elements(),
+                     aOptions.mReal.Value().Length(),
+                     aOptions.mDisableNormalization,
+                     aRv);
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+
+  return wave.forget();
+}
+
 size_t
 PeriodicWave::SizeOfExcludingThisIfNotShared(MallocSizeOf aMallocSizeOf) const
 {
@@ -70,4 +96,3 @@ PeriodicWave::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 
 } // namespace dom
 } // namespace mozilla
-

dom/media/webaudio/PeriodicWave.h

@@ -16,6 +16,9 @@ namespace mozilla {
 
 namespace dom {
 
+class AudioContext;
+struct PeriodicWaveOptions;
+
 class PeriodicWave final : public nsWrapperCache
 {
 public:
@@ -29,6 +32,10 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PeriodicWave)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(PeriodicWave)
 
+  static already_AddRefed<PeriodicWave>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const PeriodicWaveOptions& aOptions, ErrorResult& aRv);
+
   AudioContext* GetParentObject() const
   {
     return mContext;
@@ -55,7 +62,7 @@ public:
   size_t SizeOfIncludingThisIfNotShared(MallocSizeOf aMallocSizeOf) const;
 
 private:
-  ~PeriodicWave() {}
+  ~PeriodicWave() = default;
 
   RefPtr<AudioContext> mContext;
   RefPtr<ThreadSharedFloatArrayBufferList> mCoefficients;

dom/media/webaudio/StereoPannerNode.cpp

@@ -182,8 +182,24 @@ StereoPannerNode::StereoPannerNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-StereoPannerNode::~StereoPannerNode()
+/* static */ already_AddRefed<StereoPannerNode>
+StereoPannerNode::Create(AudioContext& aAudioContext,
+                         const StereoPannerOptions& aOptions,
+                         ErrorResult& aRv)
 {
+  if (aAudioContext.CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<StereoPannerNode> audioNode = new StereoPannerNode(&aAudioContext);
+
+  audioNode->Initialize(aOptions, aRv);
+  if (NS_WARN_IF(aRv.Failed())) {
+    return nullptr;
+  }
+
+  audioNode->Pan()->SetValue(aOptions.mPan);
+  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/StereoPannerNode.h

@@ -13,12 +13,23 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
+struct StereoPannerOptions;
 
 class StereoPannerNode final : public AudioNode
 {
 public:
+  static already_AddRefed<StereoPannerNode>
+  Create(AudioContext& aAudioContext, const StereoPannerOptions& aOptions,
+         ErrorResult& aRv);
+
   MOZ_DECLARE_REFCOUNTED_TYPENAME(StereoPannerNode)
-  explicit StereoPannerNode(AudioContext* aContext);
+
+  static already_AddRefed<StereoPannerNode>
+  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
+              const StereoPannerOptions& aOptions, ErrorResult& aRv)
+  {
+    return Create(aAudioContext, aOptions, aRv);
+  }
 
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
@@ -55,10 +66,10 @@ public:
   virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-protected:
-  virtual ~StereoPannerNode();
-
 private:
+  explicit StereoPannerNode(AudioContext* aContext);
+  ~StereoPannerNode() = default;
+
   RefPtr<AudioParam> mPan;
 };
 
@@ -66,4 +77,3 @@ private:
 } // namespace mozilla
 
 #endif
-