Force clobber

[NSS] Update NSS to 3.52.9 to pick up fixes.
[DOM] Check whether module load request was already cancelled when a load fails
2023-02-19 17:53:31 +01:00 · 2023-02-19 17:51:26 +01:00 · 2023-02-19 17:51:18 +01:00 · 2023-02-19 17:51:10 +01:00 · 2023-02-02 10:50:47 +01:00 · 2023-01-27 05:01:53 +01:00
7125 changed files with 901937 additions and 418405 deletions
@@ -137,16 +137,10 @@ default:: $(BUILD_BACKEND_FILES)
 endif

 install_manifests := \
-  $(addprefix dist/,branding idl include public private sdk xpi-stage) \
+  $(addprefix dist/,branding bin idl include public private sdk xpi-stage) \
  _tests \
  $(NULL)
-# Skip the dist/bin install manifest when using the hybrid
-# FasterMake/RecursiveMake backend. This is a hack until bug 1241744 moves
-# xpidl handling to FasterMake in that case, mechanically making the dist/bin
-# install manifest non-existent (non-existent manifests being skipped)
-ifeq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-install_manifests += dist/bin
-endif
+
 install_manifest_depends = \
  CLOBBER \
  $(configure_dir)/configure \
@@ -166,45 +160,9 @@ endif
 .PHONY: install-manifests
 install-manifests: $(addprefix install-,$(install_manifests))

-# If we're using the hybrid FasterMake/RecursiveMake backend, we want
-# to recurse in the faster/ directory in parallel of install manifests.
-# But dist/idl needs to happen before (cf. dependencies in
-# config/faster/rules.mk)
-ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-install-manifests: faster
-.PHONY: faster
-faster: install-dist/idl
-	$(MAKE) -C faster FASTER_RECURSIVE_MAKE=1
-endif
-
-.PHONY: tup
-tup:
-	$(call BUILDSTATUS,TIERS make tup)
-	$(call BUILDSTATUS,TIER_START make)
-	$(MAKE) install-manifests buildid.h source-repo.h
-	$(call BUILDSTATUS,TIER_FINISH make)
-	$(call BUILDSTATUS,TIER_START tup)
-	@$(TUP) $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),,--verbose)
-	$(call BUILDSTATUS,TIER_FINISH tup)
-
-# process_install_manifest needs to be invoked with --no-remove when building
-# js as standalone because automated builds are building nspr separately and
-# that would remove the resulting files.
-# Eventually, a standalone js build would just be able to build nspr itself,
-# removing the need for the former.
-ifdef JS_STANDALONE
-NO_REMOVE=1
-endif
-
-.PHONY: $(addprefix install-,$(subst /,_,$(install_manifests)))
+.PHONY: $(addprefix install-,$(install_manifests))
 $(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
-ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS)))
-	@# If we're using the hybrid FasterMake/RecursiveMake backend, we want
-	@# to ensure the FasterMake end doesn't have install manifests for the
-	@# same directory, because that would blow up
-	$(if $(wildcard _build_manifests/install/$(subst /,_,$*)),$(if $(wildcard faster/install_$(subst /,_,$*)*),$(error FasterMake and RecursiveMake ends of the hybrid build system want to handle $*)))
-endif
-	$(addprefix $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))
+	$(addprefix $(call py_action,process_install_manifest,--track install_$(subst /,_,$*).track $*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))

 # Dummy wrapper rule to allow the faster backend to piggy back
 $(addprefix install-,$(subst /,_,$(filter dist/%,$(install_manifests)))): install-dist_%: install-dist/% ;
@@ -217,10 +175,9 @@ install-tests: install-test-files
 .PHONY: run-tests-deps
 run-tests-deps: $(install_manifest_depends)

-# Force --no-remove, because $objdir/_tests is handled by multiple manifests.
 .PHONY: install-test-files
 install-test-files:
-	$(call py_action,process_install_manifest,--no-remove _tests _build_manifests/install/_test_files)
+	$(call py_action,process_install_manifest,--track install__test_files.track _tests _build_manifests/install/_test_files)

 include $(topsrcdir)/build/moz-automation.mk

@@ -240,13 +197,13 @@ ifndef NO_PROFILE_GUIDED_OPTIMIZE
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 recurse_pre-export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
+	@$(MAKE) install-manifests install_manifests=dist/include
 endif
 endif
 else # !MOZ_PROFILE_USE (normal build)
 recurse_pre-export:: install-manifests
 binaries::
-	@$(MAKE) install-manifests NO_REMOVE=1 install_manifests=dist/include
+	@$(MAKE) install-manifests install_manifests=dist/include
 endif

 # For historical reasons that are unknown, $(DIST)/sdk is always blown away
@@ -33,5 +33,7 @@ If you fork this repository to perform your own work on it, please consider offe
 improvement patches upstream to its origin to mutually improve the platform and build
 a future for XUL.

-## Looking for Pale Moon and Basilisk?
-As of [`Issue #969`](https://repo.palemoon.org/MoonchildProductions/UXP/issues/969), release versions `28.9.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://repo.palemoon.org/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://repo.palemoon.org/MoonchildProductions/Basilisk).
+## Looking for Pale Moon?
+As of [`Issue #969`](https://repo.palemoon.org/MoonchildProductions/UXP/issues/969), release version `28.9.0`,
+applications have been split off into their own dedicated (front-end) repositories, with Pale Moon located at
+[`MoonchildProductions/Pale-Moon`](https://repo.palemoon.org/MoonchildProductions/Pale-Moon).
@@ -25,7 +25,6 @@ builtin(include, build/autoconf/zlib.m4)dnl
 builtin(include, build/autoconf/icu.m4)dnl
 builtin(include, build/autoconf/clang-plugin.m4)dnl
 builtin(include, build/autoconf/alloc.m4)dnl
-builtin(include, build/autoconf/ios.m4)dnl
 builtin(include, build/autoconf/sanitize.m4)dnl

 MOZ_PROG_CHECKMSYS()
@@ -1,129 +0,0 @@
-import java.util.regex.Pattern
-
-allprojects {
-    // Expose the per-object-directory configuration to all projects.
-    ext {
-        mozconfig = gradle.mozconfig
-        topsrcdir = gradle.mozconfig.topsrcdir
-        topobjdir = gradle.mozconfig.topobjdir
-    }
-
-    repositories {
-        if (gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY) {
-            maven {
-                url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
-            }
-        }
-    }
-}
-
-buildDir "${topobjdir}/gradle/build"
-
-buildscript {
-    repositories {
-        if (gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY) {
-            maven {
-                url gradle.mozconfig.substs.GRADLE_MAVEN_REPOSITORY
-            }
-        }
-        // For android-sdk-manager SNAPSHOT releases.
-        maven {
-            url "file://${gradle.mozconfig.topsrcdir}/mobile/android/gradle/m2repo"
-        }
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
-        classpath('com.stanfy.spoon:spoon-gradle-plugin:1.0.4') {
-            // Without these, we get errors linting.
-            exclude module: 'guava'
-        }
-        // Provided in tree.
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:1.5.0-SNAPSHOT'
-    }
-}
-
-task generateCodeAndResources(type:Exec) {
-    workingDir "${topobjdir}"
-
-    commandLine mozconfig.substs.GMAKE
-    args '-C'
-    args "${topobjdir}/mobile/android/base"
-    args 'gradle-targets'
-
-    // Only show the output if something went wrong.
-    ignoreExitValue = true
-    standardOutput = new ByteArrayOutputStream()
-    errorOutput = standardOutput
-    doLast {
-        if (execResult.exitValue != 0) {
-            throw new GradleException("Process '${commandLine}' finished with non-zero exit value ${execResult.exitValue}:\n\n${standardOutput.toString()}")
-        }
-    }
-}
-
-// Skip unit test for all build variants, unless if it was specifically requested by user.
-// The enabled property for the unit test tasks is reset based on the command line task names just before the task execution.
-// I bet there is a easier/cleaner way to do this, but this gets the job done for now.
-Pattern pattern = Pattern.compile('.*test(.+UnitTest)?.*')
-boolean startTasksIncludeTest = gradle.startParameter.taskNames.any {
-    taskName ->
-        taskName.matches(pattern)
-}
-gradle.taskGraph.beforeTask {
-    Task task ->
-        if (task.name.matches(pattern)) {
-            task.enabled = startTasksIncludeTest
-        }
-}
-
-afterEvaluate {
-    subprojects {
-        if (!hasProperty('android')) {
-            return
-        }
-        android.applicationVariants.all {
-            preBuild.dependsOn rootProject.generateCodeAndResources
-        }
-        android.libraryVariants.all {
-            preBuild.dependsOn rootProject.generateCodeAndResources
-        }
-    }
-}
-
-apply plugin: 'idea'
-
-idea {
-    project {
-        languageLevel = '1.7'
-    }
-
-    module {
-        // Object directories take a huge amount of time for IntelliJ to index.
-        // Exclude them.  Convention is that object directories start with obj.
-        // IntelliJ is clever and will not exclude the parts of the object
-        // directory that are referenced, if there are any.  In practice,
-        // indexing the entirety of the tree is taking too long, so exclude all
-        // but mobile/.
-        def topsrcdirURI = file(topsrcdir).toURI()
-        excludeDirs += files(file(topsrcdir)
-            .listFiles({it.isDirectory()} as FileFilter)
-            .collect({topsrcdirURI.relativize(it.toURI()).toString()}) // Relative paths.
-            .findAll({!it.equals('mobile/')}))
-
-        // If topobjdir is below topsrcdir, hide only some portions of that tree.
-        def topobjdirURI = file(topobjdir).toURI()
-        if (!topsrcdirURI.relativize(topobjdirURI).isAbsolute()) {
-            excludeDirs -= file(topobjdir)
-            excludeDirs += files(file(topobjdir).listFiles())
-            excludeDirs -= file("${topobjdir}/gradle")
-        }
-
-        if (!mozconfig.substs.MOZ_INSTALL_TRACKING) {
-            excludeDirs += file("${topsrcdir}/mobile/android/thirdparty/com/adjust")
-        }
-    }
-}
-
-task wrapper(type: Wrapper) {
-}
@@ -1,108 +0,0 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-AC_DEFUN([MOZ_IOS_PATH_PROG],
-[
-changequote({,})
-_prog_name=ifelse($2, {}, `echo $1 | tr "[:upper:]" "[:lower:]"`, $2)
-changequote([,])
-AC_CACHE_CHECK([for $_prog_name in iOS SDK],
-ac_cv_ios_path_$1,
-[
-_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
-_res=$?
-if test $_res -ne 0; then
-   AC_MSG_ERROR([Could not find '$_prog_name' in the iOS SDK])
-fi
-ac_cv_ios_path_$1=$_path
-])
-$1="${ac_cv_ios_path_$1}$3"
-])
-
-AC_DEFUN([MOZ_IOS_SDK],
-[
-
-MOZ_ARG_WITH_STRING(ios-sdk,
-[  --with-ios-sdk=TYPE
-                          Type of iOS SDK to use (iphonesimulator, iphoneos)
-                          and optionally version (like iphoneos8.2)],
-    ios_sdk=$withval)
-
-MOZ_ARG_ENABLE_STRING(ios-target,
-                      [  --enable-ios-target=VER (default=8.0)
-                          Set the minimum iOS version needed at runtime],
-                      [_IOS_TARGET=$enableval])
-_IOS_TARGET_DEFAULT=8.0
-
-case "$target" in
-arm*-apple-darwin*)
-    if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then
-       ios_sdk=iphoneos
-    fi
-    case "$ios_sdk" in
-         iphoneos*)
-                ios_target_arg="-miphoneos-version-min"
-                ;;
-         *)
-                AC_MSG_ERROR([Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'.])
-                ;;
-    esac
-    ;;
-*-apple-darwin*)
-    ios_target_arg="-mios-simulator-version-min"
-    case "$ios_sdk" in
-         # Empty SDK is okay, this might be an OS X desktop build.
-         ""|iphonesimulator*)
-                ;;
-         # Default to iphonesimulator
-         yes)
-                ios_sdk=iphonesimulator
-                ;;
-         *)
-                AC_MSG_ERROR([Only 'iphonesimulator' SDKs are valid when targeting iOS simulator.])
-                ;;
-    esac
-    ;;
-esac
-
-
-if test -n "$ios_sdk"; then
-   if test -z "$_IOS_TARGET"; then
-      _IOS_TARGET=$_IOS_TARGET_DEFAULT
-      ios_target_arg="${ios_target_arg}=${_IOS_TARGET}"
-   fi
-   # Ensure that xcrun knows where this SDK is.
-   ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null`
-   _ret=$?
-   if test $_ret -ne 0; then
-      AC_MSG_ERROR([iOS SDK '$ios_sdk' could not be found.])
-   fi
-   MOZ_IOS=1
-   export HOST_CC=clang
-   export HOST_CXX=clang++
-   # Add isysroot, arch, and ios target arguments
-   case "$target_cpu" in
-        arm*)
-                ARGS="-arch armv7"
-                ;;
-        *)
-                # Unfortunately simulator builds need this.
-                export CROSS_COMPILE=1
-                ;;
-   esac
-   ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg"
-   # Now find our tools
-   MOZ_IOS_PATH_PROG(CC, clang, $ARGS)
-   MOZ_IOS_PATH_PROG(CXX, clang++, $ARGS)
-   export CPP="$CC -E"
-   export LD="$CXX"
-   MOZ_IOS_PATH_PROG(AR)
-   MOZ_IOS_PATH_PROG(AS, as, $ARGS)
-   MOZ_IOS_PATH_PROG(OTOOL)
-   MOZ_IOS_PATH_PROG(STRIP)
-   export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/
-fi
-
-AC_SUBST(MOZ_IOS)
-])
@@ -27,6 +27,9 @@ fi
 if test "`echo | $AS -o conftest.out -v 2>&1 | grep -c GNU`" != "0"; then
    GNU_AS=1
 fi
+if test "`echo | $AS -o conftest.out -v 2>&1 | grep -c Apple`" != "0"; then
+    GNU_AS=1
+fi
 rm -f conftest.out
 if test "`echo | $LD -v 2>&1 | grep -c GNU`" != "0"; then
    GNU_LD=1
@@ -1,58 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Imports
-from __future__ import print_function, unicode_literals
-
-import os
-import sys
-
-# Sanity check
-if not len(sys.argv) > 1:
-    print("Incorrect number of arguments")
-    sys.exit(1)
-
-# Vars
-listConfigure = sys.argv[1:]
-listConfig = []
-strBrandingDirectory = ""
-listViolations = []
-
-# Build a list of set configure variables
-for _value in listConfigure:
-    _splitString = _value.split("=")
-
-    if _splitString[1] == "1":
-        listConfig += [ _splitString[0] ]
-    elif _splitString[0] == "MOZ_BRANDING_DIRECTORY":
-        strBrandingDirectory = _splitString[1]
-
-# Only applies if using Official Branding or specific branding directories
-if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("branding/official")) or (strBrandingDirectory.endswith("branding/unstable")):
-    # Applies to Pale Moon and Basilisk
-    if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
-        listViolations += [
-            'MOZ_SYSTEM_JPEG',
-            'MOZ_SYSTEM_ZLIB',
-            'MOZ_SYSTEM_BZ2',
-            'MOZ_SYSTEM_JEMALLOC'
-        ]
-        
-    # Applies to Pale Moon Only
-    if 'MC_PALEMOON' in listConfig:
-        listViolations += [
-            'MOZ_EME',
-            'MOZ_WEBRTC'
-        ]
-    
-    # Iterate through enabled violations and output 1 to DIRECTIVE4 if any are found
-    for _value in listViolations:
-        if _value in listConfig:
-            sys.stdout.write("1")
-            sys.exit(1)
-
-# Exit outputting nothing to DIRECTIVE4 being empty because there are no violations
-sys.exit(0)
-
-
@@ -1,54 +0,0 @@
-.. _build_cppeclipse:
-
-=====================
-Cpp Eclipse Projects
-=====================
-
-For additional information on using Eclipse CDT see
-`the MDN page
-<https://developer.mozilla.org/en-US/docs/Eclipse_CDT>`_.
-
-The build system contains alpha support for generating C++ Eclipse
-project files to aid with development.
-
-Please report bugs to bugzilla and make them depend on bug 973770.
-
-To generate a C++ Eclipse project files, you'll need to have a fully
-built tree::
-
-   mach build
-
-Then, simply generate the Eclipse build backend::
-
-   mach build-backend -b CppEclipse
-
-If all goes well, the path to the generated workspace should be
-printed.
-
-To use the generated Eclipse project files, you'll need to
-have a Eclipse CDT 8.3 (We plan to follow the latest Eclipse release)
-`Eclipse CDT plugin
-<https://www.eclipse.org/cdt/>`_
-installed. You can then import all the projects into Eclipse using
-*File > Import ... > General > Existing Projects into Workspace*
-only- if you have not ran the background indexer.
-
-Updating Project Files
-======================
-
-As you pull and update the source tree, your C++ Eclipse files may
-fall out of sync with the build configuration. The tree should still
-build fine from within Eclipse, but source files may be missing and in
-rare circumstances Eclipse's index may not have the proper build
-configuration.
-
-To account for this, you'll want to periodically regenerate the
-Eclipse project files. You can do this by running ``mach build
-&& mach build-backend -b CppEclipse`` from the
-command line.
-
-Currently, regeneration rewrites the original project files. **If
-you've made any customizations to the projects, they will likely get
-overwritten.** We would like to improve this user experience in the
-future.
-
@@ -28,14 +28,6 @@ Important Concepts
   locales
   rust

-integrated development environment (IDE)
-========================================
-.. toctree::
-   :maxdepth: 1
-
-   cppeclipse
-   visualstudio
-
 mozbuild
 ========

@@ -5,41 +5,44 @@ Supported Configurations
 ========================

 This page attempts to document supported build configurations.
+For more up-to-date information please go to http://developer.palemoon.org/

 Windows
 =======

-We support building on Windows XP and newer operating systems using
-Visual Studio 2010 and newer.
+We support building on Windows 7 and newer operating systems using
+Visual Studio 2015 U3.

-The following are not fully supported by Mozilla (but may work):
+The following are not fully supported (but may work):

-* Building without the latest *MozillaBuild* Windows development
-  environment
+* Building with a *MozillaBuild* Windows development
+  environment not mentioned on the developer documentation site.
 * Building with Mingw or any other non-Visual Studio toolchain.

 OS X
 ====
-
-We support building on OS X 10.6 and newer with the OS X 10.6 SDK.
+(This section needs updating)
+We support building on OS X 10.8 and newer with the OS X 10.8 SDK.

 The tree should build with the following OS X releases and SDK versions:

-* 10.6 Snow Leopard
-* 10.7 Lion
 * 10.8 Mountain Lion
 * 10.9 Mavericks
+* 10.10 Yosemite
+* 10.11 El Capitan
+* 10.12 Sierra
+* 10.13 High Sierra
+* 10.14 Mojave
+* 10.15 Catalina
+* 11 Big Sur (Including Apple ARM SoC)

-The tree requires building with Clang 3.3 and newer. This corresponds to
-version of 4.2 of Apple's Clang that ships with Xcode. This corresponds
-to Xcode 4.6 and newer. Xcode 4.6 only runs on OS X 10.7.4 and newer.
-So, OS X 10.6 users will need to install a non-Apple toolchain. Running
-``mach bootstrap`` should install an appropriate toolchain from Homebrew
-or MacPorts automatically.
+The tree requires building with Apple's Clang 4.2 that ships with Xcode.
+This corresponds to Xcode 4.6 and newer. Xcode 4.6 only runs on OS X 10.7.4
+and newer.

-The tree should build with GCC 4.4 and newer on OS X. However, this
+The tree should build with GCC 7.1 and newer on OS X. However, this
 build configuration isn't as widely used (and differs from what Mozilla
-uses to produce OS X builds), so it's recommended to stick with Clang.
+uses to produce OS X builds).

 Linux
 =====
@@ -47,9 +50,6 @@ Linux
 Linux 2.6 and later kernels are supported.

 Most distributions are supported as long as the proper package
-dependencies are in place. Running ``mach bootstrap`` should install
-packages for popular Linux distributions. ``configure`` will typically
+dependencies are in place. ``configure`` will typically
 detect missing dependencies and inform you how to disable features to
 work around unsatisfied dependencies.
-
-Clang 3.3 or GCC 4.4 is required to build the tree.
@@ -1,100 +0,0 @@
-.. _build_visualstudio:
-
-======================
-Visual Studio Projects
-======================
-
-The build system contains alpha support for generating Visual Studio
-project files to aid with development.
-
-To generate Visual Studio project files, you'll need to have a configured tree::
-
-   mach configure
-
-(If you have built recently, your tree is already configured.)
-
-Then, simply generate the Visual Studio build backend::
-
-   mach build-backend -b VisualStudio
-
-If all goes well, the path to the generated Solution (``.sln``) file should be
-printed. You should be able to open that solution with Visual Studio 2010 or
-newer.
-
-Currently, output is hard-coded to the Visual Studio 2010 format. If you open
-the solution in a newer Visual Studio release, you will be prompted to upgrade
-projects. Simply click through the wizard to do that.
-
-Structure of Solution
-=====================
-
-The Visual Studio solution consists of hundreds of projects spanning thousands
-of files. To help with organization, the solution is divided into the following
-trees/folders:
-
-Build Targets
-   This folder contains common build targets. The *full* project is used to
-   perform a full build. The *binaries* project is used to build just binaries.
-   The *visual-studio* project can be built to regenerate the Visual Studio
-   project files.
-
-   Performing the *clean* action on any of these targets will clean the
-   *entire* build output.
-
-Binaries
-   This folder contains common binaries that can be executed from within
-   Visual Studio. If you are building the Firefox desktop application,
-   the *firefox* project will launch firefox.exe. You probably want one of
-   these set to your startup project.
-
-Libraries
-   This folder contains entries for each static library that is produced as
-   part of the build. These roughly correspond to each directory in the tree
-   containing C/C++. e.g. code from ``dom/base`` will be contained in the
-   ``dom_base`` project.
-
-   These projects don't do anything when built. If you build a project here,
-   the *binaries* build target project is built.
-
-Updating Project Files
-======================
-
-As you pull and update the source tree, your Visual Studio files may fall out
-of sync with the build configuration. The tree should still build fine from
-within Visual Studio. But source files may be missing and IntelliSense may not
-have the proper build configuration.
-
-To account for this, you'll want to periodically regenerate the Visual Studio
-project files. You can do this within Visual Studio by building the
-``Build Targets :: visual-studio`` project or by running
-``mach build-backend -b VisualStudio`` from the command line.
-
-Currently, regeneration rewrites the original project files. **If you've made
-any customizations to the solution or projects, they will likely get
-overwritten.** We would like to improve this user experience in the
-future.
-
-Moving Project Files Around
-===========================
-
-The produced Visual Studio solution and project files should be portable.
-If you want to move them to a non-default directory, they should continue
-to work from wherever they are. If they don't, please file a bug.
-
-Invoking mach through Visual Studio
-===================================
-
-It's possible to build the tree via Visual Studio. There is some light magic
-involved here.
-
-Alongside the Visual Studio project files is a batch script named ``mach.bat``.
-This batch script sets the environment variables present in your *MozillaBuild*
-development environment at the time of Visual Studio project generation
-and invokes *mach* inside an msys shell with the arguments specified to the
-batch script. This script essentially allows you to invoke mach commands
-inside the MozillaBuild environment without having to load MozillaBuild.
-
-While projects currently only utilize the ``mach build`` command, the batch
-script does not limit it's use: any mach command can be invoked. Developers
-may abuse this fact to add custom projects and commands that invoke other
-mach commands.
@@ -16,7 +16,7 @@ if os == 'WINNT':
 flavors = {
    'WINNT': 'win',
    'Linux': 'linux',
-    'Darwin': 'mac' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' else 'ios',
+    'Darwin': 'mac',
    'SunOS': 'solaris',
    'GNU/kFreeBSD': 'freebsd',
    'DragonFly': 'dragonfly',
@@ -100,7 +100,6 @@ MACH_MODULES = [
    'python/mach/mach/commands/settings.py',
    'python/compare-locales/mach_commands.py',
    'python/mozbuild/mozbuild/mach_commands.py',
-    'python/mozbuild/mozbuild/backend/mach_commands.py',
    'python/mozbuild/mozbuild/compilation/codecomplete.py',
    'python/mozbuild/mozbuild/frontend/mach_commands.py',
    'services/common/tests/mach_commands.py',
@@ -97,10 +97,3 @@ if CONFIG['MOZ_VALGRIND']:
        'valgrind/i386-redhat-linux-gnu.sup',
        'valgrind/x86_64-redhat-linux-gnu.sup',
    ]
-
-if CONFIG['MOZ_ARTIFACT_BUILDS']:
-    # Ensure a pre-built interfaces.xpt installed to the objdir by the artifact
-    # code is included by the top-level chrome.manifest.
-    EXTRA_COMPONENTS += [
-        'prebuilt-interfaces.manifest',
-    ]
@@ -321,9 +321,6 @@ def split_triplet(triplet):
    elif os.startswith('darwin'):
        canonical_kernel = 'Darwin'
        canonical_os = 'OSX'
-    elif os.startswith('ios'):
-        canonical_kernel = 'Darwin'
-        canonical_os = 'iOS'
    elif os.startswith('dragonfly'):
        canonical_os = canonical_kernel = 'DragonFly'
    elif os.startswith('freebsd'):
@@ -455,10 +452,6 @@ add_old_configure_arg(host_for_old_configure)
@depends(host, target)
 def target_for_old_configure(host, target):
    target_alias = target.alias
-    # old-configure does plenty of tests against $target and $target_os
-    # and expects darwin for iOS, so make it happy.
-    if target.os == 'iOS':
-        target_alias = target_alias.replace('-ios', '-darwin')
    return '--target=%s' % target_alias

 add_old_configure_arg(target_for_old_configure)
@@ -156,7 +156,9 @@ def old_configure_options(*options):
    '--enable-accessibility',
    '--enable-address-sanitizer',
    '--enable-alsa',
+    '--enable-appcompat-guid',
    '--enable-av1',
+    '--enable-jxl',
    '--enable-b2g-bt',
    '--enable-b2g-camera',
    '--enable-b2g-ril',
@@ -306,7 +308,6 @@ def old_configure_options(*options):
    '--disable-browser-statusbar',
    '--disable-sync',
    '--disable-personas',
-    '--enable-phoenix-extensions',
    
    # Below are configure flags used by Basilisk
    '--disable-webextensions',
@@ -383,57 +383,65 @@ def check_compiler(compiler, language, target):
    )


-@imports(_from='collections', _import='defaultdict')
+@imports(_from='__builtin__', _import='open')
+@imports('json')
+@imports('subprocess')
+@imports('sys')
+def get_vc_paths(topsrcdir):
+    def vswhere(args):
+        encoding = 'mbcs' if sys.platform == 'win32' else 'utf-8'
+        return json.loads(subprocess.check_output([os.path.join(topsrcdir, 'build/win32/vswhere.exe'), '-format', 'json'] + args).decode(encoding, 'replace'))
+
+    # Can't pass -requires with -legacy, so query each separately.
+    # Legacy versions first (VS2015)
+    for install in vswhere(['-legacy', '-version', '[14.0,15.0)']):
+        version = Version(install['installationVersion'])
+        # Skip anything older than VS2015.
+        if version < '14':
+            continue
+        path = install['installationPath']
+
+        yield (Version(install['installationVersion']), {
+            'x64': [os.path.join(path, r'VC\bin\amd64')],
+            # The x64->x86 cross toolchain requires DLLs from the native x64 toolchain.
+            'x86': [os.path.join(path, r'VC\bin\amd64_x86'), os.path.join (path, r'VC\bin\amd64')],
+        })
+    # Then VS2017 and newer.
+    for install in vswhere(['-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64']):
+        path = install['installationPath']
+        tools_version = open(os.path.join(path, r'VC\Auxiliary\Build\Microsoft.VCToolsVersion.default.txt'), 'rb').read().strip()
+        tools_path = os.path.join(path, r'VC\Tools\MSVC', tools_version, r'bin\HostX64')
+        yield (Version(install['installationVersion']), {
+            'x64': [os.path.join(tools_path, 'x64')],
+            # The x64->x86 cross toolchain requires DLLs from the native x64 toolchain.
+            'x86': [os.path.join(tools_path, 'x86'), os.path.join(tools_path, 'x64')],
+        })
+
+
+@depends(host, target, check_build_environment)
@imports(_from='__builtin__', _import='sorted')
-def get_vc_paths(base):
-    vc = defaultdict(lambda: defaultdict(dict))
-    subkey = r'Microsoft\VisualStudio\VC\*\*\*\Compiler'
-    for v, h, t, p in get_registry_values(base + '\\' + subkey):
-        vc[v][h][t] = p
-    if not vc:
-        return
-    version, data = sorted(vc.iteritems(), key=lambda x: Version(x[0]))[-1]
-    return data
-
-
-@depends(host)
+@imports(_from='operator', _import='itemgetter')
@imports('platform')
-def vc_compiler_path(host):
+def vc_compiler_path(host, target, env):
    if host.kernel != 'WINNT':
        return
-    vc_host = {
-        'x86': 'x86',
-        'AMD64': 'x64',
-    }.get(platform.machine())
-    if vc_host is None:
-        return
    vc_target = {
        'x86': 'x86',
        'x86_64': 'x64',
        'arm': 'arm',
-    }.get(host.cpu)
+    }.get(target.cpu)
    if vc_target is None:
        return
-
-    base_key = r'HKEY_LOCAL_MACHINE\SOFTWARE'
-    data = get_vc_paths(base_key)
-    if not data:
-        data = get_vc_paths(base_key + r'\Wow6432Node')
-    if not data:
+    all_versions = sorted(get_vc_paths(env.topsrcdir), key=itemgetter(0))
+    if not all_versions:
        return

-    path = data.get(vc_host, {}).get(vc_target)
-    if not path and vc_host == 'x64':
-        vc_host = 'x86'
-        path = data.get(vc_host, {}).get(vc_target)
-    if not path:
+    # Choose the newest version.
+    data = all_versions[-1][1]
+    paths = data.get(vc_target)
+    if not paths:
        return
-    path = os.path.dirname(path)
-    if vc_host != vc_target:
-        other_path = data.get(vc_host, {}).get(vc_host)
-        if other_path:
-            return (path, os.path.dirname(other_path))
-    return (path,)
+    return paths


@depends(vc_compiler_path)
@@ -261,13 +261,17 @@ def vc_path(c_compiler):
            break
    return result

-
-@depends_win(vc_path)
+@depends_win(vc_path, c_compiler)
@checking('for the Debug Interface Access SDK', lambda x: x or 'not found')
@imports(_from='os.path', _import='isdir')
-def dia_sdk_dir(vc_path):
+def dia_sdk_dir(vc_path, c_compiler):
    if vc_path:
-        path = os.path.join(os.path.dirname(vc_path), 'DIA SDK')
+        if c_compiler.version < '19.10':
+            path = os.path.join(os.path.dirname(vc_path), 'DIA SDK')
+        else:
+            # This would be easier if we had the installationPath that
+            # get_vc_paths works with, since 'DIA SDK' is relative to that.
+             path = os.path.normpath(os.path.join(vc_path, r'..\..\..\..\DIA SDK'))
        if isdir(path):
            return path

@@ -309,29 +313,36 @@ def include_path(vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
 set_config('INCLUDE', include_path)


-@depends_win(target, vc_path, valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_dir)
+@depends_win(target, c_compiler, vc_path, valid_windows_sdk_dir, valid_ucrt_sdk_dir, dia_sdk_dir)
@imports('os')
-def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
+def lib_path(target, c_compiler, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
    if not vc_path:
        return
-    vc_target = {
-        'x86': '',
-        'x86_64': 'amd64',
-        'arm': 'arm',
-    }.get(target.cpu)
-    if vc_target is None:
-        return
-    # As vc_target can be '', and os.path.join will happily use the empty
-    # string, leading to a string ending with a backslash, that Make will
-    # interpret as a "string continues on next line" indicator, use variable
-    # args.
-    vc_target = (vc_target,) if vc_target else ()
    sdk_target = {
        'x86': 'x86',
        'x86_64': 'x64',
        'arm': 'arm',
    }.get(target.cpu)

+    old_target = {
+        'x86': '',
+        'x86_64': 'amd64',
+        'arm': 'arm',
+    }.get(target.cpu)
+    if old_target is None:
+        return
+    # As old_target can be '', and os.path.join will happily use the empty
+    # string, leading to a string ending with a backslash, that Make will
+    # interpret as a "string continues on next line" indicator, use variable
+    # args.
+    old_target = (old_target,) if old_target else ()
+    if c_compiler.version < '19.10':
+        # MSVC2015
+        vc_target = old_target
+    else:
+        # MSVC2017 switched to use the same target naming as the sdk.
+        vc_target = (sdk_target,)
+
    atlmfc_dir = os.path.join(vc_path, 'atlmfc', 'lib', *vc_target)
    if not os.path.isdir(atlmfc_dir):
        die('Cannot find the ATL/MFC libraries in the Visual C++ directory (%s). '
@@ -349,7 +360,9 @@ def lib_path(target, vc_path, windows_sdk_dir, ucrt_sdk_dir, dia_sdk_dir):
        os.path.join(ucrt_sdk_dir.lib, 'ucrt', sdk_target),
    ))
    if dia_sdk_dir:
-        libs.append(os.path.join(dia_sdk_dir, 'lib', *vc_target))
+        # For some reason the DIA SDK still uses the old-style targets
+        # even in a newer MSVC.
+        libs.append(os.path.join(dia_sdk_dir, 'lib', *old_target))
    # Set in the environment for old-configure
    libs = os.pathsep.join(libs)
    os.environ['LIB'] = libs
@@ -287,8 +287,6 @@ public:

  virtual bool AddonHasPermission(const nsAString& aPerm);

-  virtual bool IsOnCSSUnprefixingWhitelist() override { return false; }
-
  virtual bool IsCodebasePrincipal() const { return false; };

  static BasePrincipal* Cast(nsIPrincipal* aPrin) { return static_cast<BasePrincipal*>(aPrin); }
@@ -21,7 +21,7 @@ interface nsIDOMDocument;
 [ptr] native JSPrincipals(JSPrincipals);
 [ptr] native PrincipalArray(nsTArray<nsCOMPtr<nsIPrincipal> >);

-[scriptable, builtinclass, uuid(3da7b133-f1a0-4de9-a2bc-5c49014c1077)]
+[scriptable, builtinclass, uuid(f75f502d-79fd-48be-a079-e5a7b8f80c8b)]
 interface nsIPrincipal : nsISerializable
 {
    /**
@@ -333,15 +333,6 @@ interface nsIPrincipal : nsISerializable
     * Returns true iff this is the system principal.
     */
    [infallible] readonly attribute boolean isSystemPrincipal;
-
-    /**
-     * Returns true if this principal's origin is recognized as being on the
-     * whitelist of sites that can use the CSS Unprefixing Service.
-     *
-     * (This interface provides a trivial implementation, just returning false;
-     * subclasses can implement something more complex as-needed.)
-     */
-    [noscript,notxpcom,nostdcall] bool IsOnCSSUnprefixingWhitelist();
 };

 /**
@@ -35,7 +35,6 @@

 using namespace mozilla;

-static bool gIsWhitelistingTestDomains = false;
 static bool gCodeBasePrincipalSupport = false;

 static bool URIIsImmutable(nsIURI* aURI)
@@ -61,10 +60,6 @@ NS_IMPL_CI_INTERFACE_GETTER(nsPrincipal,
 /* static */ void
 nsPrincipal::InitializeStatics()
 {
-  Preferences::AddBoolVarCache(
-    &gIsWhitelistingTestDomains,
-    "layout.css.unprefixing-service.include-test-domains");
-
  Preferences::AddBoolVarCache(&gCodeBasePrincipalSupport,
                               "signed.applets.codebase_principal_support",
                               false);
@@ -483,196 +478,6 @@ nsPrincipal::Write(nsIObjectOutputStream* aStream)
  return NS_OK;
 }

-// Helper-function to indicate whether the CSS Unprefixing Service
-// whitelist should include dummy domains that are only intended for
-// use in testing. (Controlled by a pref.)
-static inline bool
-IsWhitelistingTestDomains()
-{
-  return gIsWhitelistingTestDomains;
-}
-
-// Checks if the given URI's host is on our "full domain" whitelist
-// (i.e. if it's an exact match against a domain that needs unprefixing)
-static bool
-IsOnFullDomainWhitelist(nsIURI* aURI)
-{
-  nsAutoCString hostStr;
-  nsresult rv = aURI->GetHost(hostStr);
-  NS_ENSURE_SUCCESS(rv, false);
-
-  // NOTE: This static whitelist is expected to be short. If that changes,
-  // we should consider a different representation; e.g. hash-set, prefix tree.
-  static const nsLiteralCString sFullDomainsOnWhitelist[] = {
-    // 0th entry only active when testing:
-    NS_LITERAL_CSTRING("test1.example.org"),
-    NS_LITERAL_CSTRING("map.baidu.com"),
-    NS_LITERAL_CSTRING("3g.163.com"),
-    NS_LITERAL_CSTRING("3glogo.gtimg.com"), // for 3g.163.com
-    NS_LITERAL_CSTRING("info.3g.qq.com"), // for 3g.qq.com
-    NS_LITERAL_CSTRING("3gimg.qq.com"), // for 3g.qq.com
-    NS_LITERAL_CSTRING("img.m.baidu.com"), // for [shucheng|ks].baidu.com
-    NS_LITERAL_CSTRING("m.mogujie.com"),
-    NS_LITERAL_CSTRING("touch.qunar.com"),
-    NS_LITERAL_CSTRING("mjs.sinaimg.cn"), // for sina.cn
-    NS_LITERAL_CSTRING("static.qiyi.com"), // for m.iqiyi.com
-    NS_LITERAL_CSTRING("cdn.kuaidi100.com"), // for m.kuaidi100.com
-    NS_LITERAL_CSTRING("m.pc6.com"),
-    NS_LITERAL_CSTRING("m.haosou.com"),
-    NS_LITERAL_CSTRING("m.mi.com"),
-    NS_LITERAL_CSTRING("wappass.baidu.com"),
-    NS_LITERAL_CSTRING("m.video.baidu.com"),
-    NS_LITERAL_CSTRING("m.video.baidu.com"),
-    NS_LITERAL_CSTRING("imgcache.gtimg.cn"), // for m.v.qq.com
-    NS_LITERAL_CSTRING("s.tabelog.jp"),
-    NS_LITERAL_CSTRING("s.yimg.jp"), // for s.tabelog.jp
-    NS_LITERAL_CSTRING("i.yimg.jp"), // for *.yahoo.co.jp
-    NS_LITERAL_CSTRING("ai.yimg.jp"), // for *.yahoo.co.jp
-    NS_LITERAL_CSTRING("m.finance.yahoo.co.jp"),
-    NS_LITERAL_CSTRING("daily.c.yimg.jp"), // for sp.daily.co.jp
-    NS_LITERAL_CSTRING("stat100.ameba.jp"), // for ameblo.jp
-    NS_LITERAL_CSTRING("user.ameba.jp"), // for ameblo.jp
-    NS_LITERAL_CSTRING("www.goo.ne.jp"),
-    NS_LITERAL_CSTRING("x.gnst.jp"), // for mobile.gnavi.co.jp
-    NS_LITERAL_CSTRING("c.x.gnst.jp"), // for mobile.gnavi.co.jp
-    NS_LITERAL_CSTRING("www.smbc-card.com"),
-    NS_LITERAL_CSTRING("static.card.jp.rakuten-static.com"), // for rakuten-card.co.jp
-    NS_LITERAL_CSTRING("img.travel.rakuten.co.jp"), // for travel.rakuten.co.jp
-    NS_LITERAL_CSTRING("img.mixi.net"), // for mixi.jp
-    NS_LITERAL_CSTRING("girlschannel.net"),
-    NS_LITERAL_CSTRING("www.fancl.co.jp"),
-    NS_LITERAL_CSTRING("s.cosme.net"),
-    NS_LITERAL_CSTRING("www.sapporobeer.jp"),
-    NS_LITERAL_CSTRING("www.mapion.co.jp"),
-    NS_LITERAL_CSTRING("touch.navitime.co.jp"),
-    NS_LITERAL_CSTRING("sp.mbga.jp"),
-    NS_LITERAL_CSTRING("ava-a.sp.mbga.jp"), // for sp.mbga.jp
-    NS_LITERAL_CSTRING("www.ntv.co.jp"),
-    NS_LITERAL_CSTRING("mobile.suntory.co.jp"), // for suntory.jp
-    NS_LITERAL_CSTRING("www.aeonsquare.net"),
-    NS_LITERAL_CSTRING("mw.nikkei.com"),
-    NS_LITERAL_CSTRING("www.nhk.or.jp"),
-    NS_LITERAL_CSTRING("www.tokyo-sports.co.jp"),
-    NS_LITERAL_CSTRING("www.bellemaison.jp"),
-    NS_LITERAL_CSTRING("www.kuronekoyamato.co.jp"),
-    NS_LITERAL_CSTRING("formassist.jp"), // for orico.jp
-    NS_LITERAL_CSTRING("sp.m.reuters.co.jp"),
-    NS_LITERAL_CSTRING("www.atre.co.jp"),
-    NS_LITERAL_CSTRING("www.jtb.co.jp"),
-    NS_LITERAL_CSTRING("www.sharp.co.jp"),
-    NS_LITERAL_CSTRING("www.biccamera.com"),
-    NS_LITERAL_CSTRING("weathernews.jp"),
-    NS_LITERAL_CSTRING("cache.ymail.jp"), // for www.yamada-denkiweb.com
-  };
-  static const size_t sNumFullDomainsOnWhitelist =
-    MOZ_ARRAY_LENGTH(sFullDomainsOnWhitelist);
-
-  // Skip 0th (dummy) entry in whitelist, unless a pref is enabled.
-  const size_t firstWhitelistIdx = IsWhitelistingTestDomains() ? 0 : 1;
-
-  for (size_t i = firstWhitelistIdx; i < sNumFullDomainsOnWhitelist; ++i) {
-    if (hostStr == sFullDomainsOnWhitelist[i]) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Checks if the given URI's host is on our "base domain" whitelist
-// (i.e. if it's a subdomain of some host that we've whitelisted as needing
-// unprefixing for all its subdomains)
-static bool
-IsOnBaseDomainWhitelist(nsIURI* aURI)
-{
-  static const nsLiteralCString sBaseDomainsOnWhitelist[] = {
-    // 0th entry only active when testing:
-    NS_LITERAL_CSTRING("test2.example.org"),
-    NS_LITERAL_CSTRING("tbcdn.cn"), // for m.taobao.com
-    NS_LITERAL_CSTRING("alicdn.com"), // for m.taobao.com
-    NS_LITERAL_CSTRING("dpfile.com"), // for m.dianping.com
-    NS_LITERAL_CSTRING("hao123img.com"), // for hao123.com
-    NS_LITERAL_CSTRING("tabelog.k-img.com"), // for s.tabelog.com
-    NS_LITERAL_CSTRING("tsite.jp"), // for *.tsite.jp
-  };
-  static const size_t sNumBaseDomainsOnWhitelist =
-    MOZ_ARRAY_LENGTH(sBaseDomainsOnWhitelist);
-
-  nsCOMPtr<nsIEffectiveTLDService> tldService =
-    do_GetService(NS_EFFECTIVETLDSERVICE_CONTRACTID);
-
-  if (tldService) {
-    // Skip 0th test-entry in whitelist, unless the testing pref is enabled.
-    const size_t firstWhitelistIdx = IsWhitelistingTestDomains() ? 0 : 1;
-
-    // Right now, the test base-domain "test2.example.org" is the only entry in
-    // its whitelist with a nonzero "depth". So we'll only bother going beyond
-    // 0 depth (to 1) if that entry is enabled. (No point in slowing down the
-    // normal codepath, for the benefit of a disabled test domain.)  If we add a
-    // "real" base-domain with a depth of >= 1 to our whitelist, we can get rid
-    // of this conditional & just make this a static variable.
-    const uint32_t maxSubdomainDepth = IsWhitelistingTestDomains() ? 1 : 0;
-
-    for (uint32_t subdomainDepth = 0;
-         subdomainDepth <= maxSubdomainDepth; ++subdomainDepth) {
-
-      // Get the base domain (to depth |subdomainDepth|) from passed-in URI:
-      nsAutoCString baseDomainStr;
-      nsresult rv = tldService->GetBaseDomain(aURI, subdomainDepth,
-                                              baseDomainStr);
-      if (NS_FAILED(rv)) {
-        // aURI doesn't have |subdomainDepth| levels of subdomains. If we got
-        // here without a match yet, then aURI is not on our whitelist.
-        return false;
-      }
-
-      // Compare the base domain against each entry in our whitelist:
-      for (size_t i = firstWhitelistIdx; i < sNumBaseDomainsOnWhitelist; ++i) {
-        if (baseDomainStr == sBaseDomainsOnWhitelist[i]) {
-          return true;
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-// The actual (non-cached) implementation of IsOnCSSUnprefixingWhitelist():
-static bool
-IsOnCSSUnprefixingWhitelistImpl(nsIURI* aURI)
-{
-  // Check scheme, so we can drop any non-HTTP/HTTPS URIs right away
-  nsAutoCString schemeStr;
-  nsresult rv = aURI->GetScheme(schemeStr);
-  NS_ENSURE_SUCCESS(rv, false);
-
-  // Only proceed if scheme is "http" or "https"
-  if (!(StringBeginsWith(schemeStr, NS_LITERAL_CSTRING("http")) &&
-        (schemeStr.Length() == 4 ||
-         (schemeStr.Length() == 5 && schemeStr[4] == 's')))) {
-    return false;
-  }
-
-  return (IsOnFullDomainWhitelist(aURI) ||
-          IsOnBaseDomainWhitelist(aURI));
-}
-
-
-bool
-nsPrincipal::IsOnCSSUnprefixingWhitelist()
-{
-  if (mIsOnCSSUnprefixingWhitelist.isNothing()) {
-    // Value not cached -- perform our lazy whitelist-check.
-    // (NOTE: If our URI is mutable, we just assume it's not on the whitelist,
-    // since our caching strategy won't work. This isn't expected to be common.)
-    mIsOnCSSUnprefixingWhitelist.emplace(
-      mCodebaseImmutable &&
-      IsOnCSSUnprefixingWhitelistImpl(mCodebase));
-  }
-
-  return *mIsOnCSSUnprefixingWhitelist;
-}
-
 /************************************************************************************************************************/

 NS_IMPL_CLASSINFO(nsExpandedPrincipal, nullptr, nsIClassInfo::MAIN_THREAD_ONLY,
@@ -837,15 +642,6 @@ nsExpandedPrincipal::AddonHasPermission(const nsAString& aPerm)
  return false;
 }

-bool
-nsExpandedPrincipal::IsOnCSSUnprefixingWhitelist()
-{
-  // CSS Unprefixing Whitelist is a per-origin thing; doesn't really make sense
-  // for an expanded principal. (And probably shouldn't be needed.)
-  return false;
-}
-
-
 nsresult
 nsExpandedPrincipal::GetScriptLocation(nsACString& aStr)
 {
@@ -25,7 +25,6 @@ public:
  NS_IMETHOD GetDomain(nsIURI** aDomain) override;
  NS_IMETHOD SetDomain(nsIURI* aDomain) override;
  NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
-  virtual bool IsOnCSSUnprefixingWhitelist() override;
  bool IsCodebasePrincipal() const override { return true; }
  nsresult GetOriginInternal(nsACString& aOrigin) override;

@@ -55,7 +54,6 @@ public:
  bool mCodebaseImmutable;
  bool mDomainImmutable;
  bool mInitialized;
-  mozilla::Maybe<bool> mIsOnCSSUnprefixingWhitelist; // Lazily-computed

 protected:
  virtual ~nsPrincipal();
@@ -81,7 +79,6 @@ public:
  NS_IMETHOD SetDomain(nsIURI* aDomain) override;
  NS_IMETHOD GetBaseDomain(nsACString& aBaseDomain) override;
  virtual bool AddonHasPermission(const nsAString& aPerm) override;
-  virtual bool IsOnCSSUnprefixingWhitelist() override;
  virtual nsresult GetScriptLocation(nsACString &aStr) override;
  nsresult GetOriginInternal(nsACString& aOrigin) override;

@@ -58,7 +58,6 @@ const URLs = new Map([
    ["data:text/html,Hi", true, false, true],
    ["view-source:data:text/html,Hi", false, false, true],
    ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
    ["about:test-chrome-privs", false, false, true],
    ["about:test-unknown-unlinkable", false, false, true],
    ["about:test-content-unlinkable", false, false, true],
@@ -80,7 +79,6 @@ const URLs = new Map([
    ["data:text/html,Hi", true, false, true],
    ["view-source:data:text/html,Hi", false, false, true],
    ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
    ["about:test-chrome-privs", false, false, true],
    ["about:test-unknown-unlinkable", false, false, true],
    ["about:test-content-unlinkable", false, false, true],
@@ -102,7 +100,6 @@ const URLs = new Map([
    ["data:text/html,Hi", true, false, true],
    ["view-source:data:text/html,Hi", true, false, true],
    ["javascript:alert('hi')", true, false, true],
-    ["moz://a", false, false, true],
    ["about:test-chrome-privs", false, false, true],
    ["about:test-unknown-unlinkable", false, false, true],
    ["about:test-content-unlinkable", false, false, true],
@@ -45,7 +45,7 @@ endif # WINNT
 ifndef INCLUDED_AUTOCONF_MK
 default::
 else
-TIERS := $(if $(MOZ_ARTIFACT_BUILDS),artifact )pre-export export $(if $(COMPILE_ENVIRONMENT),compile )misc libs tools
+TIERS := pre-export export $(if $(COMPILE_ENVIRONMENT),compile )misc libs tools
 endif

 # These defines are used to support the twin-topsrcdir model for comm-central.
@@ -86,12 +86,14 @@ included_inclnames_to_ignore = set([
    'unicode/ucol.h',           # ICU
    'unicode/udat.h',           # ICU
    'unicode/udatpg.h',         # ICU
+    'unicode/udisplaycontext.h',# ICU
    'unicode/uenum.h',          # ICU
    'unicode/uniset.h',         # ICU
-    'unicode/unorm.h',          # ICU
+    'unicode/unorm2.h',         # ICU
    'unicode/unum.h',           # ICU
    'unicode/unumsys.h',        # ICU
    'unicode/upluralrules.h',   # ICU
+    'unicode/ureldatefmt.h',    # ICU
    'unicode/ustring.h',        # ICU
    'unicode/utypes.h',         # ICU
    'vtune/VTuneWrapper.h'      # VTune
@@ -377,8 +377,20 @@ endif # WINNT

 ifdef _MSC_VER
 ifeq ($(CPU_ARCH),x86_64)
-# set stack to 2MB on x64 build.  See bug 582910
-WIN32_EXE_LDFLAGS	+= -STACK:2097152
+# Normal operation on 64-bit Windows needs 2 MB of stack. (Bug 582910)
+# ASAN requires 6 MB of stack.
+# Setting the stack to 8 MB to match the capability of other systems
+# to deal with frame construction for unreasonably deep DOM trees
+# with worst-case styling. This uses address space unnecessarily for
+# non-main threads, but that should be tolerable on 64-bit systems.
+WIN32_EXE_LDFLAGS      += -STACK:8388608
+else
+# Since this setting affects the default stack size for non-main
+# threads, too, to avoid burning the address space, increase only
+# 512 KB over the default. Just enough to be able to deal with
+# reasonable styling applied to DOM trees whose depth is near what
+# Blink's HTML parser can output.
+WIN32_EXE_LDFLAGS      += -STACK:1572864
 endif
 endif

@@ -45,6 +45,7 @@ SECTION_INSERT_BEFORE = [
  ('.text', '.fini'),
  ('.rodata', '.rodata1'),
  ('.data.rel.ro', '.dynamic'),
+  ('.kPStaticModules', '.data.rel.ro'),
  ('.data', '.data1'),
 ]

@@ -121,6 +121,8 @@ else:
            DEFINES['SYMBOL_UNDERSCORE'] = True
        else:
            ffi_srcs = ('ffi.c', 'darwin.S', 'ffi64.c', 'darwin64.S')
+    elif CONFIG['FFI_TARGET'] == 'AARCH64_DARWIN':
+        ffi_srcs = ('sysv.S', 'ffi.c')

    SOURCES += [
        '/js/src/ctypes/libffi/src/%s/%s' % (CONFIG['FFI_TARGET_DIR'], s)
@@ -4,26 +4,28 @@ SOURCES += [
   '/intl/icu/source/common/bmpset.cpp',
   '/intl/icu/source/common/brkeng.cpp',
   '/intl/icu/source/common/brkiter.cpp',
+   '/intl/icu/source/common/bytesinkutil.cpp',
   '/intl/icu/source/common/bytestream.cpp',
   '/intl/icu/source/common/bytestrie.cpp',
   '/intl/icu/source/common/bytestriebuilder.cpp',
   '/intl/icu/source/common/bytestrieiterator.cpp',
   '/intl/icu/source/common/caniter.cpp',
+   '/intl/icu/source/common/characterproperties.cpp',
   '/intl/icu/source/common/chariter.cpp',
   '/intl/icu/source/common/charstr.cpp',
-   '/intl/icu/source/common/cmemory.c',
+   '/intl/icu/source/common/cmemory.cpp',
   '/intl/icu/source/common/cstr.cpp',
-   '/intl/icu/source/common/cstring.c',
-   '/intl/icu/source/common/cwchar.c',
+   '/intl/icu/source/common/cstring.cpp',
+   '/intl/icu/source/common/cwchar.cpp',
   '/intl/icu/source/common/dictbe.cpp',
   '/intl/icu/source/common/dictionarydata.cpp',
   '/intl/icu/source/common/dtintrv.cpp',
+   '/intl/icu/source/common/edits.cpp',
   '/intl/icu/source/common/errorcode.cpp',
   '/intl/icu/source/common/filteredbrk.cpp',
   '/intl/icu/source/common/filterednormalizer2.cpp',
-   '/intl/icu/source/common/icudataver.c',
+   '/intl/icu/source/common/icudataver.cpp',
   '/intl/icu/source/common/icuplug.cpp',
-   '/intl/icu/source/common/listformatter.cpp',
   '/intl/icu/source/common/loadednormalizer2impl.cpp',
   '/intl/icu/source/common/locavailable.cpp',
   '/intl/icu/source/common/locbased.cpp',
@@ -31,7 +33,7 @@ SOURCES += [
   '/intl/icu/source/common/locdspnm.cpp',
   '/intl/icu/source/common/locid.cpp',
   '/intl/icu/source/common/loclikely.cpp',
-   '/intl/icu/source/common/locmap.c',
+   '/intl/icu/source/common/locmap.cpp',
   '/intl/icu/source/common/locresdata.cpp',
   '/intl/icu/source/common/locutil.cpp',
   '/intl/icu/source/common/messagepattern.cpp',
@@ -42,10 +44,11 @@ SOURCES += [
   '/intl/icu/source/common/patternprops.cpp',
   '/intl/icu/source/common/pluralmap.cpp',
   '/intl/icu/source/common/propname.cpp',
-   '/intl/icu/source/common/propsvec.c',
+   '/intl/icu/source/common/propsvec.cpp',
   '/intl/icu/source/common/punycode.cpp',
   '/intl/icu/source/common/putil.cpp',
   '/intl/icu/source/common/rbbi.cpp',
+   '/intl/icu/source/common/rbbi_cache.cpp',
   '/intl/icu/source/common/rbbidata.cpp',
   '/intl/icu/source/common/rbbinode.cpp',
   '/intl/icu/source/common/rbbirb.cpp',
@@ -67,68 +70,70 @@ SOURCES += [
   '/intl/icu/source/common/servslkf.cpp',
   '/intl/icu/source/common/sharedobject.cpp',
   '/intl/icu/source/common/simpleformatter.cpp',
+   '/intl/icu/source/common/static_unicode_sets.cpp',
   '/intl/icu/source/common/stringpiece.cpp',
   '/intl/icu/source/common/stringtriebuilder.cpp',
-   '/intl/icu/source/common/uarrsort.c',
-   '/intl/icu/source/common/ubidi.c',
-   '/intl/icu/source/common/ubidi_props.c',
-   '/intl/icu/source/common/ubidiln.c',
-   '/intl/icu/source/common/ubiditransform.c',
-   '/intl/icu/source/common/ubidiwrt.c',
+   '/intl/icu/source/common/uarrsort.cpp',
+   '/intl/icu/source/common/ubidi.cpp',
+   '/intl/icu/source/common/ubidi_props.cpp',
+   '/intl/icu/source/common/ubidiln.cpp',
+   '/intl/icu/source/common/ubiditransform.cpp',
+   '/intl/icu/source/common/ubidiwrt.cpp',
   '/intl/icu/source/common/ubrk.cpp',
   '/intl/icu/source/common/ucase.cpp',
   '/intl/icu/source/common/ucasemap.cpp',
   '/intl/icu/source/common/ucasemap_titlecase_brkiter.cpp',
-   '/intl/icu/source/common/ucat.c',
-   '/intl/icu/source/common/uchar.c',
+   '/intl/icu/source/common/ucat.cpp',
+   '/intl/icu/source/common/uchar.cpp',
   '/intl/icu/source/common/ucharstrie.cpp',
   '/intl/icu/source/common/ucharstriebuilder.cpp',
   '/intl/icu/source/common/ucharstrieiterator.cpp',
   '/intl/icu/source/common/uchriter.cpp',
   '/intl/icu/source/common/ucln_cmn.cpp',
-   '/intl/icu/source/common/ucmndata.c',
-   '/intl/icu/source/common/ucnv.c',
+   '/intl/icu/source/common/ucmndata.cpp',
+   '/intl/icu/source/common/ucnv.cpp',
   '/intl/icu/source/common/ucnv2022.cpp',
   '/intl/icu/source/common/ucnv_bld.cpp',
-   '/intl/icu/source/common/ucnv_cb.c',
-   '/intl/icu/source/common/ucnv_cnv.c',
-   '/intl/icu/source/common/ucnv_ct.c',
-   '/intl/icu/source/common/ucnv_err.c',
+   '/intl/icu/source/common/ucnv_cb.cpp',
+   '/intl/icu/source/common/ucnv_cnv.cpp',
+   '/intl/icu/source/common/ucnv_ct.cpp',
+   '/intl/icu/source/common/ucnv_err.cpp',
   '/intl/icu/source/common/ucnv_ext.cpp',
   '/intl/icu/source/common/ucnv_io.cpp',
-   '/intl/icu/source/common/ucnv_lmb.c',
-   '/intl/icu/source/common/ucnv_set.c',
-   '/intl/icu/source/common/ucnv_u16.c',
-   '/intl/icu/source/common/ucnv_u32.c',
-   '/intl/icu/source/common/ucnv_u7.c',
-   '/intl/icu/source/common/ucnv_u8.c',
+   '/intl/icu/source/common/ucnv_lmb.cpp',
+   '/intl/icu/source/common/ucnv_set.cpp',
+   '/intl/icu/source/common/ucnv_u16.cpp',
+   '/intl/icu/source/common/ucnv_u32.cpp',
+   '/intl/icu/source/common/ucnv_u7.cpp',
+   '/intl/icu/source/common/ucnv_u8.cpp',
   '/intl/icu/source/common/ucnvbocu.cpp',
-   '/intl/icu/source/common/ucnvdisp.c',
-   '/intl/icu/source/common/ucnvhz.c',
-   '/intl/icu/source/common/ucnvisci.c',
-   '/intl/icu/source/common/ucnvlat1.c',
+   '/intl/icu/source/common/ucnvdisp.cpp',
+   '/intl/icu/source/common/ucnvhz.cpp',
+   '/intl/icu/source/common/ucnvisci.cpp',
+   '/intl/icu/source/common/ucnvlat1.cpp',
   '/intl/icu/source/common/ucnvmbcs.cpp',
-   '/intl/icu/source/common/ucnvscsu.c',
+   '/intl/icu/source/common/ucnvscsu.cpp',
   '/intl/icu/source/common/ucnvsel.cpp',
   '/intl/icu/source/common/ucol_swp.cpp',
+   '/intl/icu/source/common/ucptrie.cpp',
   '/intl/icu/source/common/ucurr.cpp',
   '/intl/icu/source/common/udata.cpp',
-   '/intl/icu/source/common/udatamem.c',
-   '/intl/icu/source/common/udataswp.c',
-   '/intl/icu/source/common/uenum.c',
-   '/intl/icu/source/common/uhash.c',
+   '/intl/icu/source/common/udatamem.cpp',
+   '/intl/icu/source/common/udataswp.cpp',
+   '/intl/icu/source/common/uenum.cpp',
+   '/intl/icu/source/common/uhash.cpp',
   '/intl/icu/source/common/uhash_us.cpp',
   '/intl/icu/source/common/uidna.cpp',
   '/intl/icu/source/common/uinit.cpp',
-   '/intl/icu/source/common/uinvchar.c',
+   '/intl/icu/source/common/uinvchar.cpp',
   '/intl/icu/source/common/uiter.cpp',
-   '/intl/icu/source/common/ulist.c',
-   '/intl/icu/source/common/ulistformatter.cpp',
+   '/intl/icu/source/common/ulist.cpp',
   '/intl/icu/source/common/uloc.cpp',
   '/intl/icu/source/common/uloc_keytype.cpp',
-   '/intl/icu/source/common/uloc_tag.c',
-   '/intl/icu/source/common/umapfile.c',
-   '/intl/icu/source/common/umath.c',
+   '/intl/icu/source/common/uloc_tag.cpp',
+   '/intl/icu/source/common/umapfile.cpp',
+   '/intl/icu/source/common/umath.cpp',
+   '/intl/icu/source/common/umutablecptrie.cpp',
   '/intl/icu/source/common/umutex.cpp',
   '/intl/icu/source/common/unames.cpp',
   '/intl/icu/source/common/unifiedcache.cpp',
@@ -148,11 +153,11 @@ SOURCES += [
   '/intl/icu/source/common/unormcmp.cpp',
   '/intl/icu/source/common/uobject.cpp',
   '/intl/icu/source/common/uprops.cpp',
-   '/intl/icu/source/common/ures_cnv.c',
+   '/intl/icu/source/common/ures_cnv.cpp',
   '/intl/icu/source/common/uresbund.cpp',
   '/intl/icu/source/common/uresdata.cpp',
-   '/intl/icu/source/common/usc_impl.c',
-   '/intl/icu/source/common/uscript.c',
+   '/intl/icu/source/common/usc_impl.cpp',
+   '/intl/icu/source/common/uscript.cpp',
   '/intl/icu/source/common/uscript_props.cpp',
   '/intl/icu/source/common/uset.cpp',
   '/intl/icu/source/common/uset_props.cpp',
@@ -166,23 +171,24 @@ SOURCES += [
   '/intl/icu/source/common/ustrcase.cpp',
   '/intl/icu/source/common/ustrcase_locale.cpp',
   '/intl/icu/source/common/ustrenum.cpp',
-   '/intl/icu/source/common/ustrfmt.c',
+   '/intl/icu/source/common/ustrfmt.cpp',
   '/intl/icu/source/common/ustring.cpp',
   '/intl/icu/source/common/ustrtrns.cpp',
   '/intl/icu/source/common/utext.cpp',
-   '/intl/icu/source/common/utf_impl.c',
+   '/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.c',
+   '/intl/icu/source/common/utrace.cpp',
   '/intl/icu/source/common/utrie.cpp',
   '/intl/icu/source/common/utrie2.cpp',
   '/intl/icu/source/common/utrie2_builder.cpp',
+   '/intl/icu/source/common/utrie_swap.cpp',
   '/intl/icu/source/common/uts46.cpp',
-   '/intl/icu/source/common/utypes.c',
+   '/intl/icu/source/common/utypes.cpp',
   '/intl/icu/source/common/uvector.cpp',
   '/intl/icu/source/common/uvectr32.cpp',
   '/intl/icu/source/common/uvectr64.cpp',
-   '/intl/icu/source/common/wintz.c',
+   '/intl/icu/source/common/wintz.cpp',
 ]

 EXPORTS.unicode += [
@@ -192,17 +198,19 @@ EXPORTS.unicode += [
   '/intl/icu/source/common/unicode/bytestrie.h',
   '/intl/icu/source/common/unicode/bytestriebuilder.h',
   '/intl/icu/source/common/unicode/caniter.h',
+   '/intl/icu/source/common/unicode/casemap.h',
+   '/intl/icu/source/common/unicode/char16ptr.h',
   '/intl/icu/source/common/unicode/chariter.h',
   '/intl/icu/source/common/unicode/dbbi.h',
   '/intl/icu/source/common/unicode/docmain.h',
   '/intl/icu/source/common/unicode/dtintrv.h',
+   '/intl/icu/source/common/unicode/edits.h',
   '/intl/icu/source/common/unicode/enumset.h',
   '/intl/icu/source/common/unicode/errorcode.h',
   '/intl/icu/source/common/unicode/filteredbrk.h',
   '/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/listformatter.h',
   '/intl/icu/source/common/unicode/localpointer.h',
   '/intl/icu/source/common/unicode/locdspnm.h',
   '/intl/icu/source/common/unicode/locid.h',
@@ -221,6 +229,7 @@ EXPORTS.unicode += [
   '/intl/icu/source/common/unicode/simpleformatter.h',
   '/intl/icu/source/common/unicode/std_string.h',
   '/intl/icu/source/common/unicode/strenum.h',
+   '/intl/icu/source/common/unicode/stringoptions.h',
   '/intl/icu/source/common/unicode/stringpiece.h',
   '/intl/icu/source/common/unicode/stringtriebuilder.h',
   '/intl/icu/source/common/unicode/symtable.h',
@@ -239,6 +248,8 @@ EXPORTS.unicode += [
   '/intl/icu/source/common/unicode/ucnv_err.h',
   '/intl/icu/source/common/unicode/ucnvsel.h',
   '/intl/icu/source/common/unicode/uconfig.h',
+   '/intl/icu/source/common/unicode/ucpmap.h',
+   '/intl/icu/source/common/unicode/ucptrie.h',
   '/intl/icu/source/common/unicode/ucurr.h',
   '/intl/icu/source/common/unicode/udata.h',
   '/intl/icu/source/common/unicode/udisplaycontext.h',
@@ -246,10 +257,10 @@ EXPORTS.unicode += [
   '/intl/icu/source/common/unicode/uidna.h',
   '/intl/icu/source/common/unicode/uiter.h',
   '/intl/icu/source/common/unicode/uldnames.h',
-   '/intl/icu/source/common/unicode/ulistformatter.h',
   '/intl/icu/source/common/unicode/uloc.h',
   '/intl/icu/source/common/unicode/umachine.h',
   '/intl/icu/source/common/unicode/umisc.h',
+   '/intl/icu/source/common/unicode/umutablecptrie.h',
   '/intl/icu/source/common/unicode/unifilt.h',
   '/intl/icu/source/common/unicode/unifunct.h',
   '/intl/icu/source/common/unicode/unimatch.h',
@@ -14,7 +14,6 @@ DEFINES.update(
    UCONFIG_NO_LEGACY_CONVERSION = True,
    UCONFIG_NO_TRANSLITERATION = True,
    UCONFIG_NO_REGULAR_EXPRESSIONS = True,
-    UCONFIG_NO_BREAK_ITERATION = True,

    # We don't need to pass data to and from legacy char* APIs.
    U_CHARSET_IS_UTF8 = True,
@@ -1,6 +1,5 @@
 # THIS FILE IS GENERATED BY /intl/icu_sources_data.py DO NOT EDIT
 SOURCES += [
-   '/intl/icu/source/i18n/affixpatternparser.cpp',
   '/intl/icu/source/i18n/alphaindex.cpp',
   '/intl/icu/source/i18n/anytrans.cpp',
   '/intl/icu/source/i18n/astro.cpp',
@@ -53,23 +52,22 @@ SOURCES += [
   '/intl/icu/source/i18n/datefmt.cpp',
   '/intl/icu/source/i18n/dayperiodrules.cpp',
   '/intl/icu/source/i18n/dcfmtsym.cpp',
-   '/intl/icu/source/i18n/decContext.c',
-   '/intl/icu/source/i18n/decfmtst.cpp',
-   '/intl/icu/source/i18n/decimalformatpattern.cpp',
+   '/intl/icu/source/i18n/decContext.cpp',
   '/intl/icu/source/i18n/decimfmt.cpp',
-   '/intl/icu/source/i18n/decimfmtimpl.cpp',
-   '/intl/icu/source/i18n/decNumber.c',
-   '/intl/icu/source/i18n/digitaffix.cpp',
-   '/intl/icu/source/i18n/digitaffixesandpadding.cpp',
-   '/intl/icu/source/i18n/digitformatter.cpp',
-   '/intl/icu/source/i18n/digitgrouping.cpp',
-   '/intl/icu/source/i18n/digitinterval.cpp',
-   '/intl/icu/source/i18n/digitlst.cpp',
+   '/intl/icu/source/i18n/decNumber.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-fast-dtoa.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',
   '/intl/icu/source/i18n/dtptngen.cpp',
   '/intl/icu/source/i18n/dtrule.cpp',
+   '/intl/icu/source/i18n/erarules.cpp',
   '/intl/icu/source/i18n/esctrn.cpp',
   '/intl/icu/source/i18n/ethpccal.cpp',
   '/intl/icu/source/i18n/fmtable.cpp',
@@ -86,6 +84,7 @@ SOURCES += [
   '/intl/icu/source/i18n/inputext.cpp',
   '/intl/icu/source/i18n/islamcal.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/measure.cpp',
@@ -95,15 +94,50 @@ SOURCES += [
   '/intl/icu/source/i18n/nfrule.cpp',
   '/intl/icu/source/i18n/nfsubs.cpp',
   '/intl/icu/source/i18n/nortrans.cpp',
+   '/intl/icu/source/i18n/nounit.cpp',
   '/intl/icu/source/i18n/nultrans.cpp',
+   '/intl/icu/source/i18n/number_affixutils.cpp',
+   '/intl/icu/source/i18n/number_asformat.cpp',
+   '/intl/icu/source/i18n/number_capi.cpp',
+   '/intl/icu/source/i18n/number_compact.cpp',
+   '/intl/icu/source/i18n/number_currencysymbols.cpp',
+   '/intl/icu/source/i18n/number_decimalquantity.cpp',
+   '/intl/icu/source/i18n/number_decimfmtprops.cpp',
+   '/intl/icu/source/i18n/number_fluent.cpp',
+   '/intl/icu/source/i18n/number_formatimpl.cpp',
+   '/intl/icu/source/i18n/number_grouping.cpp',
+   '/intl/icu/source/i18n/number_integerwidth.cpp',
+   '/intl/icu/source/i18n/number_longnames.cpp',
+   '/intl/icu/source/i18n/number_mapper.cpp',
+   '/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_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_skeletons.cpp',
+   '/intl/icu/source/i18n/number_stringbuilder.cpp',
+   '/intl/icu/source/i18n/number_utils.cpp',
   '/intl/icu/source/i18n/numfmt.cpp',
+   '/intl/icu/source/i18n/numparse_affixes.cpp',
+   '/intl/icu/source/i18n/numparse_compositions.cpp',
+   '/intl/icu/source/i18n/numparse_currency.cpp',
+   '/intl/icu/source/i18n/numparse_decimal.cpp',
+   '/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_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/pluralaffix.cpp',
   '/intl/icu/source/i18n/plurfmt.cpp',
   '/intl/icu/source/i18n/plurrule.cpp',
-   '/intl/icu/source/i18n/precision.cpp',
   '/intl/icu/source/i18n/quant.cpp',
   '/intl/icu/source/i18n/quantityformatter.cpp',
   '/intl/icu/source/i18n/rbnf.cpp',
@@ -130,7 +164,6 @@ SOURCES += [
   '/intl/icu/source/i18n/selfmt.cpp',
   '/intl/icu/source/i18n/sharedbreakiterator.cpp',
   '/intl/icu/source/i18n/simpletz.cpp',
-   '/intl/icu/source/i18n/smallintformatter.cpp',
   '/intl/icu/source/i18n/smpdtfmt.cpp',
   '/intl/icu/source/i18n/smpdtfst.cpp',
   '/intl/icu/source/i18n/sortkey.cpp',
@@ -167,7 +200,8 @@ SOURCES += [
   '/intl/icu/source/i18n/udatpg.cpp',
   '/intl/icu/source/i18n/ufieldpositer.cpp',
   '/intl/icu/source/i18n/uitercollationiterator.cpp',
-   '/intl/icu/source/i18n/ulocdata.c',
+   '/intl/icu/source/i18n/ulistformatter.cpp',
+   '/intl/icu/source/i18n/ulocdata.cpp',
   '/intl/icu/source/i18n/umsg.cpp',
   '/intl/icu/source/i18n/unesctrn.cpp',
   '/intl/icu/source/i18n/uni2name.cpp',
@@ -184,10 +218,8 @@ SOURCES += [
   '/intl/icu/source/i18n/uspoof_impl.cpp',
   '/intl/icu/source/i18n/utf16collationiterator.cpp',
   '/intl/icu/source/i18n/utf8collationiterator.cpp',
-   '/intl/icu/source/i18n/utmscale.c',
+   '/intl/icu/source/i18n/utmscale.cpp',
   '/intl/icu/source/i18n/utrans.cpp',
-   '/intl/icu/source/i18n/valueformatter.cpp',
-   '/intl/icu/source/i18n/visibledigits.cpp',
   '/intl/icu/source/i18n/vtzone.cpp',
   '/intl/icu/source/i18n/vzone.cpp',
   '/intl/icu/source/i18n/windtfmt.cpp',
@@ -223,10 +255,14 @@ EXPORTS.unicode += [
   '/intl/icu/source/i18n/unicode/fpositer.h',
   '/intl/icu/source/i18n/unicode/gender.h',
   '/intl/icu/source/i18n/unicode/gregocal.h',
+   '/intl/icu/source/i18n/unicode/listformatter.h',
   '/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/msgfmt.h',
+   '/intl/icu/source/i18n/unicode/nounit.h',
+   '/intl/icu/source/i18n/unicode/numberformatter.h',
+   '/intl/icu/source/i18n/unicode/numberrangeformatter.h',
   '/intl/icu/source/i18n/unicode/numfmt.h',
   '/intl/icu/source/i18n/unicode/numsys.h',
   '/intl/icu/source/i18n/unicode/plurfmt.h',
@@ -263,10 +299,12 @@ EXPORTS.unicode += [
   '/intl/icu/source/i18n/unicode/ufieldpositer.h',
   '/intl/icu/source/i18n/unicode/uformattable.h',
   '/intl/icu/source/i18n/unicode/ugender.h',
+   '/intl/icu/source/i18n/unicode/ulistformatter.h',
   '/intl/icu/source/i18n/unicode/ulocdata.h',
   '/intl/icu/source/i18n/unicode/umsg.h',
   '/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/unumsys.h',
   '/intl/icu/source/i18n/unicode/upluralrules.h',
   '/intl/icu/source/i18n/unicode/uregex.h',
@@ -9,4 +9,4 @@

 Library('icustubdata')

-SOURCES += ['/intl/icu/source/stubdata/stubdata.c']
+SOURCES += ['/intl/icu/source/stubdata/stubdata.cpp']
@@ -41,6 +41,9 @@ if CONFIG['CPU_ARCH'] == 'arm':
 if CONFIG['MOZ_FFVPX']:
    external_dirs += ['media/ffvpx']

+if CONFIG["MOZ_JXL"]:
+    external_dirs += ["media/libjxl", "media/highway"]
+
 external_dirs += [
    'media/kiss_fft',
    'media/libcubeb',
@@ -10,13 +10,12 @@
 # things happening at each step required other things happening in previous
 # steps without any documentation of those dependencies.
 #
-# This new build system tries to start afresh by establishing what files or
-# operations are needed for the build, and applying the necessary rules to
-# have those in place, relying on make dependencies to get them going.
+# This build system establishes what files or operations are needed for the
+# build, and applying the necessary rules to have those in place, relying on
+# make dependencies to get them going.
 #
-# As of writing, only building non-compiled parts of Firefox is supported
-# here (a few other things are also left out). This is a starting point, with
-# the intent to grow this build system to make it more complete.
+# Only non-compiled parts of the application and platform are built and
+# supported here (a few other things are also left out).
 #
 # This file contains rules and dependencies to get things working. The intent
 # is for a Makefile to define some dependencies and variables, and include
@@ -42,19 +41,11 @@ ifndef NO_XPIDL
 default: $(TOPOBJDIR)/config/makefiles/xpidl/xpidl
 endif

-# Mac builds require to copy things in dist/bin/*.app
-# TODO: remove the MOZ_WIDGET_TOOLKIT and MOZ_BUILD_APP variables from
-# faster/Makefile and python/mozbuild/mozbuild/test/backend/test_build.py
-# when this is not required anymore.
-# We however don't need to do this when using the hybrid
-# FasterMake/RecursiveMake backend (FASTER_RECURSIVE_MAKE is set when
-# recursing from the RecursiveMake backend)
-ifndef FASTER_RECURSIVE_MAKE
+# Mac builds require copying files in dist/bin/*.app
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 default:
 	$(MAKE) -C $(TOPOBJDIR)/$(MOZ_BUILD_APP)/app repackage
 endif
-endif

 .PHONY: FORCE

@@ -99,12 +90,9 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/
 # that are not supported by data in moz.build.

 # The xpidl target in config/makefiles/xpidl requires the install manifest for
-# dist/idl to have been processed. When using the hybrid
-# FasterMake/RecursiveMake backend, this dependency is handled in the top-level
-# Makefile.
-ifndef FASTER_RECURSIVE_MAKE
+# dist/idl to have been processed.
 $(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(TOPOBJDIR)/install-dist_idl
-endif
+
 # It also requires all the install manifests for dist/bin to have been processed
 # because it adds interfaces.manifest references with buildlist.py.
 $(TOPOBJDIR)/config/makefiles/xpidl/xpidl: $(addprefix install-,$(filter dist/bin%,$(INSTALL_MANIFESTS)))
@@ -8,4 +8,4 @@
 # Referenced by milestone.py.
 #--------------------------------------------------------

-5.1.0+
+6.0.0
@@ -19,12 +19,6 @@
 #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
 #endif

-// Code built with !_HAS_EXCEPTIONS calls std::_Throw(), but the win2k
-// CRT doesn't export std::_Throw().  So we define it.
-#ifndef mozilla_Throw_h
-#  include "mozilla/throw_msvc.h"
-#endif
-
 #ifdef _DEBUG
 // From
 //   http://msdn.microsoft.com/en-us/library/aa985982%28VS.80%29.aspx
@@ -26,16 +26,19 @@
         key="&closeCmd.key;"
         command="toolbox-cmd-close"
         modifiers="accel"/>
-    <key id="toolbox-key-toggle"
-         key="&toggleToolbox.key;"
-         command="toolbox-cmd-close"
-         modifiers="accel,shift"
-         disabled="true"/>
+#ifdef XP_MACOSX
    <key id="toolbox-key-toggle-osx"
         key="&toggleToolbox.key;"
         command="toolbox-cmd-close"
         modifiers="accel,alt"
         disabled="true"/>
+#else
+    <key id="toolbox-key-toggle"
+         key="&toggleToolbox.key;"
+         command="toolbox-cmd-close"
+         modifiers="accel,shift"
+         disabled="true"/>
+#endif
    <key id="toolbox-key-toggle-F12"
         keycode="&toggleToolboxF12.keycode;"
         keytext="&toggleToolboxF12.keytext;"
@@ -20,6 +20,11 @@
 * code by having a tag called "padding" and a property
 * value called "margin".
 */
+
+const { PrefObserver } = require("devtools/client/shared/prefs");
+const PREF_ENABLE_MDN_DOCS_TOOLTIP =
+  "devtools.inspector.mdnDocsTooltip.enabled";
+
 const TEST_URI = `
  <html>
    <head>
@@ -35,12 +40,50 @@ const TEST_URI = `
 `;

 add_task(function* () {
+  info("Ensure the pref is true to begin with");
+  let initial = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
+  if (initial != true) {
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
+  }
+
  yield addTab("data:text/html;charset=utf8," + encodeURIComponent(TEST_URI));
  let {inspector, view} = yield openRuleView();
  yield selectNode("padding", inspector);
  yield testMdnContextMenuItemVisibility(view);
+
+  info("Ensure the pref is reset to its initial value");
+  let eventual = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
+  if (eventual != initial) {
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
+  }
 });

+/**
+ * Set a boolean pref, and wait for the pref observer to
+ * trigger, so that code listening for the pref change
+ * has had a chance to update itself.
+ *
+ * @param pref {string} Name of the pref to change
+ * @param state {boolean} Desired value of the pref.
+ *
+ * Note that if the pref already has the value in `state`,
+ * then the prefObserver will not trigger. So you should only
+ * call this function if you know the pref's current value is
+ * not `state`.
+ */
+function* setBooleanPref(pref, state) {
+  let oncePrefChanged = defer();
+  let prefObserver = new PrefObserver("devtools.");
+  prefObserver.on(pref, oncePrefChanged.resolve);
+
+  info("Set the pref " + pref + " to: " + state);
+  Services.prefs.setBoolPref(pref, state);
+
+  info("Wait for prefObserver to call back so the UI can update");
+  yield oncePrefChanged.promise;
+  prefObserver.off(pref, oncePrefChanged.resolve);
+}
+
 /**
 * Tests that the MDN context menu item is shown when it should be,
 * and hidden when it should be.
@@ -32,7 +32,7 @@ add_task(function* () {
  info("Ensure the pref is true to begin with");
  let initial = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
  if (initial != true) {
-    setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, true);
  }

  yield addTab("data:text/html;charset=utf8," + encodeURIComponent(TEST_DOC));
@@ -58,7 +58,7 @@ add_task(function* () {
  info("Ensure the pref is reset to its initial value");
  let eventual = Services.prefs.getBoolPref(PREF_ENABLE_MDN_DOCS_TOOLTIP);
  if (eventual != initial) {
-    setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
+    yield setBooleanPref(PREF_ENABLE_MDN_DOCS_TOOLTIP, initial);
  }
 });

@@ -104,7 +104,7 @@ devtools.jar:
    content/commandline/commandline.css (commandline/commandline.css)
    content/commandline/commandlineoutput.xhtml (commandline/commandlineoutput.xhtml)
    content/commandline/commandlinetooltip.xhtml (commandline/commandlinetooltip.xhtml)
-    content/framework/toolbox-window.xul (framework/toolbox-window.xul)
+*   content/framework/toolbox-window.xul (framework/toolbox-window.xul)
    content/framework/toolbox-options.xhtml (framework/toolbox-options.xhtml)
    content/framework/toolbox.xul (framework/toolbox.xul)
    content/framework/toolbox-init.js (framework/toolbox-init.js)
@@ -59,7 +59,7 @@ pref("devtools.inspector.showUserAgentStyles", false);
 // Show all native anonymous content (like controls in <video> tags)
 pref("devtools.inspector.showAllAnonymousContent", false);
 // Enable the MDN docs tooltip
-pref("devtools.inspector.mdnDocsTooltip.enabled", true);
+pref("devtools.inspector.mdnDocsTooltip.enabled", false);

 // Enable the Font Inspector
 pref("devtools.fontinspector.enabled", true);
@@ -46,7 +46,7 @@
 .tabs .all-tabs-menu  {
  position: absolute;
  top: 0;
-  offset-inline-end: 0;
+  inset-inline-end: 0;
  width: 15px;
  height: 100%;
  border-inline-start: 1px solid var(--theme-splitter-color);
@@ -8,7 +8,7 @@
 * Copyright (C) 2008, 2009 Anthony Ricaud <rik@webkit.org>
 * Copyright (C) 2011 Google Inc. All rights reserved.
 * Copyright (C) 2009 Mozilla Foundation. All rights reserved.
- * Copyright (C) 2022 Moonchild Productions. All rights reserved.
+ * Copyright (C) 2022, 2023 Moonchild Productions. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
@@ -138,7 +138,8 @@ const Curl = {
    for (let i = 0; i < headers.length; i++) {
      let header = headers[i];
      if (header.name.toLowerCase() === "accept-encoding") {
-        addParam("--compressed");
+        // Ignore transfer encoding (compression) as not all commonly installed
+        // versions of curl support this.
        continue;
      }
      if (ignoredHeaders.has(header.name.toLowerCase())) {
@@ -397,41 +398,55 @@ const CurlUtils = {

  /**
   * Escape util function for Windows systems.
-   * Credit: Google DevTools
   */
  escapeStringWin: function (str) {
    /* 
-       Replace the backtick character ` with `` in order to escape it.
-       The backtick character is an escape character in PowerShell and
-       can, among other things, be used to disable the effect of some
-       of the other escapes created below.
+       Because the cmd.exe parser and the MS Crt arguments parsers use some
+       of the same escape characters, they can interact with each other in
+       terrible ways, meaning the order of operations is critical here.

-       Replace dollar sign because of commands in powershell when using
-       double quotes. e.g $(calc.exe).
+       1. Replace \ with \\ first, because it is an escape character for
+       certain conditions in both parsers.
+
+       2. Replace double quote chars with two double quotes (not by escaping
+       with \") because it is recognized by both the cmd.exe and MS Crt
+       arguments parsers.
       
-       Also see http://www.rlmueller.net/PowerShellEscape.htm for details.
+       3. Escape ` and $ so commands do not get executed, e.g $(calc.exe) or
+       `\$(calc.exe)
+       
+       4. Escape all characters we are not sure about with ^, to ensure it
+       gets to the MS Crt arguments parser safely.

-       Replace quote by double quote (but not by \") because it is
-       recognized by both cmd.exe and MS Crt arguments parser.
+       5. The % character is special because the MS Crt arguments parser will
+       try and look for environment variables and fill them in, in-place. We
+       cannot escape them with % and cannot escape them with ^ (because it's
+       cmd.exe's escape, not the MS Crt arguments parser). So, we can get the
+       cmd.exe parser to escape the character after it, if it is followed by
+       a valid starting character of an environment variable.
+       This ensures we do not try and double-escape another ^ if it was placed
+       by the previous replace.

-       Replace % by "%" because it could be expanded to an environment
-       variable value. So %% becomes "%""%". Even if an env variable ""
-       (2 doublequotes) is declared, the cmd.exe will not
-       substitute it with its value.
+       6. We replace \r and \r\n with \n; this allows us to consistently
+       escape all new lines in the next replace.

-       Replace each backslash with double backslash to make sure
-       MS Crt arguments parser won't collapse them.
-
-       Replace new line outside of quotes since cmd.exe doesn't let
-       us do it inside.
+       7. Lastly, we replace new lines with ^ and TWO new lines, because the
+       first new line is there to enact the escape command, and the second is
+       the character to escape (in this case new line).
+       The extra " enables escaping new lines with ^ within quotes in cmd.exe.
    */
-    return "\"" + 
-      str.replaceAll("`", "``")
-         .replaceAll("$", "`$")
-         .replaceAll('"', '""')
-         .replaceAll("%", '"%"')
-         .replace(/\\/g, "\\\\")
-         .replace(/[\r\n]+/g, "\"^$&\"") + "\"";
+    const encapsChars = '"';
+    return (
+      encapsChars +
+      str
+        .replace(/\\/g, "\\\\")
+        .replace(/"/g, '""')
+        .replace(/[`$]/g, "\\$&")
+        .replace(/[^a-zA-Z0-9\s_\-:=+~\/.',?;()*\$&\\{}\"`]/g, "^$&")
+        .replace(/%(?=[a-zA-Z0-9_])/g, "%^")
+        .replace(/\r\n?/g, "\n")
+        .replace(/\n/g, '"^\r\n\r\n"')
+      + encapsChars);
  }
 };

@@ -1032,7 +1032,7 @@ OutputPanel.prototype._resize = function () {
      break;
  }

-  this.document.body.style.width = "-moz-max-content";
+  this.document.body.style.width = "max-content";
  let style = this._frame.contentWindow.getComputedStyle(this.document.body);
  let frameWidth = parseInt(style.width, 10);
  let width = Math.min(maxWidth, frameWidth);
@@ -652,7 +652,7 @@ checkbox:-moz-focusring {
 .devtools-searchinput-clear {
  position: absolute;
  top: 3.5px;
-  offset-inline-end: 7px;
+  inset-inline-end: 7px;
  padding: 0;
  border: 0;
  width: 16px;
@@ -216,7 +216,7 @@
  content: "";
  position: absolute;
  top: 1px;
-  offset-inline-start: 0;
+  inset-inline-start: 0;
  width: 12px;
  height: 22px;
  background-repeat: no-repeat;
@@ -521,8 +521,8 @@
  width: 16px;
  height: 16px;
  position: absolute;
-  offset-inline-start: 3px;
-  offset-block-start: 3px;
+  inset-inline-start: 3px;
+  inset-block-start: 3px;
  box-shadow: 0px 0px 0px black;
  border: solid 1px #fff;
 }
@@ -1462,7 +1462,9 @@ DebuggerServerConnection.prototype = {
  },

  send(packet) {
-    this.transport.send(packet);
+    if (this.transport) {
+      this.transport.send(packet);
+    }
  },

  /**
@@ -2209,13 +2209,13 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "content",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -2232,13 +2232,13 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "content",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -3144,10 +3144,10 @@ exports.CSS_PROPERTIES = {
      "mix-blend-mode",
      "object-fit",
      "object-position",
-      "offset-block-end",
-      "offset-block-start",
-      "offset-inline-end",
-      "offset-inline-start",
+      "inset-block-end",
+      "inset-block-start",
+      "inset-inline-end",
+      "inset-inline-start",
      "opacity",
      "order",
      "-moz-orient",
@@ -3304,9 +3304,7 @@ exports.CSS_PROPERTIES = {
      "-moz-mac-source-list-selection",
      "-moz-mac-vibrancy-dark",
      "-moz-mac-vibrancy-light",
-      "-moz-max-content",
      "-moz-middle-with-baseline",
-      "-moz-min-content",
      "-moz-none",
      "-moz-popup",
      "-moz-pre-space",
@@ -3362,6 +3360,7 @@ exports.CSS_PROPERTIES = {
      "bottom",
      "bottom-outside",
      "break-all",
+      "break-spaces",
      "break-word",
      "butt",
      "button",
@@ -3493,6 +3492,7 @@ exports.CSS_PROPERTIES = {
      "margin-box",
      "match-source",
      "mathematical",
+      "max-content",
      "medium",
      "menuarrow",
      "menubar",
@@ -3510,6 +3510,7 @@ exports.CSS_PROPERTIES = {
      "meterbar",
      "meterchunk",
      "middle",
+      "min-content",
      "miter",
      "mixed",
      "multiply",
@@ -6000,13 +6001,13 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "content",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -6023,13 +6024,13 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "content",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -6816,12 +6817,12 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -6903,8 +6904,80 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "max-content",
+      "min-content",
+      "unset"
+    ]
+  },
+  "inset-block-end": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-block-end"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "unset"
+    ]
+  },
+  "inset-block-start": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-block-start"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "unset"
+    ]
+  },
+  "inset-inline-end": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-inline-end"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
+      "auto",
+      "calc",
+      "inherit",
+      "initial",
+      "unset"
+    ]
+  },
+  "inset-inline-start": {
+    "isInherited": false,
+    "subproperties": [
+      "inset-inline-start"
+    ],
+    "supports": [
+      6,
+      8
+    ],
+    "values": [
+      "-moz-calc",
      "auto",
      "calc",
      "inherit",
@@ -7651,11 +7724,11 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "none",
      "unset"
    ]
@@ -7673,11 +7746,11 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "none",
      "unset"
    ]
@@ -7695,11 +7768,11 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "none",
      "unset"
    ]
@@ -7735,12 +7808,12 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -7757,12 +7830,12 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -7779,12 +7852,12 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -7851,7 +7924,7 @@ exports.CSS_PROPERTIES = {
  "offset-block-end": {
    "isInherited": false,
    "subproperties": [
-      "offset-block-end"
+      "inset-block-end"
    ],
    "supports": [
      6,
@@ -7869,7 +7942,7 @@ exports.CSS_PROPERTIES = {
  "offset-block-start": {
    "isInherited": false,
    "subproperties": [
-      "offset-block-start"
+      "inset-block-start"
    ],
    "supports": [
      6,
@@ -7887,7 +7960,7 @@ exports.CSS_PROPERTIES = {
  "offset-inline-end": {
    "isInherited": false,
    "subproperties": [
-      "offset-inline-end"
+      "inset-inline-end"
    ],
    "supports": [
      6,
@@ -7905,7 +7978,7 @@ exports.CSS_PROPERTIES = {
  "offset-inline-start": {
    "isInherited": false,
    "subproperties": [
-      "offset-inline-start"
+      "inset-inline-start"
    ],
    "supports": [
      6,
@@ -9519,6 +9592,7 @@ exports.CSS_PROPERTIES = {
    "supports": [],
    "values": [
      "-moz-pre-space",
+      "break-spaces",
      "inherit",
      "initial",
      "normal",
@@ -9542,12 +9616,12 @@ exports.CSS_PROPERTIES = {
      "-moz-available",
      "-moz-calc",
      "-moz-fit-content",
-      "-moz-max-content",
-      "-moz-min-content",
      "auto",
      "calc",
      "inherit",
      "initial",
+      "max-content",
+      "min-content",
      "unset"
    ]
  },
@@ -36,11 +36,6 @@ EXPORTS.mozilla += [
 ]

 UNIFIED_SOURCES += [
-    'KeyframeEffect.cpp',
-    'KeyframeEffectReadOnly.cpp',
-]
-
-SOURCES += [
    'Animation.cpp',
    'AnimationEffectReadOnly.cpp',
    'AnimationEffectTiming.cpp',
@@ -54,7 +49,9 @@ SOURCES += [
    'DocumentTimeline.cpp',
    'EffectCompositor.cpp',
    'EffectSet.cpp',
+    'KeyframeEffect.cpp',
    'KeyframeEffectParams.cpp',
+    'KeyframeEffectReadOnly.cpp',
    'KeyframeUtils.cpp',
    'PendingAnimationTracker.cpp',
    'TimingParams.cpp',
@@ -15,7 +15,7 @@ EXPORTS += [
    'AudioChannelService.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'AudioChannelAgent.cpp',
    'AudioChannelService.cpp',
 ]
@@ -15,6 +15,7 @@
 #include "nsContentUtils.h"
 #include "nsHTMLTags.h"
 #include "jsapi.h"
+#include "ShadowRoot.h"

 namespace mozilla {
 namespace dom {
@@ -791,6 +792,45 @@ CustomElementRegistry::Define(const nsAString& aName,

 }

+static void
+TryUpgrade(nsINode& aNode)
+{
+  Element* element = aNode.IsElement() ? aNode.AsElement() : nullptr;
+  if (element) {
+    CustomElementData* ceData = element->GetCustomElementData();
+    if (ceData) {
+      NodeInfo* nodeInfo = element->NodeInfo();
+      nsIAtom* typeAtom = ceData->GetCustomElementType();
+      CustomElementDefinition* definition =
+        nsContentUtils::LookupCustomElementDefinition(nodeInfo->GetDocument(),
+                                                      nodeInfo->NameAtom(),
+                                                      nodeInfo->NamespaceID(),
+                                                      typeAtom);
+      if (definition) {
+        nsContentUtils::EnqueueUpgradeReaction(element, definition);
+      }
+    }
+
+    if (ShadowRoot* root = element->GetShadowRoot()) {
+      for (Element* child = root->GetFirstElementChild(); child;
+           child = child->GetNextElementSibling()) {
+        TryUpgrade(*child);
+      }
+    }
+  }
+
+  for (Element* child = aNode.GetFirstElementChild(); child;
+       child = child->GetNextElementSibling()) {
+    TryUpgrade(*child);
+  }
+}
+
+void
+CustomElementRegistry::Upgrade(nsINode& aRoot)
+{
+  TryUpgrade(aRoot);
+}
+
 void
 CustomElementRegistry::Get(JSContext* aCx, const nsAString& aName,
                           JS::MutableHandle<JS::Value> aRetVal)
@@ -525,6 +525,8 @@ public:
           JS::MutableHandle<JS::Value> aRetVal);

  already_AddRefed<Promise> WhenDefined(const nsAString& aName, ErrorResult& aRv);
+
+  void Upgrade(nsINode& aRoot);
 };

 class MOZ_RAII AutoCEReaction final {
@@ -35,221 +35,81 @@ namespace dom {

 struct EventSourceInit;

+class EventSourceImpl;
+
 class EventSource final : public DOMEventTargetHelper
-                        , public nsIObserver
-                        , public nsIStreamListener
-                        , public nsIChannelEventSink
-                        , public nsIInterfaceRequestor
-                        , public nsSupportsWeakReference
 {
+  friend class EventSourceImpl;
 public:
-  explicit EventSource(nsPIDOMWindowInner* aOwnerWindow);
  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_INHERITED(
-    EventSource, DOMEventTargetHelper)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(EventSource, DOMEventTargetHelper)
+  virtual bool IsCertainlyAliveForCC() const override;

-  NS_DECL_NSIOBSERVER
-  NS_DECL_NSISTREAMLISTENER
-  NS_DECL_NSIREQUESTOBSERVER
-  NS_DECL_NSICHANNELEVENTSINK
-  NS_DECL_NSIINTERFACEREQUESTOR
+  // EventTarget
+  void DisconnectFromOwner() override
+  {
+    DOMEventTargetHelper::DisconnectFromOwner();
+    Close();
+  }

-  // nsWrapperCache
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  JSObject* WrapObject(JSContext* aCx,
+                       JS::Handle<JSObject*> aGivenProto) override;

  // WebIDL
-  nsPIDOMWindowInner*
-  GetParentObject() const
-  {
-    return GetOwner();
-  }
  static already_AddRefed<EventSource>
  Constructor(const GlobalObject& aGlobal, const nsAString& aURL,
-              const EventSourceInit& aEventSourceInitDict,
-              ErrorResult& aRv);
+              const EventSourceInit& aEventSourceInitDict, ErrorResult& aRv);

  void GetUrl(nsAString& aURL) const
  {
+    AssertIsOnTargetThread();
    aURL = mOriginalURL;
  }
+
  bool WithCredentials() const
  {
+    AssertIsOnTargetThread();
    return mWithCredentials;
  }

-  enum {
-    CONNECTING = 0U,
-    OPEN = 1U,
-    CLOSED = 2U
-  };
  uint16_t ReadyState() const
  {
+    AssertIsOnTargetThread();
    return mReadyState;
  }

  IMPL_EVENT_HANDLER(open)
  IMPL_EVENT_HANDLER(message)
  IMPL_EVENT_HANDLER(error)
+
  void Close();

-  virtual void DisconnectFromOwner() override;
-
-protected:
-  virtual ~EventSource();
-
-  MOZ_IS_CLASS_INIT
-  nsresult Init(nsISupports* aOwner,
-                const nsAString& aURL,
-                bool aWithCredentials);
-
-  nsresult GetBaseURI(nsIURI **aBaseURI);
-
-  void SetupHttpChannel();
-  nsresult SetupReferrerPolicy();
-  nsresult InitChannelAndRequestEventSource();
-  nsresult ResetConnection();
-  nsresult DispatchFailConnection();
-  nsresult SetReconnectionTimeout();
-
-  void AnnounceConnection();
-  void DispatchAllMessageEvents();
-  void ReestablishConnection();
-  void FailConnection();
-
-  nsresult Thaw();
-  nsresult Freeze();
-
-  static void TimerCallback(nsITimer *aTimer, void *aClosure);
-
-  nsresult PrintErrorOnConsole(const char       *aBundleURI,
-                               const char16_t  *aError,
-                               const char16_t **aFormatStrings,
-                               uint32_t          aFormatStringsLen);
-  nsresult ConsoleError();
-
-  static nsresult StreamReaderFunc(nsIInputStream *aInputStream,
-                                   void           *aClosure,
-                                   const char     *aFromRawSegment,
-                                   uint32_t        aToOffset,
-                                   uint32_t        aCount,
-                                   uint32_t       *aWriteCount);
-  nsresult SetFieldAndClear();
-  nsresult ClearFields();
-  nsresult ResetEvent();
-  nsresult DispatchCurrentMessageEvent();
-  nsresult ParseCharacter(char16_t aChr);
-  nsresult CheckHealthOfRequestCallback(nsIRequest *aRequestCallback);
-  nsresult OnRedirectVerifyCallback(nsresult result);
-
-  nsCOMPtr<nsIURI> mSrc;
-
-  nsString mLastEventID;
-  uint32_t mReconnectionTime;  // in ms
-
-  struct Message {
-    nsString mEventName;
-    nsString mLastEventID;
-    nsString mData;
-  };
-  nsDeque mMessagesToDispatch;
-  Message mCurrentMessage;
-
-  /**
-   * A simple state machine used to manage the event-source's line buffer
-   *
-   * PARSE_STATE_OFF              -> PARSE_STATE_BEGIN_OF_STREAM
-   *
-   * PARSE_STATE_BEGIN_OF_STREAM  -> PARSE_STATE_BOM_WAS_READ |
-   *                                 PARSE_STATE_CR_CHAR |
-   *                                 PARSE_STATE_BEGIN_OF_LINE |
-   *                                 PARSE_STATE_COMMENT |
-   *                                 PARSE_STATE_FIELD_NAME
-   *
-   * PARSE_STATE_BOM_WAS_READ     -> PARSE_STATE_CR_CHAR |
-   *                                 PARSE_STATE_BEGIN_OF_LINE |
-   *                                 PARSE_STATE_COMMENT |
-   *                                 PARSE_STATE_FIELD_NAME
-   *
-   * PARSE_STATE_CR_CHAR -> PARSE_STATE_CR_CHAR |
-   *                        PARSE_STATE_COMMENT |
-   *                        PARSE_STATE_FIELD_NAME |
-   *                        PARSE_STATE_BEGIN_OF_LINE
-   *
-   * PARSE_STATE_COMMENT -> PARSE_STATE_CR_CHAR |
-   *                        PARSE_STATE_BEGIN_OF_LINE
-   *
-   * PARSE_STATE_FIELD_NAME   -> PARSE_STATE_CR_CHAR |
-   *                             PARSE_STATE_BEGIN_OF_LINE |
-   *                             PARSE_STATE_FIRST_CHAR_OF_FIELD_VALUE
-   *
-   * PARSE_STATE_FIRST_CHAR_OF_FIELD_VALUE  -> PARSE_STATE_FIELD_VALUE |
-   *                                           PARSE_STATE_CR_CHAR |
-   *                                           PARSE_STATE_BEGIN_OF_LINE
-   *
-   * PARSE_STATE_FIELD_VALUE      -> PARSE_STATE_CR_CHAR |
-   *                                 PARSE_STATE_BEGIN_OF_LINE
-   *
-   * PARSE_STATE_BEGIN_OF_LINE   -> PARSE_STATE_CR_CHAR |
-   *                                PARSE_STATE_COMMENT |
-   *                                PARSE_STATE_FIELD_NAME |
-   *                                PARSE_STATE_BEGIN_OF_LINE
-   *
-   * Whenever the parser find an empty line or the end-of-file
-   * it dispatches the stacked event.
-   *
-   */
-  enum ParserStatus {
-    PARSE_STATE_OFF,
-    PARSE_STATE_BEGIN_OF_STREAM,
-    PARSE_STATE_BOM_WAS_READ,
-    PARSE_STATE_CR_CHAR,
-    PARSE_STATE_COMMENT,
-    PARSE_STATE_FIELD_NAME,
-    PARSE_STATE_FIRST_CHAR_OF_FIELD_VALUE,
-    PARSE_STATE_FIELD_VALUE,
-    PARSE_STATE_BEGIN_OF_LINE
-  };
-  ParserStatus mStatus;
-
-  bool mFrozen;
-  bool mErrorLoadOnRedirect;
-  bool mGoingToDispatchAllMessages;
-  bool mWithCredentials;
-  bool mWaitingForOnStopRequest;
-
-  // used while reading the input streams
-  nsCOMPtr<nsIUnicodeDecoder> mUnicodeDecoder;
-  nsresult mLastConvertionResult;
-  nsString mLastFieldName;
-  nsString mLastFieldValue;
-
-  nsCOMPtr<nsILoadGroup> mLoadGroup;
-
-  nsCOMPtr<nsIHttpChannel> mHttpChannel;
-
-  nsCOMPtr<nsITimer> mTimer;
-
-  uint16_t mReadyState;
-  nsString mOriginalURL;
-
-  nsCOMPtr<nsIPrincipal> mPrincipal;
-  nsString mOrigin;
-
-  // Event Source owner information:
-  // - the script file name
-  // - source code line number and column number where the Event Source object
-  //   was constructed.
-  // - the ID of the inner window where the script lives. Note that this may not
-  //   be the same as the Event Source owner window.
-  // These attributes are used for error reporting.
-  nsString mScriptFile;
-  uint32_t mScriptLine;
-  uint32_t mScriptColumn;
-  uint64_t mInnerWindowID;
-
 private:
-  EventSource(const EventSource& x);   // prevent bad usage
-  EventSource& operator=(const EventSource& x);
+  EventSource(nsPIDOMWindowInner* aOwnerWindow, bool aWithCredentials);
+  virtual ~EventSource();
+  // prevent bad usage
+  EventSource(const EventSource& x) = delete;
+  EventSource& operator=(const EventSource& x) = delete;
+
+  void AssertIsOnTargetThread() const
+  {
+    MOZ_ASSERT(NS_IsMainThread() == mIsMainThread);
+  }
+
+  nsresult CreateAndDispatchSimpleEvent(const nsAString& aName);
+
+  // Raw pointer because this EventSourceImpl is created, managed and destroyed
+  // by EventSource.
+  EventSourceImpl* mImpl;
+  nsString mOriginalURL;
+  uint16_t mReadyState;
+  bool mWithCredentials;
+  bool mIsMainThread;
+  // This is used to keep EventSourceImpl instance when there is a connection.
+  bool mKeepingAlive;
+
+  void UpdateMustKeepAlive();
+  void UpdateDontKeepAlive();
 };

 } // namespace dom
@@ -1917,7 +1917,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INTERNAL(FragmentOrElement)
    }

    nsAutoCString orphan;
-    if (!tmp->IsInUncomposedDoc() &&
+    if (!tmp->IsInComposedDoc() &&
        // Ignore xbl:content, which is never in the document and hence always
        // appears to be orphaned.
        !tmp->NodeInfo()->Equals(nsGkAtoms::content, kNameSpaceID_XBL)) {
@@ -1390,9 +1390,8 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue)
  aPlatform.AssignLiteral("Win32");
 #elif defined(XP_MACOSX) && defined(__ppc__)
  aPlatform.AssignLiteral("MacPPC");
-#elif defined(XP_MACOSX) && defined(__i386__)
-  aPlatform.AssignLiteral("MacIntel");
-#elif defined(XP_MACOSX) && defined(__x86_64__)
+#elif defined(XP_MACOSX)
+  // Always return "MacIntel", even on ARM64 macOS like Safari does.
  aPlatform.AssignLiteral("MacIntel");
 #else
  // XXX Communicator uses compiled-in build-time string defines
@@ -1402,32 +1402,6 @@ WebSocket::ConstructorCommon(const GlobalObject& aGlobal,

 NS_IMPL_CYCLE_COLLECTION_CLASS(WebSocket)

-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(WebSocket)
-  bool isBlack = tmp->IsBlack();
-  if (isBlack || tmp->mKeepingAlive) {
-    if (tmp->mListenerManager) {
-      tmp->mListenerManager->MarkForCC();
-    }
-    if (!isBlack && tmp->PreservingWrapper()) {
-      // This marks the wrapper black.
-      tmp->GetWrapper();
-    }
-    return true;
-  }
-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_END
-
-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_BEGIN(WebSocket)
-  return tmp->IsBlack();
-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_IN_CC_END
-
-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_BEGIN(WebSocket)
-  return tmp->IsBlack();
-NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_THIS_END
-
-NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(WebSocket,
-                                               DOMEventTargetHelper)
-NS_IMPL_CYCLE_COLLECTION_TRACE_END
-
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WebSocket,
                                                  DOMEventTargetHelper)
  if (tmp->mImpl) {
@@ -1444,6 +1418,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WebSocket,
  }
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END

+bool
+WebSocket::IsCertainlyAliveForCC() const
+{
+  return mKeepingAlive;
+}
+
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(WebSocket)
 NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)

@@ -45,8 +45,8 @@ public:

 public:
  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_INHERITED(
-    WebSocket, DOMEventTargetHelper)
+  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(WebSocket, DOMEventTargetHelper)
+  virtual bool IsCertainlyAliveForCC() const override;

  // EventTarget
  virtual void EventListenerAdded(nsIAtom* aType) override;
@@ -222,7 +222,7 @@ EXPORTS.mozilla.dom += [
    'WindowOrientationObserver.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'AnonymousContent.cpp',
    'Attr.cpp',
    'BarProps.cpp',
@@ -238,7 +238,6 @@ SOURCES += [
    'DirectionalityUtils.cpp',
    'DocGroup.cpp',
    'DocumentFragment.cpp',
-    'DocumentOrShadowRoot.cpp',
    'DocumentType.cpp',
    'DOMCursor.cpp',
    'DOMError.cpp',
@@ -373,12 +372,14 @@ SOURCES += [
 ]

 if CONFIG['MOZ_WEBRTC']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
        'nsDOMDataChannel.cpp',
    ]

 # these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
 SOURCES += [
+    # DocumentOrShadowRoot conflicts with mozilla::dom::ShadowRoot
+    'DocumentOrShadowRoot.cpp',
    # Several conflicts with other bindings.
    'DOMIntersectionObserver.cpp',
    # Because of OS X headers.
@@ -2377,6 +2377,56 @@ nsContentUtils::GetCommonAncestor(nsINode* aNode1,
  return parent;
 }

+// static
+nsINode*
+nsContentUtils::GetCommonAncestorUnderInteractiveContent(nsINode* aNode1,
+                                                         nsINode* aNode2)
+{
+  if (!aNode1 || !aNode2) {
+    return nullptr;
+  }
+
+  if (aNode1 == aNode2) {
+    return aNode1;
+  }
+
+  // Build the chain of parents
+  AutoTArray<nsINode*, 30> parents1;
+  do {
+    parents1.AppendElement(aNode1);
+    if (aNode1->IsElement() &&
+        aNode1->AsElement()->IsInteractiveHTMLContent(true)) {
+      break;
+    }
+    aNode1 = aNode1->GetFlattenedTreeParentNode();
+  } while (aNode1);
+
+  AutoTArray<nsINode*, 30> parents2;
+  do {
+    parents2.AppendElement(aNode2);
+    if (aNode2->IsElement() &&
+        aNode2->AsElement()->IsInteractiveHTMLContent(true)) {
+      break;
+    }
+    aNode2 = aNode2->GetFlattenedTreeParentNode();
+  } while (aNode2);
+
+  // Find where the parent chain differs
+  uint32_t pos1 = parents1.Length();
+  uint32_t pos2 = parents2.Length();
+  nsINode* parent = nullptr;
+  for (uint32_t len = std::min(pos1, pos2); len > 0; --len) {
+    nsINode* child1 = parents1.ElementAt(--pos1);
+    nsINode* child2 = parents2.ElementAt(--pos2);
+    if (child1 != child2) {
+      break;
+    }
+    parent = child1;
+  }
+
+  return parent;
+}
+
 /* static */
 bool
 nsContentUtils::PositionIsBefore(nsINode* aNode1, nsINode* aNode2)
@@ -7056,16 +7106,26 @@ nsContentUtils::HasDistributedChildren(nsIContent* aContent)

 // static
 bool
-nsContentUtils::IsForbiddenRequestHeader(const nsACString& aHeader)
+nsContentUtils::IsForbiddenRequestHeader(const nsACString& aHeader,
+                                         const nsACString& aValue)
 {
  if (IsForbiddenSystemRequestHeader(aHeader)) {
    return true;
  }
+  
+  if ((nsContentUtils::IsOverrideMethodHeader(aHeader) &&
+       nsContentUtils::ContainsForbiddenMethod(aValue))) {
+    return true;
+  }

-  return StringBeginsWith(aHeader, NS_LITERAL_CSTRING("proxy-"),
-                          nsCaseInsensitiveCStringComparator()) ||
-         StringBeginsWith(aHeader, NS_LITERAL_CSTRING("sec-"),
-                          nsCaseInsensitiveCStringComparator());
+  if (StringBeginsWith(aHeader, NS_LITERAL_CSTRING("proxy-"),
+                       nsCaseInsensitiveCStringComparator()) ||
+      StringBeginsWith(aHeader, NS_LITERAL_CSTRING("sec-"),
+                       nsCaseInsensitiveCStringComparator())) {
+    return true;
+  }
+  
+  return false;
 }

 // static
@@ -7094,6 +7154,64 @@ nsContentUtils::IsForbiddenResponseHeader(const nsACString& aHeader)
          aHeader.LowerCaseEqualsASCII("set-cookie2"));
 }

+// static 
+bool
+nsContentUtils::IsOverrideMethodHeader(const nsACString& headerName) {
+  return headerName.LowerCaseEqualsASCII("x-http-method-override") ||
+         headerName.LowerCaseEqualsASCII("x-http-method") ||
+         headerName.LowerCaseEqualsASCII("x-method-override");
+}
+
+// static
+bool
+nsContentUtils::ContainsForbiddenMethod(const nsACString& headerValue) {
+  bool hasInsecureMethod = false;
+  nsCCharSeparatedTokenizer tokenizer(headerValue, ',');
+
+  while (tokenizer.hasMoreTokens()) {
+    const nsDependentCSubstring& value = tokenizer.nextToken();
+
+    if (value.LowerCaseEqualsASCII("connect") ||
+        value.LowerCaseEqualsASCII("trace") ||
+        value.LowerCaseEqualsASCII("track")) {
+      hasInsecureMethod = true;
+      break;
+    }
+  }
+
+  return hasInsecureMethod;
+}
+
+// static
+bool nsContentUtils::IsCorsUnsafeRequestHeaderValue(
+    const nsACString& aHeaderValue) {
+  const char* cur = aHeaderValue.BeginReading();
+  const char* end = aHeaderValue.EndReading();
+
+  while (cur != end) {
+    // Implementation of
+    // https://fetch.spec.whatwg.org/#cors-unsafe-request-header-byte Is less
+    // than a space but not a horizontal tab
+    if ((*cur < ' ' && *cur != '\t') || *cur == '"' || *cur == '(' ||
+        *cur == ')' || *cur == ':' || *cur == '<' || *cur == '>' ||
+        *cur == '?' || *cur == '@' || *cur == '[' || *cur == '\\' ||
+        *cur == ']' || *cur == '{' || *cur == '}' ||
+        *cur == 0x7F) {  // 0x75 is DEL
+      return true;
+    }
+    cur++;
+  }
+  return false;
+}
+
+// static
+bool nsContentUtils::IsAllowedNonCorsAccept(const nsACString& aHeaderValue) {
+  if (IsCorsUnsafeRequestHeaderValue(aHeaderValue)) {
+    return false;
+  }
+  return true;
+}
+
 // static
 bool
 nsContentUtils::IsAllowedNonCorsContentType(const nsACString& aHeaderValue)
@@ -7101,6 +7219,10 @@ nsContentUtils::IsAllowedNonCorsContentType(const nsACString& aHeaderValue)
  nsAutoCString contentType;
  nsAutoCString unused;

+  if (IsCorsUnsafeRequestHeaderValue(aHeaderValue)) {
+    return false;
+  }
+
  nsresult rv = NS_ParseRequestContentType(aHeaderValue, contentType, unused);
  if (NS_FAILED(rv)) {
    return false;
@@ -7111,6 +7233,41 @@ nsContentUtils::IsAllowedNonCorsContentType(const nsACString& aHeaderValue)
         contentType.LowerCaseEqualsLiteral("multipart/form-data");
 }

+// static
+bool nsContentUtils::IsAllowedNonCorsLanguage(const nsACString& aHeaderValue) {
+  const char* cur = aHeaderValue.BeginReading();
+  const char* end = aHeaderValue.EndReading();
+
+  while (cur != end) {
+    if ((*cur >= '0' && *cur <= '9') || (*cur >= 'A' && *cur <= 'Z') ||
+        (*cur >= 'a' && *cur <= 'z') || *cur == ' ' || *cur == '*' ||
+        *cur == ',' || *cur == '-' || *cur == '.' || *cur == ';' ||
+        *cur == '=') {
+      cur++;
+      continue;
+    }
+    return false;
+  }
+  return true;
+}
+
+// static
+bool nsContentUtils::IsCORSSafelistedRequestHeader(const nsACString& aName,
+                                                   const nsACString& aValue) {
+  // See https://fetch.spec.whatwg.org/#cors-safelisted-request-header
+  if (aValue.Length() > 128) {
+    return false;
+  }
+  return (aName.LowerCaseEqualsLiteral("accept") &&
+          nsContentUtils::IsAllowedNonCorsAccept(aValue)) ||
+         (aName.LowerCaseEqualsLiteral("accept-language") &&
+          nsContentUtils::IsAllowedNonCorsLanguage(aValue)) ||
+         (aName.LowerCaseEqualsLiteral("content-language") &&
+          nsContentUtils::IsAllowedNonCorsLanguage(aValue)) ||
+         (aName.LowerCaseEqualsLiteral("content-type") &&
+          nsContentUtils::IsAllowedNonCorsContentType(aValue));
+}
+
 bool
 nsContentUtils::DOMWindowDumpEnabled()
 {
@@ -324,6 +324,15 @@ public:
  static nsINode* GetCommonAncestor(nsINode* aNode1,
                                    nsINode* aNode2);

+  /**
+   * Returns the common ancestor under interactive content, if any.
+   * If neither one has interactive content as ancestor, common ancestor will be
+   * returned. If only one has interactive content as ancestor, null will be
+   * returned. If the nodes are the same, that node is returned.
+   */
+  static nsINode* GetCommonAncestorUnderInteractiveContent(nsINode* aNode1,
+                                                           nsINode* aNode2);
+
  /**
   * Returns true if aNode1 is before aNode2 in the same connected
   * tree.
@@ -2425,7 +2434,8 @@ public:
   * Returns whether a given header is forbidden for an XHR or fetch
   * request.
   */
-  static bool IsForbiddenRequestHeader(const nsACString& aHeader);
+  static bool IsForbiddenRequestHeader(const nsACString& aHeader,
+                                       const nsACString& aValue);

  /**
   * Returns whether a given header is forbidden for a system XHR
@@ -2433,18 +2443,50 @@ public:
   */
  static bool IsForbiddenSystemRequestHeader(const nsACString& aHeader);

+  /**
+   * Returns whether a given header has characters that aren't permitted
+   */
+  static bool IsCorsUnsafeRequestHeaderValue(const nsACString& aHeaderValue);
+
+  /**
+   * Returns whether a given Accept header value is allowed
+   * for a non-CORS XHR or fetch request.
+   */
+  static bool IsAllowedNonCorsAccept(const nsACString& aHeaderValue);
+
  /**
   * Returns whether a given Content-Type header value is allowed
   * for a non-CORS XHR or fetch request.
   */
  static bool IsAllowedNonCorsContentType(const nsACString& aHeaderValue);

+  /**
+   * Returns whether a given Content-Language or accept-language header value is
+   * allowed for a non-CORS XHR or fetch request.
+   */
+  static bool IsAllowedNonCorsLanguage(const nsACString& aHeaderValue);
+ 
+  /**
+   * Returns whether a given header and value is a CORS-safelisted request
+   * header per https://fetch.spec.whatwg.org/#cors-safelisted-request-header
+   */
+  static bool IsCORSSafelistedRequestHeader(const nsACString& aName,
+                                            const nsACString& aValue);
+
  /**
   * Returns whether a given header is forbidden for an XHR or fetch
   * response.
   */
  static bool IsForbiddenResponseHeader(const nsACString& aHeader);

+  /**
+   * Checks whether the header overrides any http methods
+   */
+  static bool IsOverrideMethodHeader(const nsACString& headerName);
+  /**
+   * Checks whether the  header value contains any forbidden method
+   */
+  static bool ContainsForbiddenMethod(const nsACString& headerValue);
  /**
   * Returns the inner window ID for the window associated with a request,
   */
@@ -2367,75 +2367,6 @@ nsDOMWindowUtils::GetCurrentAudioBackend(nsAString& aBackend)
  return NS_OK;
 }

-NS_IMETHODIMP
-nsDOMWindowUtils::StartFrameTimeRecording(uint32_t *startIndex)
-{
-  NS_ENSURE_ARG_POINTER(startIndex);
-
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (!widget)
-    return NS_ERROR_FAILURE;
-
-  LayerManager *mgr = widget->GetLayerManager();
-  if (!mgr)
-    return NS_ERROR_FAILURE;
-
-  const uint32_t kRecordingMinSize = 60 * 10; // 10 seconds @60 fps.
-  const uint32_t kRecordingMaxSize = 60 * 60 * 60; // One hour
-  uint32_t bufferSize = Preferences::GetUint("toolkit.framesRecording.bufferSize", uint32_t(0));
-  bufferSize = std::min(bufferSize, kRecordingMaxSize);
-  bufferSize = std::max(bufferSize, kRecordingMinSize);
-  *startIndex = mgr->StartFrameTimeRecording(bufferSize);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMWindowUtils::StopFrameTimeRecording(uint32_t   startIndex,
-                                         uint32_t  *frameCount,
-                                         float    **frameIntervals)
-{
-  NS_ENSURE_ARG_POINTER(frameCount);
-  NS_ENSURE_ARG_POINTER(frameIntervals);
-
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (!widget)
-    return NS_ERROR_FAILURE;
-
-  LayerManager *mgr = widget->GetLayerManager();
-  if (!mgr)
-    return NS_ERROR_FAILURE;
-
-  nsTArray<float> tmpFrameIntervals;
-  mgr->StopFrameTimeRecording(startIndex, tmpFrameIntervals);
-  *frameCount = tmpFrameIntervals.Length();
-
-  *frameIntervals = (float*)moz_xmalloc(*frameCount * sizeof(float));
-
-  /* copy over the frame intervals and paint times into the arrays we just allocated */
-  for (uint32_t i = 0; i < *frameCount; i++) {
-    (*frameIntervals)[i] = tmpFrameIntervals[i];
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMWindowUtils::BeginTabSwitch()
-{
-  nsCOMPtr<nsIWidget> widget = GetWidget();
-  if (!widget)
-    return NS_ERROR_FAILURE;
-
-  LayerManager *mgr = widget->GetLayerManager();
-  if (!mgr)
-    return NS_ERROR_FAILURE;
-
-  mgr->BeginTabSwitch();
-
-  return NS_OK;
-}
-
 static bool
 ComputeAnimationValue(nsCSSPropertyID aProperty,
                      Element* aElement,
@@ -2478,7 +2409,7 @@ nsDOMWindowUtils::AdvanceTimeAndRefresh(int64_t aMilliseconds)

  nsPresContext* presContext = GetPresContext();
  if (presContext) {
-    nsRefreshDriver* driver = presContext->RefreshDriver();
+    RefPtr<nsRefreshDriver> driver = presContext->RefreshDriver();
    driver->AdvanceTimeAndRefresh(aMilliseconds);

    RefPtr<LayerTransactionChild> transaction = GetLayerTransaction();
@@ -2504,6 +2504,21 @@ nsDocument::InitCSP(nsIChannel* aChannel)
    return NS_OK;
  }

+  // If this is explicitly loaded as a data document, no need to set a CSP.
+  if (mLoadedAsData) {
+    return NS_OK;
+  }
+  
+  // If this is an image, no need to set a CSP.
+  // If we don't do this, SVG images will be parsed as normal XML documents and
+  // subject to served CSPs, which might block internally applied inline styles.
+  // See UXP issue #1959.
+  nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
+  if (loadInfo->GetExternalContentPolicyType() ==
+      nsIContentPolicy::TYPE_IMAGE) {
+    return NS_OK;
+  }
+
  nsAutoCString tCspHeaderValue, tCspROHeaderValue;

  nsCOMPtr<nsIHttpChannel> httpChannel;
@@ -2532,7 +2547,6 @@ nsDocument::InitCSP(nsIChannel* aChannel)

  // Check if this is a signed content to apply default CSP.
  bool applySignedContentCSP = false;
-  nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
  if (loadInfo && loadInfo->GetVerifySignedContent()) {
    applySignedContentCSP = true;
  }
@@ -284,7 +284,7 @@ nsHTMLContentSerializer::AppendElementStart(Element* aElement,
  if (ns == kNameSpaceID_XHTML &&
      (name == nsGkAtoms::script ||
       name == nsGkAtoms::style ||
-       name == nsGkAtoms::noscript ||
+       (name == nsGkAtoms::noscript && aElement->OwnerDoc()->IsScriptEnabled()) ||
       name == nsGkAtoms::noframes)) {
    ++mDisableEntityEncoding;
  }
@@ -314,7 +314,7 @@ nsHTMLContentSerializer::AppendElementEnd(Element* aElement,
  if (ns == kNameSpaceID_XHTML &&
      (name == nsGkAtoms::script ||
       name == nsGkAtoms::style ||
-       name == nsGkAtoms::noscript ||
+       (name == nsGkAtoms::noscript && aElement->OwnerDoc()->IsScriptEnabled()) ||
       name == nsGkAtoms::noframes)) {
    --mDisableEntityEncoding;
  }
@@ -1185,7 +1185,8 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
        continue;
      }
      if (IsURL(aURLs, attrLocal)) {
-        if (SanitizeURL(aElement, attrNs, attrLocal)) {
+        bool fragmentOnly = aElement->IsSVGElement(nsGkAtoms::use);
+        if (SanitizeURL(aElement, attrNs, attrLocal, fragmentOnly)) {
          // in case the attribute removal shuffled the attribute order, start
          // the loop again.
          --ac;
@@ -1239,7 +1240,8 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
      // else not allowed
    } else if (aAllowXLink && kNameSpaceID_XLink == attrNs) {
      if (nsGkAtoms::href == attrLocal) {
-        if (SanitizeURL(aElement, attrNs, attrLocal)) {
+        bool fragmentOnly = aElement->IsSVGElement(nsGkAtoms::use);
+        if (SanitizeURL(aElement, attrNs, attrLocal, fragmentOnly)) {
          // in case the attribute removal shuffled the attribute order, start
          // the loop again.
          --ac;
@@ -1273,7 +1275,8 @@ nsTreeSanitizer::SanitizeAttributes(mozilla::dom::Element* aElement,
 bool
 nsTreeSanitizer::SanitizeURL(mozilla::dom::Element* aElement,
                             int32_t aNamespace,
-                             nsIAtom* aLocalName)
+                             nsIAtom* aLocalName,
+                             bool aFragmentOnly)
 {
  nsAutoString value;
  aElement->GetAttr(aNamespace, aLocalName, value);
@@ -1282,6 +1285,15 @@ nsTreeSanitizer::SanitizeURL(mozilla::dom::Element* aElement,
  static const char* kWhitespace = "\n\r\t\b";
  const nsAString& v =
    nsContentUtils::TrimCharsInSet(kWhitespace, value);
+  // Fragment-only url cannot be harmful.
+  if (!v.IsEmpty() && v.First() == u'#') {
+    return false;
+  }
+  // if we allow only same-document fragment URLs, stop and remove here
+  if (aFragmentOnly) {
+    aElement->UnsetAttr(aNamespace, aLocalName, false);
+    return true;
+  }

  nsIScriptSecurityManager* secMan = nsContentUtils::GetSecurityManager();
  uint32_t flags = nsIScriptSecurityManager::DISALLOW_INHERIT_PRINCIPAL;
@@ -143,11 +143,13 @@ class MOZ_STACK_CLASS nsTreeSanitizer {
     * @param aElement the element whose attribute to possibly modify
     * @param aNamespace the namespace of the URL attribute
     * @param aLocalName the local name of the URL attribute
+     * @param aFragmentOnly allows same-document references only
     * @return true if the attribute was removed and false otherwise
     */
    bool SanitizeURL(mozilla::dom::Element* aElement,
                       int32_t aNamespace,
-                       nsIAtom* aLocalName);
+                       nsIAtom* aLocalName,
+                       bool aFragmentOnly = false);

    /**
     * Checks a style rule for the presence of the 'binding' CSS property and
@@ -682,7 +682,7 @@ DefineUnforgeableAttributes(JSContext* cx, JS::Handle<JSObject*> obj,
 // funToString ObjectOps member for interface objects.
 JSString*
 InterfaceObjectToString(JSContext* aCx, JS::Handle<JSObject*> aObject,
-                        unsigned /* indent */)
+                        bool /* isToSource */)
 {
  const js::Class* clasp = js::GetObjectClass(aObject);
  MOZ_ASSERT(IsDOMIfaceAndProtoClass(clasp));
@@ -170,10 +170,6 @@ DOMInterfaces = {
    'headerFile': 'Crypto.h'
 },

-'CSS': {
-    'concrete': False,
-},
-
 'CSS2Properties': {
    'nativeType': 'nsDOMCSSDeclaration'
 },
@@ -50,21 +50,12 @@ struct GCPolicy<mozilla::OwningNonNull<T>>
 } // namespace JS

 namespace js {
-template<typename T>
-struct RootedBase<mozilla::OwningNonNull<T>>
+template<typename T, typename Wrapper>
+struct WrappedPtrOperations<mozilla::OwningNonNull<T>, Wrapper>
 {
-  typedef mozilla::OwningNonNull<T> SmartPtrType;
-
-  operator SmartPtrType& () const
-  {
-    auto& self = *static_cast<const JS::Rooted<SmartPtrType>*>(this);
-    return self.get();
-  }
-
  operator T& () const
  {
-    auto& self = *static_cast<const JS::Rooted<SmartPtrType>*>(this);
-    return self.get();
+    return static_cast<const Wrapper*>(this)->get();
  }
 };
 } // namespace js
@@ -38,19 +38,12 @@ struct GCPolicy<RefPtr<T>>
 } // namespace JS

 namespace js {
-template<typename T>
-struct RootedBase<RefPtr<T>>
+template<typename T, typename Wrapper>
+struct WrappedPtrOperations<RefPtr<T>, Wrapper>
 {
-  operator RefPtr<T>& () const
-  {
-    auto& self = *static_cast<const JS::Rooted<RefPtr<T>>*>(this);
-    return self.get();
-  }
-
  operator T*() const
  {
-    auto& self = *static_cast<const JS::Rooted<RefPtr<T>>*>(this);
-    return self.get();
+    return static_cast<const Wrapper*>(this)->get();
  }
 };
 } // namespace js
@@ -84,7 +84,7 @@ LOCAL_INCLUDES += [
    '/media/webrtc/signaling/src/peerconnection',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'BindingUtils.cpp',
    'CallbackInterface.cpp',
    'CallbackObject.cpp',
@@ -248,8 +248,14 @@ class IDLScope(IDLObject):
        return self.QName()

    def QName(self):
-        if self._name:
-            return self._name.QName() + "::"
+        # It's possible for us to be called before __init__ has been called, for
+        # the IDLObjectWithScope case.  In that case, self._name won't be set yet.
+        if hasattr(self, "_name"):
+            name = self._name
+        else:
+            name = None
+        if name:
+            return name.QName() + "::"
        return "::"

    def ensureUnique(self, identifier, object):
@@ -7,7 +7,7 @@ EXPORTS.mozilla.dom += [
    'BroadcastChannel.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'BroadcastChannel.cpp',
    'BroadcastChannelChild.cpp',
    'BroadcastChannelParent.cpp',
@@ -1770,7 +1770,7 @@ Manager::~Manager()

  // Don't spin the event loop in the destructor waiting for the thread to
  // shutdown.  Defer this to the main thread, instead.
-  MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(NewRunnableMethod(ioThread, &nsIThread::Shutdown)));
+  MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(NewRunnableMethod(ioThread, &nsIThread::AsyncShutdown)));
 }

 void
@@ -37,7 +37,7 @@ EXPORTS.mozilla.dom.cache += [
    'TypeUtils.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'Action.cpp',
    'ActorChild.cpp',
    'AutoUtils.cpp',
@@ -3758,7 +3758,11 @@ CanvasRenderingContext2D::SetFontInternal(const nsAString& aFont,

  nsCOMPtr<nsIPresShell> presShell = GetPresShell();
  if (!presShell) {
-    aError.Throw(NS_ERROR_FAILURE);
+    // Do not throw here. We may be in a situation where we're loading in an iframe
+    // that is sandboxed, and/or initially hidden with display:none, in which case
+    // we don't want to throw an error but silently fail.
+    // If we don't do this, JS trying to set context.font to something will abort,
+    // breaking e.g. third party serviced graphs.
    return false;
  }

@@ -5752,6 +5756,18 @@ inline uint8_t PoisonValue(uint8_t v)
  return v + rand() %3 -1;
 }

+static IntRect ClipImageDataTransfer(IntRect& aSrc,
+                                     const IntPoint& aDestOffset,
+                                     const IntSize& aDestBounds)
+{
+  IntRect dest = aSrc;
+  dest.SafeMoveBy(aDestOffset);
+  dest = IntRect(IntPoint(0, 0), aDestBounds).SafeIntersect(dest);
+
+  aSrc = aSrc.SafeIntersect(dest - aDestOffset);
+  return aSrc + aDestOffset;
+}
+
 nsresult
 CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
                                            int32_t aX,
@@ -5792,9 +5808,11 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
    return NS_OK;
  }

-  IntRect srcRect(0, 0, mWidth, mHeight);
-  IntRect destRect(aX, aY, aWidth, aHeight);
-  IntRect srcReadRect = srcRect.Intersect(destRect);
+  IntRect dstWriteRect(0, 0, aWidth, aHeight);
+  IntRect srcReadRect = ClipImageDataTransfer(dstWriteRect,
+                                              IntPoint(aX, aY),
+                                              IntSize(mWidth, mHeight));
+
  RefPtr<DataSourceSurface> readback;
  DataSourceSurface::MappedSurface rawData;
  if (!srcReadRect.IsEmpty()) {
@@ -5822,9 +5840,6 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
    }
  }

-  IntRect dstWriteRect = srcReadRect;
-  dstWriteRect.MoveBy(-aX, -aY);
-
  JS::AutoCheckCannotGC nogc;
  bool isShared;
  uint8_t* data = JS_GetUint8ClampedArrayData(darray, &isShared, nogc);
@@ -6025,10 +6040,10 @@ CanvasRenderingContext2D::PutImageData_explicit(int32_t aX, int32_t aY, uint32_t
    dirtyRect = imageDataRect;
  }

-  dirtyRect.MoveBy(IntPoint(aX, aY));
-  dirtyRect = IntRect(0, 0, mWidth, mHeight).Intersect(dirtyRect);
-
-  if (dirtyRect.Width() <= 0 || dirtyRect.Height() <= 0) {
+  IntRect srcRect = dirtyRect;
+  dirtyRect = ClipImageDataTransfer(srcRect, IntPoint(aX, aY),
+                                    IntSize(mWidth, mHeight));
+  if (dirtyRect.IsEmpty()) {
    return NS_OK;
  }

@@ -6,9 +6,6 @@

 #include "ImageBitmapColorUtils.h"

-#include "js/LegacyIntTypes.h"
-#include <cmath>
-
 namespace mozilla {
 namespace dom {

@@ -303,13 +303,13 @@ WebGLContext::FromDomElem(const char* funcName, TexImageTarget target, uint32_t
                          uint32_t height, uint32_t depth, const dom::Element& elem,
                          ErrorResult* const out_error)
 {
-    if (elem.IsHTMLElement(nsGkAtoms::canvas)) {
-        const dom::HTMLCanvasElement* canvas = static_cast<const dom::HTMLCanvasElement*>(&elem);
-        if (canvas->IsWriteOnly()) {
-            out_error->Throw(NS_ERROR_DOM_SECURITY_ERR);
-            return nullptr;
-        }
-    }
+    if (elem.IsHTMLElement(nsGkAtoms::canvas)) {
+        const dom::HTMLCanvasElement* canvas = static_cast<const dom::HTMLCanvasElement*>(&elem);
+        if (canvas->IsWriteOnly()) {
+            out_error->Throw(NS_ERROR_DOM_SECURITY_ERR);
+            return nullptr;
+        }
+    }

    uint32_t flags = nsLayoutUtils::SFE_WANT_IMAGE_SURFACE |
                     nsLayoutUtils::SFE_USE_ELEMENT_SIZE_IF_VECTOR;
@@ -1032,9 +1032,27 @@ ValidateCompressedTexImageRestrictions(const char* funcName, WebGLContext* webgl
 }

 static bool
-ValidateTargetForFormat(const char* funcName, WebGLContext* webgl, TexImageTarget target,
-                        const webgl::FormatInfo* format)
-{
+ValidateFormatAndSize(const char* funcName,
+                      WebGLContext* webgl,
+                      TexImageTarget target,
+                      const webgl::FormatInfo* format,
+                      const uint32_t width,
+                      const uint32_t height,
+                      const uint32_t depth) {
+    // Check if texture size will likely be rejected by the driver and give a more
+    // meaningful error message.
+    auto baseImageSize = CheckedInt<uint64_t>(format->estimatedBytesPerPixel) *
+                         width * height * depth;
+    if (target == LOCAL_GL_TEXTURE_CUBE_MAP) {
+        baseImageSize *= 6;
+    }
+     
+    if (!baseImageSize.isValid() ||
+        baseImageSize.value() > (uint64_t)gfxPrefs::WebGLMaxSizePerTextureMB * (1024 * 1024)) {
+        webgl->ErrorOutOfMemory("Texture size too large; base image MB > webgl.max-size-per-texture-mb");
+        return false;
+    }
+
    // GLES 3.0.4 p127:
    // "Textures with a base internal format of DEPTH_COMPONENT or DEPTH_STENCIL are
    //  supported by texture image specification commands only if `target` is TEXTURE_2D,
@@ -1137,7 +1155,8 @@ WebGLTexture::TexStorage(const char* funcName, TexTarget target, GLsizei levels,
    }
    auto dstFormat = dstUsage->format;

-    if (!ValidateTargetForFormat(funcName, mContext, testTarget, dstFormat))
+    if (!ValidateFormatAndSize(funcName, mContext, testTarget, dstFormat,
+                               width, height, depth))
        return;

    if (dstFormat->compression) {
@@ -1264,7 +1283,8 @@ WebGLTexture::TexImage(const char* funcName, TexImageTarget target, GLint level,
    // Check that source and dest info are compatible
    auto dstFormat = dstUsage->format;

-    if (!ValidateTargetForFormat(funcName, mContext, target, dstFormat))
+    if (!ValidateFormatAndSize(funcName, mContext, target, dstFormat,
+                               blob->mWidth, blob->mHeight, blob->mDepth))
        return;

    if (!mContext->IsWebGL2() && dstFormat->d) {
@@ -1484,7 +1504,8 @@ WebGLTexture::CompressedTexImage(const char* funcName, TexImageTarget target, GL
        return;
    }

-    if (!ValidateTargetForFormat(funcName, mContext, target, format))
+    if (!ValidateFormatAndSize(funcName, mContext, target, format,
+                               blob->mWidth, blob->mHeight, blob->mDepth))
        return;

    ////////////////////////////////////
@@ -2143,7 +2164,8 @@ WebGLTexture::CopyTexImage2D(TexImageTarget target, GLint level, GLenum internal
        return;

    const auto& dstFormat = dstUsage->format;
-    if (!ValidateTargetForFormat(funcName, mContext, target, dstFormat))
+    if (!ValidateFormatAndSize(funcName, mContext, target, dstFormat,
+                               width, height, depth))
        return;

    if (!mContext->IsWebGL2() && dstFormat->d) {
@@ -41,7 +41,7 @@ EXPORTS.mozilla.dom += [
 ]

 # Canvas 2D and common sources
-SOURCES += [
+UNIFIED_SOURCES += [
    'CanvasImageCache.cpp',
    'CanvasRenderingContext2D.cpp',
    'CanvasRenderingContextHelper.cpp',
@@ -59,7 +59,7 @@ SOURCES += [
 ]

 # WebGL Sources
-SOURCES += [
+UNIFIED_SOURCES += [
    'TexUnpackBlob.cpp',
    'WebGL1Context.cpp',
    'WebGL1ContextUniforms.cpp',
@@ -21,7 +21,7 @@ EXPORTS.mozilla.dom += [
    'Console.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'Console.cpp',
    'ConsoleReportCollector.cpp',
 ]
@@ -12,7 +12,7 @@ EXPORTS.mozilla.dom += [
    'WebCryptoThreadPool.h'
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'CryptoBuffer.cpp',
    'CryptoKey.cpp',
    'KeyAlgorithmProxy.cpp',
@@ -10,7 +10,7 @@ EXPORTS.mozilla.dom += [
    'TextEncoder.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'EncodingUtils.cpp',
    'FallbackEncoding.cpp',
    'TextDecoder.cpp',
@@ -52,11 +52,12 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(DOMEventTargetHelper)
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END

 NS_IMPL_CYCLE_COLLECTION_CAN_SKIP_BEGIN(DOMEventTargetHelper)
-  if (tmp->IsBlack() || tmp->IsCertainlyAliveForCC()) {
+  bool isBlack = tmp->IsBlack();
+  if (isBlack || tmp->IsCertainlyAliveForCC()) {
    if (tmp->mListenerManager) {
      tmp->mListenerManager->MarkForCC();
    }
-    if (!tmp->IsBlack() && tmp->PreservingWrapper()) {
+    if (!isBlack && tmp->PreservingWrapper()) {
      // This marks the wrapper black.
      tmp->GetWrapper();
    }
@@ -639,16 +639,11 @@ DataTransfer::PrincipalMaySetData(const nsAString& aType,
      return false;
    }

-    if (aType.EqualsASCII(kFileMime) ||
-        aType.EqualsASCII(kFilePromiseMime)) {
-      NS_WARNING("Disallowing adding x-moz-file or x-moz-file-promize types to DataTransfer");
-      return false;
-    }
-    
-    // Disallow content from creating x-moz-place flavors, so that it cannot
-    // create fake Places smart queries exposing user data.
-    if (StringBeginsWith(aType, NS_LITERAL_STRING("text/x-moz-place"))) {
-      NS_WARNING("Disallowing adding moz-place types to DataTransfer");
+    // Don't allow adding internal types of the form */x-moz-*, but
+    // special-case the url types as they are simple variations of urls.
+    if (FindInReadable(NS_LITERAL_STRING(kInternal_Mimetype_Prefix), aType) &&
+        !StringBeginsWith(aType, NS_LITERAL_STRING("text/x-moz-url"))) {
+      NS_WARNING("Disallowing adding requested internal type to DataTransfer");
      return false;
    }
  }
@@ -194,6 +194,11 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(Event)
      default:
        break;
    }
+
+    if (WidgetMouseEvent* mouseEvent = tmp->mEvent->AsMouseEvent()) {
+      NS_CYCLE_COLLECTION_NOTE_EDGE_NAME(cb, "mEvent->mClickTarget");
+      cb.NoteXPCOMChild(mouseEvent->mClickTarget);
+    }
  }
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPresContext)
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mExplicitOriginalTarget)
@@ -751,6 +751,8 @@ EventListenerManager::SetEventHandler(nsIAtom* aName,
                                      bool aPermitUntrustedEvents,
                                      Element* aElement)
 {
+  auto removeEventHandler = MakeScopeExit([&] { RemoveEventHandler(aName, EmptyString()); });
+
  nsCOMPtr<nsIDocument> doc;
  nsCOMPtr<nsIScriptGlobalObject> global =
    GetScriptGlobalAndDocument(getter_AddRefs(doc));
@@ -825,6 +827,8 @@ EventListenerManager::SetEventHandler(nsIAtom* aName,
  NS_ENSURE_TRUE(context, NS_ERROR_FAILURE);
  NS_ENSURE_STATE(global->GetGlobalJSObject());

+  removeEventHandler.release();
+
  Listener* listener = SetEventHandlerInternal(aName,
                                               EmptyString(),
                                               TypedEventHandler(),
@@ -432,11 +432,8 @@ NS_IMPL_CYCLE_COLLECTION(EventStateManager,
                         mGestureDownContent,
                         mGestureDownFrameOwner,
                         mLastLeftMouseDownContent,
-                         mLastLeftMouseDownContentParent,
                         mLastMiddleMouseDownContent,
-                         mLastMiddleMouseDownContentParent,
                         mLastRightMouseDownContent,
-                         mLastRightMouseDownContentParent,
                         mActiveContent,
                         mHoverContent,
                         mURLTargetContent,
@@ -3171,14 +3168,11 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext,
  case eMouseUp:
    {
      ClearGlobalActiveContent(this);
-      WidgetMouseEvent* mouseEvent = aEvent->AsMouseEvent();
-      if (mouseEvent && mouseEvent->IsReal()) {
-        if (!mCurrentTarget) {
-          GetEventTarget();
-        }
+      WidgetMouseEvent* mouseUpEvent = aEvent->AsMouseEvent();
+      if (mouseUpEvent && EventCausesClickEvents(*mouseUpEvent)) {
        // Make sure to dispatch the click even if there is no frame for
        // the current target element. This is required for Web compatibility.
-        ret = CheckForAndDispatchClick(mouseEvent, aStatus);
+        ret = PostHandleMouseUp(mouseUpEvent, aStatus);
      }

      nsIPresShell *shell = presContext->GetPresShell();
@@ -4573,16 +4567,13 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
                                 nsEventStatus* aStatus)
 {
  nsCOMPtr<nsIContent> mouseContent;
-  nsIContent* mouseContentParent = nullptr;
  if (mCurrentTarget) {
    mCurrentTarget->GetContentForEvent(aEvent, getter_AddRefs(mouseContent));
  }
-  if (mouseContent) {
-    if (mouseContent->IsNodeOfType(nsINode::eTEXT)) {
-      mouseContent = mouseContent->GetParent();
-    }
-    if (mouseContent && mouseContent->IsRootOfNativeAnonymousSubtree()) {
-      mouseContentParent = mouseContent->GetParent();
+  if (mouseContent && mouseContent->IsNodeOfType(nsINode::eTEXT)) {
+    nsINode* parent = mouseContent->GetFlattenedTreeParentNode();
+    if (parent && parent->IsContent()) {
+      mouseContent = parent->AsContent();
    }
  }

@@ -4590,54 +4581,51 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
  case WidgetMouseEvent::eLeftButton:
    if (aEvent->mMessage == eMouseDown) {
      mLastLeftMouseDownContent = mouseContent;
-      mLastLeftMouseDownContentParent = mouseContentParent;
    } else if (aEvent->mMessage == eMouseUp) {
-      if (mLastLeftMouseDownContent == mouseContent ||
-          mLastLeftMouseDownContentParent == mouseContent ||
-          mLastLeftMouseDownContent == mouseContentParent) {
+      aEvent->mClickTarget =
+        nsContentUtils::GetCommonAncestorUnderInteractiveContent(
+          mouseContent, mLastLeftMouseDownContent);
+      if (aEvent->mClickTarget) {
        aEvent->mClickCount = mLClickCount;
        mLClickCount = 0;
      } else {
        aEvent->mClickCount = 0;
      }
      mLastLeftMouseDownContent = nullptr;
-      mLastLeftMouseDownContentParent = nullptr;
    }
    break;

  case WidgetMouseEvent::eMiddleButton:
    if (aEvent->mMessage == eMouseDown) {
      mLastMiddleMouseDownContent = mouseContent;
-      mLastMiddleMouseDownContentParent = mouseContentParent;
    } else if (aEvent->mMessage == eMouseUp) {
-      if (mLastMiddleMouseDownContent == mouseContent ||
-          mLastMiddleMouseDownContentParent == mouseContent ||
-          mLastMiddleMouseDownContent == mouseContentParent) {
+      aEvent->mClickTarget =
+        nsContentUtils::GetCommonAncestorUnderInteractiveContent(
+          mouseContent, mLastMiddleMouseDownContent);
+      if (aEvent->mClickTarget) {
        aEvent->mClickCount = mMClickCount;
        mMClickCount = 0;
      } else {
        aEvent->mClickCount = 0;
      }
      mLastMiddleMouseDownContent = nullptr;
-      mLastMiddleMouseDownContentParent = nullptr;
    }
    break;

  case WidgetMouseEvent::eRightButton:
    if (aEvent->mMessage == eMouseDown) {
      mLastRightMouseDownContent = mouseContent;
-      mLastRightMouseDownContentParent = mouseContentParent;
    } else if (aEvent->mMessage == eMouseUp) {
-      if (mLastRightMouseDownContent == mouseContent ||
-          mLastRightMouseDownContentParent == mouseContent ||
-          mLastRightMouseDownContent == mouseContentParent) {
+      aEvent->mClickTarget =
+        nsContentUtils::GetCommonAncestorUnderInteractiveContent(
+          mouseContent, mLastRightMouseDownContent);
+      if (aEvent->mClickTarget) {
        aEvent->mClickCount = mRClickCount;
        mRClickCount = 0;
      } else {
        aEvent->mClickCount = 0;
      }
      mLastRightMouseDownContent = nullptr;
-      mLastRightMouseDownContentParent = nullptr;
    }
    break;
  }
@@ -4645,89 +4633,151 @@ EventStateManager::SetClickCount(WidgetMouseEvent* aEvent,
  return NS_OK;
 }

-nsresult
-EventStateManager::InitAndDispatchClickEvent(WidgetMouseEvent* aEvent,
-                                             nsEventStatus* aStatus,
-                                             EventMessage aMessage,
-                                             nsIPresShell* aPresShell,
-                                             nsIContent* aMouseTarget,
-                                             nsWeakFrame aCurrentTarget,
-                                             bool aNoContentDispatch)
+// static
+bool
+EventStateManager::EventCausesClickEvents(const WidgetMouseEvent& aMouseEvent)
 {
-  WidgetMouseEvent event(aEvent->IsTrusted(), aMessage,
-                         aEvent->mWidget, WidgetMouseEvent::eReal);
-
-  event.mRefPoint = aEvent->mRefPoint;
-  event.mClickCount = aEvent->mClickCount;
-  event.mModifiers = aEvent->mModifiers;
-  event.buttons = aEvent->buttons;
-  event.mTime = aEvent->mTime;
-  event.mTimeStamp = aEvent->mTimeStamp;
-  event.mFlags.mNoContentDispatch = aNoContentDispatch;
-  event.button = aEvent->button;
-  event.inputSource = aEvent->inputSource;
-
-  return aPresShell->HandleEventWithTarget(&event, aCurrentTarget,
-                                           aMouseTarget, aStatus);
+  if (NS_WARN_IF(aMouseEvent.mMessage != eMouseUp)) {
+    return false;
+  }
+  // If the mouseup event is synthesized event, we don't need to dispatch
+  // click events.
+  if (!aMouseEvent.IsReal()) {
+    return false;
+  }
+  // If mouse is still over same element, clickcount will be > 1.
+  // If it has moved it will be zero, so no click.
+  if (!aMouseEvent.mClickCount || !aMouseEvent.mClickTarget) {
+    return false;
+  }
+  // Check that the window isn't disabled before firing a click
+  // (see bug 366544).
+  return !(aMouseEvent.mWidget && !aMouseEvent.mWidget->IsEnabled());
 }

 nsresult
-EventStateManager::CheckForAndDispatchClick(WidgetMouseEvent* aEvent,
-                                            nsEventStatus* aStatus)
+EventStateManager::InitAndDispatchClickEvent(WidgetMouseEvent* aMouseUpEvent,
+                                             nsEventStatus* aStatus,
+                                             EventMessage aMessage,
+                                             nsIPresShell* aPresShell,
+                                             nsIContent* aMouseUpContent,
+                                             nsWeakFrame aCurrentTarget,
+                                             bool aNoContentDispatch)
 {
-  nsresult ret = NS_OK;
+  MOZ_ASSERT(aMouseUpEvent);
+  MOZ_ASSERT(EventCausesClickEvents(*aMouseUpEvent));
+  MOZ_ASSERT(aMouseUpContent || aCurrentTarget);

-  //If mouse is still over same element, clickcount will be > 1.
-  //If it has moved it will be zero, so no click.
-  if (aEvent->mClickCount) {
-    //Check that the window isn't disabled before firing a click
-    //(see bug 366544).
-    if (aEvent->mWidget && !aEvent->mWidget->IsEnabled()) {
+  WidgetMouseEvent event(aMouseUpEvent->IsTrusted(), aMessage,
+                         aMouseUpEvent->mWidget, WidgetMouseEvent::eReal);
+  event.mRefPoint = aMouseUpEvent->mRefPoint;
+  event.mClickCount = aMouseUpEvent->mClickCount;
+  event.mModifiers = aMouseUpEvent->mModifiers;
+  event.buttons = aMouseUpEvent->buttons;
+  event.mTime = aMouseUpEvent->mTime;
+  event.mTimeStamp = aMouseUpEvent->mTimeStamp;
+  event.mFlags.mNoContentDispatch = aNoContentDispatch;
+  event.button = aMouseUpEvent->button;
+  event.inputSource = aMouseUpEvent->inputSource;
+
+  if (!aMouseUpContent->IsInComposedDoc()) {
+    return NS_OK;
+  }
+
+  // Use local event status for each click event dispatching since it'll be
+  // cleared by EventStateManager::PreHandleEvent().  Therefore, dispatching
+  // an event means that previous event status will be ignored.
+  nsEventStatus status = nsEventStatus_eIgnore;
+  nsresult rv = aPresShell->HandleEventWithTarget(&event, aCurrentTarget,
+                                                  aMouseUpContent, &status);
+  // If current status is nsEventStatus_eConsumeNoDefault, we don't need to
+  // overwrite it.
+  if (*aStatus == nsEventStatus_eConsumeNoDefault) {
+    return rv;
+  }
+  // If new status is nsEventStatus_eConsumeNoDefault or
+  // nsEventStatus_eConsumeDoDefault, use it.
+  if (status == nsEventStatus_eConsumeNoDefault ||
+      status == nsEventStatus_eConsumeDoDefault) {
+    *aStatus = status;
+    return rv;
+  }
+  // Otherwise, keep the original status.
+  return rv;
+}
+
+nsresult
+EventStateManager::PostHandleMouseUp(WidgetMouseEvent* aMouseUpEvent,
+                                     nsEventStatus* aStatus)
+{
+  MOZ_ASSERT(aMouseUpEvent);
+  MOZ_ASSERT(EventCausesClickEvents(*aMouseUpEvent));
+  MOZ_ASSERT(aStatus);
+
+  nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
+  if (!presShell) {
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIContent> clickTarget = do_QueryInterface(aMouseUpEvent->mClickTarget);
+  NS_ENSURE_STATE(clickTarget);
+
+  // Fire click events if the event target is still available.
+  nsresult rv = DispatchClickEvents(presShell, aMouseUpEvent, aStatus,
+                                    clickTarget);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+  return NS_OK;
+}
+
+nsresult
+EventStateManager::DispatchClickEvents(nsIPresShell* aPresShell,
+                                       WidgetMouseEvent* aMouseUpEvent,
+                                       nsEventStatus* aStatus,
+                                       nsIContent* aClickTarget)
+{
+  MOZ_ASSERT(aPresShell);
+  MOZ_ASSERT(aMouseUpEvent);
+  MOZ_ASSERT(EventCausesClickEvents(*aMouseUpEvent));
+  MOZ_ASSERT(aStatus);
+  MOZ_ASSERT(aClickTarget);
+
+  bool notDispatchToContents =
+   (aMouseUpEvent->button == WidgetMouseEvent::eMiddleButton ||
+    aMouseUpEvent->button == WidgetMouseEvent::eRightButton);
+
+  bool fireAuxClick = notDispatchToContents;
+
+  nsWeakFrame currentTarget = aClickTarget->GetPrimaryFrame();
+  nsresult ret =
+    InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseClick,
+                              aPresShell, aClickTarget, currentTarget,
+                              notDispatchToContents);
+  if (NS_WARN_IF(NS_FAILED(ret))) {
+    return ret;
+  }
+
+  // Fire double click event if click count is 2.
+  if (aMouseUpEvent->mClickCount == 2 &&
+      aClickTarget && aClickTarget->IsInComposedDoc()) {
+    ret = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseDoubleClick,
+                                    aPresShell, aClickTarget, currentTarget,
+                                    notDispatchToContents);
+    if (NS_WARN_IF(NS_FAILED(ret))) {
      return ret;
    }
-    //fire click
-    bool notDispatchToContents =
-     (aEvent->button == WidgetMouseEvent::eMiddleButton ||
-      aEvent->button == WidgetMouseEvent::eRightButton);
-
-    bool fireAuxClick = notDispatchToContents;
-
-    nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
-    if (presShell) {
-      nsCOMPtr<nsIContent> mouseContent = GetEventTargetContent(aEvent);
-      // Click events apply to *elements* not nodes. At this point the target
-      // content may have been reset to some non-element content, and so we need
-      // to walk up the closest ancestor element, just like we do in
-      // nsPresShell::HandlePositionedEvent.
-      while (mouseContent && !mouseContent->IsElement()) {
-        mouseContent = mouseContent->GetParent();
-      }
-
-      if (!mouseContent && !mCurrentTarget) {
-        return NS_OK;
-      }
-
-      // HandleEvent clears out mCurrentTarget which we might need again
-      nsWeakFrame currentTarget = mCurrentTarget;
-      ret = InitAndDispatchClickEvent(aEvent, aStatus, eMouseClick,
-                                      presShell, mouseContent, currentTarget,
-                                      notDispatchToContents);
-
-      if (NS_SUCCEEDED(ret) && aEvent->mClickCount == 2 &&
-          mouseContent && mouseContent->IsInComposedDoc()) {
-        //fire double click
-        ret = InitAndDispatchClickEvent(aEvent, aStatus, eMouseDoubleClick,
-                                        presShell, mouseContent, currentTarget,
-                                        notDispatchToContents);
-      }
-      if (NS_SUCCEEDED(ret) && mouseContent && fireAuxClick &&
-          mouseContent->IsInComposedDoc()) {
-        ret = InitAndDispatchClickEvent(aEvent, aStatus, eMouseAuxClick,
-                                        presShell, mouseContent, currentTarget,
-                                        false);
-      }
-    }
  }
+
+  // Fire auxclick even if necessary.
+  if (fireAuxClick &&
+      aClickTarget && aClickTarget->IsInComposedDoc()) {
+    ret = InitAndDispatchClickEvent(aMouseUpEvent, aStatus, eMouseAuxClick,
+                                    aPresShell, aClickTarget, currentTarget,
+                                    false);
+    NS_WARNING_ASSERTION(NS_SUCCEEDED(ret), "Failed to dispatch eMouseAuxClick");
+  }
+
  return ret;
 }

@@ -414,16 +414,79 @@ protected:
   */
  void UpdateDragDataTransfer(WidgetDragEvent* dragEvent);

-  static nsresult InitAndDispatchClickEvent(WidgetMouseEvent* aEvent,
+  /**
+   * InitAndDispatchClickEvent() dispatches a click event.
+   *
+   * @param aMouseUpEvent           eMouseUp event which causes the click event.
+   *                                EventCausesClickEvents() must return true
+   *                                if this event is set to it.
+   * @param aStatus                 Returns the result of click event.
+   *                                If the status indicates consumed, the
+   *                                value won't be overwritten with
+   *                                nsEventStatus_eIgnore.
+   * @param aMessage                Should be eMouseClick, eMouseDoubleClick or
+   *                                eMouseAuxClick.
+   * @param aPresShell              The PresShell.
+   * @param aMouseUpContent         The event target of aMouseUpEvent.
+   * @param aCurrentTarget          Current target of the caller.
+   * @param aNoContentDispatch      true if the event shouldn't be exposed to
+   *                                web contents (although will be fired on
+   *                                document and window).
+   * @param aOverrideClickTarget    Preferred click event target.  If this is
+   *                                not nullptr, aMouseUpContent and
+   *                                aCurrentTarget are ignored.
+   */
+  static nsresult InitAndDispatchClickEvent(WidgetMouseEvent* aMouseUpEvent,
                                            nsEventStatus* aStatus,
                                            EventMessage aMessage,
                                            nsIPresShell* aPresShell,
-                                            nsIContent* aMouseTarget,
+                                            nsIContent* aMouseUpContent,
                                            nsWeakFrame aCurrentTarget,
                                            bool aNoContentDispatch);
  nsresult SetClickCount(WidgetMouseEvent* aEvent, nsEventStatus* aStatus);
-  nsresult CheckForAndDispatchClick(WidgetMouseEvent* aEvent,
-                                    nsEventStatus* aStatus);
+
+  /**
+   * EventCausesClickEvents() returns true when aMouseEvent is an eMouseUp
+   * event and it should cause eMouseClick, eMouseDoubleClick and/or
+   * eMouseAuxClick events.  Note that this method assumes that
+   * aMouseEvent.mClickCount has already been initialized with SetClickCount().
+   */
+  static bool EventCausesClickEvents(const WidgetMouseEvent& aMouseEvent);
+
+  /**
+   * PostHandleMouseUp() handles default actions of eMouseUp event.
+   *
+   * @param aMouseUpEvent           eMouseUp event which causes the click event.
+   *                                EventCausesClickEvents() must return true
+   *                                if this event is set to it.
+   * @param aStatus                 Returns the result of event status.
+   *                                If one of dispatching event is consumed or
+   *                                this does something as default action,
+   *                                returns nsEventStatus_eConsumeNoDefault.
+   */
+  nsresult PostHandleMouseUp(WidgetMouseEvent* aMouseUpEvent,
+                             nsEventStatus* aStatus);
+
+  /**
+   * DispatchClickEvents() dispatches eMouseClick, eMouseDoubleClick and
+   * eMouseAuxClick events for aMouseUpEvent.  aMouseUpEvent should cause
+   * click event.
+   *
+   * @param aPresShell              The PresShell.
+   * @param aMouseUpEvent           eMouseUp event which causes the click event.
+   *                                EventCausesClickEvents() must return true
+   *                                if this event is set to it.
+   * @param aStatus                 Returns the result of event status.
+   *                                If one of dispatching click event is
+   *                                consumed, returns
+   *                                nsEventStatus_eConsumeNoDefault.
+   * @param aMouseUpContent         The event target of aMouseUpEvent.
+   */
+  nsresult DispatchClickEvents(nsIPresShell* aPresShell,
+                               WidgetMouseEvent* aMouseUpEvent,
+                               nsEventStatus* aStatus,
+                               nsIContent* aMouseUpContent);
+
  void EnsureDocument(nsPresContext* aPresContext);
  void FlushPendingEvents(nsPresContext* aPresContext);

@@ -951,11 +1014,8 @@ private:
  uint16_t mGestureDownButtons;

  nsCOMPtr<nsIContent> mLastLeftMouseDownContent;
-  nsCOMPtr<nsIContent> mLastLeftMouseDownContentParent;
  nsCOMPtr<nsIContent> mLastMiddleMouseDownContent;
-  nsCOMPtr<nsIContent> mLastMiddleMouseDownContentParent;
  nsCOMPtr<nsIContent> mLastRightMouseDownContent;
-  nsCOMPtr<nsIContent> mLastRightMouseDownContentParent;

  nsCOMPtr<nsIContent> mActiveContent;
  nsCOMPtr<nsIContent> mHoverContent;
@@ -228,26 +228,20 @@ UIEvent::GetWhich(uint32_t* aWhich)
 already_AddRefed<nsINode>
 UIEvent::GetRangeParent()
 {
-  nsIFrame* targetFrame = nullptr;
-
-  if (mPresContext) {
-    targetFrame = mPresContext->EventStateManager()->GetEventTarget();
+  if (NS_WARN_IF(!mPresContext)) {
+    return nullptr;
  }

-  if (targetFrame) {
-    nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(mEvent,
-                                                              targetFrame);
-    nsCOMPtr<nsIContent> parent = targetFrame->GetContentOffsetsFromPoint(pt).content;
-    if (parent) {
-      if (parent->ChromeOnlyAccess() &&
-          !nsContentUtils::CanAccessNativeAnon()) {
-        return nullptr;
-      }
-      return parent.forget();
-    }
+  nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
+  if (NS_WARN_IF(!presShell)) {
+    return nullptr;
  }

-  return nullptr;
+  nsCOMPtr<nsIContent> container;
+  nsLayoutUtils::GetContainerAndOffsetAtEvent(presShell, mEvent,
+                                              getter_AddRefs(container),
+                                              nullptr);
+  return container.forget();
 }

 NS_IMETHODIMP
@@ -273,18 +267,19 @@ UIEvent::GetRangeOffset(int32_t* aRangeOffset)
 int32_t
 UIEvent::RangeOffset() const
 {
-  if (!mPresContext) {
+  if (NS_WARN_IF(!mPresContext)) {
    return 0;
  }

-  nsIFrame* targetFrame = mPresContext->EventStateManager()->GetEventTarget();
-  if (!targetFrame) {
+  nsCOMPtr<nsIPresShell> presShell = mPresContext->GetPresShell();
+  if (NS_WARN_IF(!presShell)) {
    return 0;
  }

-  nsPoint pt = nsLayoutUtils::GetEventCoordinatesRelativeTo(mEvent,
-                                                            targetFrame);
-  return targetFrame->GetContentOffsetsFromPoint(pt).offset;
+  int32_t offset = 0;
+  nsLayoutUtils::GetContainerAndOffsetAtEvent(presShell, mEvent,
+                                              nullptr, &offset);
+  return offset;
 }

 nsIntPoint
@@ -73,7 +73,7 @@ EXPORTS.mozilla.dom += [
    'XULCommandEvent.h',
 ]

-SOURCES += [
+UNIFIED_SOURCES += [
    'AnimationEvent.cpp',
    'AsyncEventDispatcher.cpp',
    'BeforeAfterKeyboardEvent.cpp',
@@ -95,7 +95,6 @@ SOURCES += [
    'EventDispatcher.cpp',
    'EventListenerManager.cpp',
    'EventListenerService.cpp',
-    'EventStateManager.cpp',
    'EventTarget.cpp',
    'FocusEvent.cpp',
    'ImageCaptureError.cpp',
@@ -125,6 +124,11 @@ SOURCES += [
    'XULCommandEvent.cpp',
 ]

+# nsEventStateManager.cpp should be built separately because of Mac OS X headers.
+SOURCES += [
+    'EventStateManager.cpp',
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
@@ -13,7 +13,6 @@
 #include "nsIUnicodeDecoder.h"
 #include "nsIUnicodeEncoder.h"

-#include "nsCharSeparatedTokenizer.h"
 #include "nsDOMString.h"
 #include "nsNetUtil.h"
 #include "nsReadableUtils.h"