Merge branch 'master' into js-modules

.gitignore

@@ -49,11 +49,9 @@ js/src/autom4te.cache
 js/src/tests/results-*.html
 js/src/tests/results-*.txt
 
-# Java HTML5 parser codegen artifacts
-parser/html/java/htmlparser/bin/
-parser/html/java/javaparser/bin/
-parser/html/java/*.jar
-parser/html/javasrc/
+# Java HTML5 parser classes
+parser/html/java/htmlparser/
+parser/html/java/javaparser/
 
 # Ignore the files and directory that Eclipse IDE creates
 .project

CLOBBER

@@ -22,5 +22,5 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Clobber for NSS update
+Clobber for NSS Update
 

Makefile.in

@@ -47,12 +47,6 @@ ifndef MOZ_PROFILE_USE
 # We need to explicitly put BUILD_BACKEND_FILES here otherwise the rule in
 # rules.mk doesn't run early enough.
 $(TIERS) binaries:: CLOBBER $(configure_dir)/configure config.status $(BUILD_BACKEND_FILES)
-
-# While our mozbuild backend has some kind of crazy install_manfests junk to
-# try and make this not have to happen, we actually want dist/bin to be
-# completely removed regardless.
-default alldep all::
-	@$(RM) -r $(DIST)/bin
 ifndef JS_STANDALONE
 ifdef COMPILE_ENVIRONMENT
 $(TIERS) binaries:: $(topsrcdir)/js/src/configure js/src/config.status

README.md

@@ -18,7 +18,7 @@ directory. This will contain relevant documentation regarding contributing,
 using and distributing this code and its binaries.
 
 If you are interested in the development and building side of things, some
-information will be available on the [Pale Moon developer site](http://developer.palemoon.org).
+information will be available on the [Pale Moon developer wiki](http://developer.palemoon.org).
 You are also always welcome to get in touch with our community on the [Pale Moon forum](https://forum.palemoon.org/).
 
 ### A note about trademarks and branding
@@ -34,6 +34,3 @@ and other community members.
 If you fork this repository to perform your own work on it, please consider offering
 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://github.com/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://github.com/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://github.com/MoonchildProductions/Basilisk).

SECURITY.md

@@ -1,36 +0,0 @@
-# Security Policy
-
-## What is or is not a vulnerability?
-
-In general, vulnerabilities are those bugs that can actually be exploited to perform malicious tasks. 
-Most _crashes_ are not security vulnerabilities. Although important to fix, they don't inherently cause a problem for the 
-browser's security.
-
-What should be considered vulnerabilities or security hazards by default:
-- Use-after-free crashes, since those can potentially be used for remote code execution;
-- Spoofing issues in the UI;
-- File security issues, like out-of-bounds access to arbitrary files or locations;
-- Type confusion issues;
-- Bypass of security measures like CSP or the various mechanisms around HTTPS.
-
-Generally not security vulnerabilities:
-- Null dereferencing crashes;
-- Malware extensions (but please do report those on the forum in the extensions board!);
-- Denial-of-service (AKA "evil trap sites")
-- Browser hangs
-- Issues with non-standard manual configuration (either at build time or by manipulating about:config directly)
-
-## Reporting a Vulnerability
-
-If you find an issue in UXP or the applications it builds on that could impact the security or safety of users please **do not**
-make an issue on GitHub about it. GitHub does not support restricted viewability for security sensitive bugs.
-
-If you want to report a security-sensitive issue then please go to the [forum](https://forum.palemoon.org) and report the issue
-via a **private message** to **Moonchild** (the founder and prime responsible for security issues).
-The forum's private message system is fully secure since your visits are encrypted and private messages are not available to anyone
-except the recipient (not even moderators!).
-
-You will be informed via private message if the vulnerability report is accepted or declined, with reasoning.
-Security updates occur regularly and are given priority over most other development tasks. In general, they can be solved
-relatively quickly and will be included in the next point release (third digit if not rolled into a more major one).
-

accessible/html/HTMLTableAccessible.cpp

@@ -175,17 +175,23 @@ HTMLTableCellAccessible::Table() const
 uint32_t
 HTMLTableCellAccessible::ColIdx() const
 {
-  nsTableCellFrame* cellFrame = GetCellFrame();
-  NS_ENSURE_TRUE(cellFrame, 0);
-  return cellFrame->ColIndex();
+  nsITableCellLayout* cellLayout = GetCellLayout();
+  NS_ENSURE_TRUE(cellLayout, 0);
+
+  int32_t colIdx = 0;
+  cellLayout->GetColIndex(colIdx);
+  return colIdx > 0 ? static_cast<uint32_t>(colIdx) : 0;
 }
 
 uint32_t
 HTMLTableCellAccessible::RowIdx() const
 {
-  nsTableCellFrame* cellFrame = GetCellFrame();
-  NS_ENSURE_TRUE(cellFrame, 0);
-  return cellFrame->RowIndex();
+  nsITableCellLayout* cellLayout = GetCellLayout();
+  NS_ENSURE_TRUE(cellLayout, 0);
+
+  int32_t rowIdx = 0;
+  cellLayout->GetRowIndex(rowIdx);
+  return rowIdx > 0 ? static_cast<uint32_t>(rowIdx) : 0;
 }
 
 uint32_t
@@ -279,12 +285,6 @@ HTMLTableCellAccessible::GetCellLayout() const
   return do_QueryFrame(mContent->GetPrimaryFrame());
 }
 
-nsTableCellFrame*
-HTMLTableCellAccessible::GetCellFrame() const
-{
-  return do_QueryFrame(mContent->GetPrimaryFrame());
-}
-
 nsresult
 HTMLTableCellAccessible::GetCellIndexes(int32_t& aRowIdx, int32_t& aColIdx) const
 {
@@ -520,9 +520,11 @@ HTMLTableAccessible::SelectedCellCount()
       if (!cellFrame || !cellFrame->IsSelected())
         continue;
 
-      uint32_t startRow = cellFrame->RowIndex();
-      uint32_t startCol = cellFrame->ColIndex();
-      if (startRow == rowIdx && startCol == colIdx)
+      int32_t startRow = -1, startCol = -1;
+      cellFrame->GetRowIndex(startRow);
+      cellFrame->GetColIndex(startCol);
+      if (startRow >= 0 && (uint32_t)startRow == rowIdx &&
+          startCol >= 0 && (uint32_t)startCol == colIdx)
         count++;
     }
   }
@@ -568,9 +570,11 @@ HTMLTableAccessible::SelectedCells(nsTArray<Accessible*>* aCells)
       if (!cellFrame || !cellFrame->IsSelected())
         continue;
 
-      uint32_t startRow = cellFrame->RowIndex();
-      uint32_t startCol = cellFrame->ColIndex();
-      if (startRow != rowIdx || startCol != colIdx)
+      int32_t startCol = -1, startRow = -1;
+      cellFrame->GetRowIndex(startRow);
+      cellFrame->GetColIndex(startCol);
+      if ((startRow >= 0 && (uint32_t)startRow != rowIdx) ||
+          (startCol >= 0 && (uint32_t)startCol != colIdx))
         continue;
 
       Accessible* cell = mDoc->GetAccessible(cellFrame->GetContent());
@@ -593,9 +597,11 @@ HTMLTableAccessible::SelectedCellIndices(nsTArray<uint32_t>* aCells)
       if (!cellFrame || !cellFrame->IsSelected())
         continue;
 
-      uint32_t startCol = cellFrame->ColIndex();
-      uint32_t startRow = cellFrame->RowIndex();
-      if (startRow == rowIdx && startCol == colIdx)
+      int32_t startRow = -1, startCol = -1;
+      cellFrame->GetColIndex(startCol);
+      cellFrame->GetRowIndex(startRow);
+      if (startRow >= 0 && (uint32_t)startRow == rowIdx &&
+          startCol >= 0 && (uint32_t)startCol == colIdx)
         aCells->AppendElement(CellIndexAt(rowIdx, colIdx));
     }
   }

accessible/html/HTMLTableAccessible.h

@@ -11,7 +11,6 @@
 #include "TableCellAccessible.h"
 
 class nsITableCellLayout;
-class nsTableCellFrame;
 
 namespace mozilla {
 namespace a11y {
@@ -54,11 +53,6 @@ protected:
    */
   nsITableCellLayout* GetCellLayout() const;
 
-  /**
-   * Return the table cell frame.
-   */
-  nsTableCellFrame* GetCellFrame() const;
-
   /**
    * Return row and column indices of the cell.
    */

accessible/tests/mochitest/elm/test_HTMLSpec.html

@@ -421,7 +421,7 @@
       //////////////////////////////////////////////////////////////////////////
       // HTML:dialog
 
-      ok(isAccessible("dialog"), "dialog element is not accessible");
+      todo(isAccessible("dialog"), "dialog element is not accessible");
 
       //////////////////////////////////////////////////////////////////////////
       // HTML:div

accessible/tests/mochitest/jsat/test_traversal.html

@@ -83,7 +83,7 @@
                               'listitem-2-3']);
 
       queueTraversalSequence(gQueue, docAcc, TraversalRules.Graphic, null,
-                             ['image-1', 'image-2', 'image-3']);
+                             ['image-2', 'image-3']);
 
       queueTraversalSequence(gQueue, docAcc, TraversalRules.Link, null,
                              ['link-0', 'link-1', 'link-2', 'link-3']);
@@ -117,7 +117,7 @@
                               '1. Scheme', '2. Racket', '3. Clojure',
                               '4. Standard Lisp', 'link-0', ' Lisp',
                               'checkbox-1-5', ' LeLisp', '• JavaScript',
-                              'heading-5', 'image-1', 'image-2', 'image-3',
+                              'heading-5', 'image-2', 'image-3',
                               'Not actually an image', 'link-1', 'anchor-1',
                               'link-2', 'anchor-2', 'link-3', '3', '1', '4',
                               '1', 'Sunday', 'M', 'Week 1', '3', '4', '7', '2',

accessible/tests/mochitest/tree/test_invalid_img.xhtml

@@ -20,8 +20,8 @@
       document.getElementsByTagName("img")[0].firstChild.data = "2";
 
       var accTree = {
-        role: ROLE_GRAPHIC,
-        children: []
+        role: ROLE_TEXT,
+        children: [ { role: ROLE_TEXT_LEAF } ]
       };
       testAccessibleTree("the_img", accTree);
       SimpleTest.finish();

build/autoconf/config.guess

@@ -381,14 +381,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH=i386
-  _ISAINFO=`isainfo -k 2>/dev/null`
-  if [ "$_ISAINFO" = "amd64" ]; then
-    SUN_ARCH=x86_64
-  elif [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-    # If there is a compiler, see if it is configured for 64-bit objects.
-    # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-    # This test works for both compilers.
-      if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
@@ -845,13 +842,6 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    *:MINGW32_NT*:*)
-  if [ "$PLATFORM" = "X64" ]; then
-    echo x86_64-pc-mingw32
-  else
-    echo ${UNAME_MACHINE}-pc-mingw32
-  fi
-  exit ;;
     *:MINGW64*:*)
 	echo ${UNAME_MACHINE}-pc-mingw64
 	exit ;;

build/autoconf/icu.m4

@@ -8,6 +8,19 @@ dnl ICU library, as well as a few other things.
 AC_DEFUN([MOZ_CONFIG_ICU], [
 
 ICU_LIB_NAMES=
+MOZ_SYSTEM_ICU=
+MOZ_ARG_WITH_BOOL(system-icu,
+[  --with-system-icu
+                          Use system ICU (located with pkgconfig)],
+    MOZ_SYSTEM_ICU=1)
+
+if test -n "$MOZ_SYSTEM_ICU"; then
+    PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 58.1)
+    CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
+fi
+
+AC_SUBST(MOZ_SYSTEM_ICU)
 
 dnl We always use ICU.
 USE_ICU=1
@@ -38,7 +51,7 @@ if test -n "$USE_ICU"; then
     dnl We also don't do it on Windows because sometimes the file goes
     dnl missing -- possibly due to overzealous antivirus software? --
     dnl which prevents the browser from starting up :(
-    if test -z "$JS_STANDALONE"; then
+    if test -z "$JS_STANDALONE" -a -z "$MOZ_SYSTEM_ICU" -a "$OS_TARGET" != WINNT -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
         MOZ_ICU_DATA_ARCHIVE=1
     else
         MOZ_ICU_DATA_ARCHIVE=
@@ -51,7 +64,7 @@ AC_SUBST(USE_ICU)
 AC_SUBST(ICU_DATA_FILE)
 AC_SUBST(MOZ_ICU_DATA_ARCHIVE)
 
-if test -n "$USE_ICU"; then
+if test -n "$USE_ICU" -a -z "$MOZ_SYSTEM_ICU"; then
     if test -z "$YASM" -a -z "$GNU_AS" -a "$COMPILE_ENVIRONMENT"; then
       AC_MSG_ERROR([Building ICU requires either yasm or a GNU assembler. If you do not have either of those available for this platform you must use --without-intl-api])
     fi

build/autoconf/nspr-build.m4

@@ -42,6 +42,15 @@ if test "$MOZ_BUILD_APP" != js || test -n "$JS_STANDALONE"; then
   _IS_OUTER_CONFIGURE=1
 fi
 
+MOZ_ARG_WITH_BOOL(system-nspr,
+[  --with-system-nspr      Use an NSPR that is already built and installed.
+                          Use the 'nspr-config' script in the current path,
+                          or look for the script in the directories given with
+                          --with-nspr-exec-prefix or --with-nspr-prefix.
+                          (Those flags are only checked if you specify
+                          --with-system-nspr.)],
+    _USE_SYSTEM_NSPR=1 )
+
 JS_POSIX_NSPR=unset
 ifdef([CONFIGURING_JS],[
     if test -n "$JS_STANDALONE"; then
@@ -62,6 +71,7 @@ ifdef([CONFIGURING_JS],[
 ])
 
 dnl Pass at most one of
+dnl   --with-system-nspr
 dnl   --with-nspr-cflags/libs
 dnl   --enable-nspr-build
 dnl   --enable-posix-nspr-emulation
@@ -69,6 +79,10 @@ dnl   --enable-posix-nspr-emulation
 AC_MSG_CHECKING([NSPR selection])
 nspr_opts=
 which_nspr=default
+if test -n "$_USE_SYSTEM_NSPR"; then
+    nspr_opts="x$nspr_opts"
+    which_nspr="system"
+fi
 if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
     nspr_opts="x$nspr_opts"
     which_nspr="command-line"
@@ -122,7 +136,11 @@ fi
 # anything itself.
 if test -n "$_IS_OUTER_CONFIGURE"; then
 
-if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
+if test -n "$_USE_SYSTEM_NSPR"; then
+    AM_PATH_NSPR($NSPR_MINVER, [MOZ_SYSTEM_NSPR=1], [AC_MSG_ERROR([you do not have NSPR installed or your version is older than $NSPR_MINVER.])])
+fi
+
+if test -n "$MOZ_SYSTEM_NSPR" -o -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
     _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $NSPR_CFLAGS"
     AC_TRY_COMPILE([#include "prtypes.h"],
@@ -160,7 +178,19 @@ AC_SUBST(NSPR_INCLUDE_DIR)
 AC_SUBST(NSPR_LIB_DIR)
 
 PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr"
-if test -n "$JS_POSIX_NSPR"; then
+if test -n "$MOZ_SYSTEM_NSPR"; then
+    _SAVE_CFLAGS=$CFLAGS
+    CFLAGS="$CFLAGS $NSPR_CFLAGS"
+    AC_TRY_COMPILE([#include "prlog.h"],
+                [#ifndef PR_STATIC_ASSERT
+                 #error PR_STATIC_ASSERT not defined
+                 #endif],
+                ,
+                AC_MSG_ERROR([system NSPR does not support PR_STATIC_ASSERT]))
+    CFLAGS=$_SAVE_CFLAGS
+    # piggy back on $MOZ_SYSTEM_NSPR to set a variable for the nspr check for js.pc
+    PKGCONF_REQUIRES_PRIVATE="Requires.private: nspr >= $NSPR_MINVER"
+elif test -n "$JS_POSIX_NSPR"; then
     PKGCONF_REQUIRES_PRIVATE=
 fi
 AC_SUBST([PKGCONF_REQUIRES_PRIVATE])

build/defines.sh

@@ -0,0 +1,3 @@
+# Define indicating that this build is prior to one of the early betas. To be
+# unset mid-way through the beta cycle.
+EARLY_BETA_OR_EARLIER=

build/directive4.py

@@ -33,9 +33,15 @@ if ('MOZ_OFFICIAL_BRANDING' in listConfig) or (strBrandingDirectory.endswith("br
     # Applies to Pale Moon and Basilisk
     if ('MC_BASILISK' in listConfig) or ('MC_PALEMOON' in listConfig):
         listViolations += [
+            'MOZ_SYSTEM_LIBEVENT',
+            'MOZ_SYSTEM_NSS',
+            'MOZ_SYSTEM_NSPR',
             'MOZ_SYSTEM_JPEG',
             'MOZ_SYSTEM_ZLIB',
             'MOZ_SYSTEM_BZ2',
+            'MOZ_SYSTEM_PNG',
+            'MOZ_SYSTEM_LIBVPX',
+            'MOZ_SYSTEM_SQLITE',
             'MOZ_SYSTEM_JEMALLOC'
         ]
         

build/moz.configure/init.configure

@@ -610,7 +610,7 @@ imply_option('--enable-project', application)
 def default_project(build_env, help):
     if build_env.topobjdir.endswith('/js/src'):
         return 'js'
-    return 'application/xulrunner'
+    return 'browser'
 
 option('--enable-project', nargs=1, default=default_project,
        help='Project to build')
@@ -618,22 +618,28 @@ option('--enable-project', nargs=1, default=default_project,
 option('--with-external-source-dir', env='EXTERNAL_SOURCE_DIR', nargs=1,
        help='External directory containing additional build files')
 
-@depends('--enable-project', '--with-external-source-dir', check_build_environment, '--help')
+@depends('--enable-project', '--with-external-source-dir',
+         check_build_environment, '--help')
 @imports(_from='os.path', _import='exists')
 def include_project_configure(project, external_source_dir, build_env, help):
-    base_dir = build_env.topsrcdir
+    if not project:
+        die('--enable-project is required.')
 
+    base_dir = build_env.topsrcdir
     if external_source_dir:
         base_dir = os.path.join(base_dir, external_source_dir[0])
-    
+
     build_app = project[0]
 
+    if not external_source_dir and build_app not in ('xulrunner', 'js'):
+        die('Cannot find project %s', build_app)
+
     path_project_src_dir_root = os.path.join(base_dir, build_app, 'moz.configure')
     
     if exists(path_project_src_dir_root):
         return path_project_src_dir_root
     else:
-        return os.path.join(build_env.topsrcdir, 'toolkit', 'moz.configure')
+        die('Cannot find project %s', build_app)
 
 @depends('--with-external-source-dir')
 def external_source_dir(value):
@@ -643,29 +649,12 @@ def external_source_dir(value):
 set_config('EXTERNAL_SOURCE_DIR', external_source_dir)
 add_old_configure_assignment('EXTERNAL_SOURCE_DIR', external_source_dir)
 
-@depends('--enable-project', '--with-external-source-dir', check_build_environment, '--help')
-@imports(_from='os.path', _import='exists')
-def build_project(project, external_source_dir, build_env, help):
-    if not project:
-        die('--enable-project is required.')
-
-    base_dir = build_env.topsrcdir
-
-    if external_source_dir:
-        base_dir = os.path.join(base_dir, external_source_dir[0])
-
-    build_app = project[0]
-
-    if not external_source_dir and build_app not in ('xulrunner', 'js'):
-        die('Cannot find project %s', build_app)
-
-    build_app_abspath = os.path.join(base_dir, build_app)
-
-    if exists(build_app_abspath):
-        return os.path.relpath(build_app_abspath, build_env.topsrcdir)
-    else:
-        die('Cannot find project %s', build_app)
 
+@depends(include_project_configure, check_build_environment, '--help')
+def build_project(include_project_configure, build_env, help):
+    ret = os.path.dirname(os.path.relpath(include_project_configure,
+                                          build_env.topsrcdir))
+    return ret
 
 set_config('MOZ_BUILD_APP', build_project)
 set_define('MOZ_BUILD_APP', build_project)

build/moz.configure/old.configure

@@ -157,7 +157,6 @@ def old_configure_options(*options):
     '--enable-accessibility',
     '--enable-address-sanitizer',
     '--enable-alsa',
-    '--enable-av1',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',
@@ -167,7 +166,6 @@ def old_configure_options(*options):
     '--enable-cookies',
     '--enable-cpp-rtti',
     '--enable-crashreporter',
-    '--enable-dbm',
     '--enable-dbus',
     '--enable-debug-js-modules',
     '--enable-jetpack',
@@ -224,7 +222,6 @@ def old_configure_options(*options):
     '--enable-release',
     '--enable-safe-browsing',
     '--enable-sandbox',
-    '--enable-security-sqlstore',
     '--enable-signmar',
     '--enable-simulator',
     '--enable-small-chunk-size',
@@ -236,6 +233,7 @@ def old_configure_options(*options):
     '--enable-system-cairo',
     '--enable-system-extension-dirs',
     '--enable-system-pixman',
+    '--enable-system-sqlite',
     '--enable-tasktracer',
     '--enable-tests',
     '--enable-thread-sanitizer',
@@ -289,7 +287,13 @@ def old_configure_options(*options):
     '--with-sixgill',
     '--with-soft-float',
     '--with-system-bz2',
+    '--with-system-icu',
     '--with-system-jpeg',
+    '--with-system-libevent',
+    '--with-system-libvpx',
+    '--with-system-nspr',
+    '--with-system-nss',
+    '--with-system-png',
     '--with-system-zlib',
     '--with-thumb',
     '--with-thumb-interwork',

build/mozconfig.common

@@ -16,6 +16,11 @@ ac_add_options --enable-crashreporter
 
 ac_add_options --enable-release
 
+# Disable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=${MOZ_ADDON_SIGNING-0}
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
+
 ac_add_options --enable-js-shell
 
 . "$topsrcdir/build/mozconfig.automation"

build/ppCheck.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import print_function
-import os, sys
-
-if not len(sys.argv) is 2 or not os.path.exists(sys.argv[1]):
-  print("\nYou did not supply a valid path to check.")
-  exit(1)
-else:
-  print("\nChecking for un-preprocessed files...", end = ' ')
-  DIST_PATH = sys.argv[1]
-
-PP_FILE_TYPES = (
-  '.css',
-  '.dtd',
-  '.html',
-  '.js',
-  '.jsm',
-  '.xhtml',
-  '.xml',
-  '.xul',
-  '.manifest',
-  '.properties',
-  '.rdf'
-)
-
-PP_SPECIAL_TYPES = ('.css')
-
-PP_DIRECTIVES = [
-  'define',
-  'if',
-  'ifdef',
-  'ifndef',
-  'elif',
-  'elifdef',
-  'endif',
-  'error',
-  'expand',
-  'filter',
-  'include',
-  'literal',
-  'undef',
-  'unfilter'
-]
-
-PP_FILES = []
-PP_BAD_FILES = []
-
-for root, directories, filenames in os.walk(DIST_PATH):
-  for filename in filenames: 
-    if filename.endswith(PP_FILE_TYPES):
-      PP_FILES += [ os.path.join(root, filename).replace(os.sep, '/') ]
-
-for file in PP_FILES:
-  with open(file) as fp:
-    marker = '%' if file.endswith(PP_SPECIAL_TYPES) else '#'
-    directives = tuple(marker + directive for directive in PP_DIRECTIVES)
-    for line in fp:
-      if line.startswith(directives):
-        PP_BAD_FILES += [ file.replace(DIST_PATH + '/', '') ]
-  fp.close()
-
-PP_BAD_FILES = list(dict.fromkeys(PP_BAD_FILES))
-
-print('Done!')
-
-if len(PP_BAD_FILES) > 0:
-  print("\nWARNING: The following {0} file(s) in {1} may require preprocessing:\n".format(len(PP_BAD_FILES), DIST_PATH))
-  for file in PP_BAD_FILES:
-    print(file)
-
-exit(0)

config/Makefile.in

@@ -44,7 +44,11 @@ export:: $(export-preqs)
 		-DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
 		-DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
 		-DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
+		-DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
 		-DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
+		-DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
+		-DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
+		-DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
 		$(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
 	$(INSTALL) system_wrappers $(DIST)
 

config/external/icu/moz.build

@@ -6,14 +6,16 @@
 
 Library('icu')
 
-DIRS += [
-    'common',
-    'data',
-    'i18n',
-]
-
-if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
-    DIRS += ['stubdata']
-    USE_LIBS += ['icustubdata']
+if CONFIG['MOZ_SYSTEM_ICU']:
+    OS_LIBS += CONFIG['MOZ_ICU_LIBS']
 else:
-    USE_LIBS += ['icudata']
+    DIRS += [
+        'common',
+        'data',
+        'i18n',
+    ]
+    if CONFIG['MOZ_ICU_DATA_ARCHIVE']:
+        DIRS += ['stubdata']
+        USE_LIBS += ['icustubdata']
+    else:
+        USE_LIBS += ['icudata']

config/external/moz.build

@@ -6,8 +6,10 @@
 
 external_dirs = []
 
-DIRS += ['lgpllibs']
-
+DIRS += [
+    'lgpllibs',
+    'sqlite',
+]
 if not CONFIG['MOZ_SYSTEM_JPEG']:
     external_dirs += ['media/libjpeg']
 
@@ -28,18 +30,26 @@ if CONFIG['MOZ_TREMOR']:
 if CONFIG['MOZ_WEBM_ENCODER']:
     external_dirs += ['media/libmkv']
 
-external_dirs += ['media/libvpx']
+if not CONFIG['MOZ_SYSTEM_LIBVPX']:
+    external_dirs += ['media/libvpx']
 
 if CONFIG['MOZ_AV1']:
     external_dirs += ['media/libaom']
 
-external_dirs += ['media/libpng']
+if not CONFIG['MOZ_SYSTEM_PNG']:
+    external_dirs += ['media/libpng']
 
 external_dirs += ['media/libwebp']
 
 if CONFIG['CPU_ARCH'] == 'arm':
     external_dirs += ['media/openmax_dl']
 
+if CONFIG['MOZ_WEBSPEECH_POCKETSPHINX']:
+    external_dirs += [
+        'media/sphinxbase',
+        'media/pocketsphinx',
+    ]
+
 if CONFIG['MOZ_FFVPX']:
     external_dirs += ['media/ffvpx']
 

config/external/nss/Makefile.in

@@ -3,6 +3,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+ifndef MOZ_SYSTEM_NSS
+
 CC_WRAPPER =
 CXX_WRAPPER =
 
@@ -119,9 +121,15 @@ DEFAULT_GMAKE_FLAGS += NSS_ENABLE_TLS_1_3=1
 ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1)
 DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS='-static-libgcc' NSPR31_LIB_PREFIX=lib
 endif
+ifndef MOZ_SYSTEM_SQLITE
+ifdef MOZ_FOLD_LIBS
+DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=nss3
+else
 DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
-DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../db/sqlite3/src
+DEFAULT_GMAKE_FLAGS += SQLITE_LIB_DIR=$(ABS_DIST)/../config/external/sqlite
+endif # MOZ_FOLD_LIBS
 DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include
+endif
 ifdef NSS_DISABLE_DBM 
 DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1
 endif
@@ -467,3 +475,4 @@ endif # MOZ_FOLD_LIBS
 # security/nss/lib/ckfw/builtins. See bug #836220.
 libs-nss/lib$(if $(MOZ_FOLD_LIBS),/ckfw): $(call mkdir_deps,$(DEPTH)/security/nss/lib/ckfw/builtins)
 
+endif

config/external/nss/crmf/moz.build

@@ -6,11 +6,14 @@
 
 Library('crmf')
 
-USE_LIBS += [
-    # The dependency on nss is not real, but is required to force the
-    # parent directory being built before this one. This has no
-    # practical effect on linkage, since the only thing linking crmf
-    # will need nss anyways.
-    'nss',
-    'static:/security/nss/lib/crmf/crmf',
-]
+if CONFIG['MOZ_SYSTEM_NSS']:
+    OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
+else:
+    USE_LIBS += [
+        # The dependency on nss is not real, but is required to force the
+        # parent directory being built before this one. This has no
+        # practical effect on linkage, since the only thing linking crmf
+        # will need nss anyways.
+        'nss',
+        'static:/security/nss/lib/crmf/crmf',
+    ]

config/external/nss/moz.build

@@ -6,7 +6,10 @@
 
 DIRS += ['crmf']
 
-if CONFIG['MOZ_FOLD_LIBS']:
+if CONFIG['MOZ_SYSTEM_NSS']:
+    Library('nss')
+    OS_LIBS += CONFIG['NSS_LIBS']
+elif CONFIG['MOZ_FOLD_LIBS']:
     GeckoSharedLibrary('nss', linkage=None)
     # TODO: The library name can be changed when bug 845217 is fixed.
     SHARED_LIBRARY_NAME = 'nss3'
@@ -29,10 +32,9 @@ else:
         '/security/nss/lib/smime/smime3',
         '/security/nss/lib/ssl/ssl3',
         '/security/nss/lib/util/nssutil3',
+        'sqlite',
     ]
 
-USE_LIBS += ['sqlite']
-
 # XXX: We should fix these warnings.
 ALLOW_COMPILER_WARNINGS = True
 

config/external/nss/nss.symbols

@@ -13,6 +13,7 @@
 PR_*
 PL_*
 #endif
+#include ../../../db/sqlite3/src/sqlite.symbols
 ATOB_AsciiToData
 ATOB_AsciiToData_Util
 ATOB_ConvertAsciiToItem
@@ -112,7 +113,6 @@ CERT_GetCertChainFromCert
 CERT_GetCertEmailAddress
 CERT_GetCertificateDer
 CERT_GetCertificateRequestExtensions
-CERT_GetCertKeyType
 CERT_GetCertTimes
 CERT_GetCertTrust
 CERT_GetCommonName
@@ -271,7 +271,6 @@ NSS_Init
 NSS_Initialize
 NSS_InitWithMerge
 NSS_IsInitialized
-NSS_OptionGet
 NSS_OptionSet
 NSS_NoDB_Init
 NSS_SecureMemcmp
@@ -385,7 +384,6 @@ PK11_GetNextSymKey
 PK11_GetPadMechanism
 PK11_GetPrivateKeyNickname
 PK11_GetPrivateModulusLen
-PK11_GetSlotFromPrivateKey
 PK11_GetSlotID
 PK11_GetSlotInfo
 PK11_GetSlotName

config/external/sqlite/moz.build

@@ -0,0 +1,22 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if CONFIG['MOZ_SYSTEM_SQLITE']:
+    Library('sqlite')
+    OS_LIBS += CONFIG['SQLITE_LIBS']
+else:
+    DIRS += ['../../../db/sqlite3/src']
+    if CONFIG['MOZ_FOLD_LIBS']:
+        Library('sqlite')
+        # When folding libraries, sqlite is actually in the nss library.
+        USE_LIBS += [
+            'nss',
+        ]
+    else:
+        SharedLibrary('sqlite')
+        SHARED_LIBRARY_NAME = 'mozsqlite3'
+
+        SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols'

config/milestone.txt

@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-4.6.0
+4.5.0

config/moz.build

@@ -29,6 +29,9 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT':
     # while the program here is in C.
     HostProgram('nsinstall_real', c_only=True)
 
+if CONFIG['MOZ_SYSTEM_ICU']:
+    DEFINES['MOZ_SYSTEM_ICU'] = True
+
 PYTHON_UNIT_TESTS += [
     'tests/test_mozbuild_reading.py',
     'tests/unit-expandlibs.py',

config/recurse.mk

@@ -172,7 +172,7 @@ ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)
 mozglue/build/target memory/replace/logalloc/replay/target: memory/replace/dummy/target
 endif
 endif
-ifeq (,$(MOZ_FOLD_LIBS))
+ifeq (,$(MOZ_SYSTEM_NSPR)$(MOZ_SYSTEM_NSS)$(MOZ_FOLD_LIBS))
 config/external/nss/target: config/external/nspr/pr/target config/external/nspr/ds/target config/external/nspr/libc/target
 endif
 # Most things are built during compile (target/host), but some things happen during export

config/system-headers

@@ -1253,6 +1253,9 @@ soundtouch/SoundTouchFactory.h
 #if MOZ_LIBAV_FFT==1
 libavcodec/avfft.h
 #endif
+#if MOZ_SYSTEM_PNG==1
+png.h
+#endif
 #if MOZ_SYSTEM_ZLIB==1
 zlib.h
 #endif
@@ -1273,7 +1276,11 @@ bzlib.h
 #ifdef MOZ_ENABLE_GIO
 gio/gio.h
 #endif
+#if MOZ_SYSTEM_LIBEVENT==1
+event.h
+#else
 sys/event.h
+#endif
 #ifdef MOZ_ENABLE_LIBPROXY
 proxy.h
 #endif
@@ -1288,6 +1295,15 @@ QtSparql/qsparqlresult.h
 #if MOZ_TREE_PIXMAN!=1
 pixman.h
 #endif
+#if MOZ_SYSTEM_LIBVPX==1
+vpx/svc_context.h
+vpx/vpx_codec.h
+vpx/vpx_decoder.h
+vpx/vpx_encoder.h
+vpx/vp8cx.h
+vpx/vp8dx.h
+vpx_mem/vpx_mem.h
+#endif
 gst/gst.h
 gst/app/gstappsink.h
 gst/app/gstappsrc.h
@@ -1300,6 +1316,22 @@ kvm.h
 spawn.h
 err.h
 xlocale.h
+#ifdef MOZ_SYSTEM_ICU
+unicode/locid.h
+unicode/numsys.h
+unicode/timezone.h
+unicode/ucal.h
+unicode/uchar.h
+unicode/uclean.h
+unicode/ucol.h
+unicode/udat.h
+unicode/udatpg.h
+unicode/uenum.h
+unicode/unorm.h
+unicode/unum.h
+unicode/ustring.h
+unicode/utypes.h
+#endif
 libutil.h
 unwind.h
 fenv.h

config/version_win.pl

@@ -93,7 +93,7 @@ if (!defined($official)) {$official="";}
 if (!defined($milestone)) {$milestone="";}
 if (!defined($module)) {$module="";}
 if (!defined($binary)) {$binary="";}
-if (!defined($displayname)) {$displayname="UXP";}
+if (!defined($displayname)) {$displayname="Mozilla";}
 if (!defined($appversion)) {$appversion=$milestone;}
 if (!defined($depth)) {$depth=".";}
 if (!defined($rcinclude)) {$rcinclude="";}
@@ -234,10 +234,10 @@ for ($j = 1; $j < 4; $j++)
 }
 my $winappversion = "$appver[0],$appver[1],$appver[2],$appver[3]";
 
-my $copyright = "License: MPL 2.0";
-my $company = "Moonchild Productions";
-my $trademarks = "Moonchild";
-my $productname = "UXP";
+my $copyright = "License: MPL 2";
+my $company = "Mozilla Foundation";
+my $trademarks = "Mozilla";
+my $productname = $displayname;
 
 
 if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}

db/mork/moz.build

@@ -3,8 +3,9 @@
 # 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/.
 
-DIRS += [
-    'public',
-    'src',
-    'build',
-]
+if not CONFIG['NSS_DISABLE_DBM'] and CONFIG['MOZ_MORK']:
+    DIRS += [
+        'public',
+        'src',
+        'build',
+    ]

db/moz.build

@@ -0,0 +1,11 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+if not CONFIG['NSS_DISABLE_DBM'] and CONFIG['MOZ_MORK']:
+    DIRS += [
+        'mork/public',
+        'mork/src',
+        'mork/build',
+    ]

db/sqlite3/src/moz.build

@@ -3,18 +3,25 @@
 # 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/.
-
 NO_VISIBILITY_FLAGS = True
 
+EXPORTS += [
+    'sqlite3.h',
+]
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-GeckoSharedLibrary('sqlite', linkage=None, mozglue='library')
-SHARED_LIBRARY_NAME = 'mozsqlite3'
-SYMBOLS_FILE = 'sqlite.symbols'
+if CONFIG['MOZ_FOLD_LIBS']:
+    # When folding libraries, sqlite is actually in the nss library.
+    FINAL_LIBRARY = 'nss'
+else:
+    # The final library is in config/external/sqlite
+    FINAL_LIBRARY = 'sqlite'
 
-EXPORTS += ['sqlite3.h']
-SOURCES += ['sqlite3.c']
+SOURCES += [
+    'sqlite3.c',
+]
 
 # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
 # don't have to vacuum to make sure the data is not visible in the file.
@@ -27,11 +34,8 @@ SOURCES += ['sqlite3.c']
 # hidden preference.  If that preference is missing or invalid then this value
 # will be used.
 # Note: Be sure to update the configure.in checks when these change!
-for var in ('SQLITE_SECURE_DELETE',
-            'SQLITE_THREADSAFE',
-            'SQLITE_CORE',
-            'SQLITE_ENABLE_FTS3',
-            'SQLITE_ENABLE_UNLOCK_NOTIFY',
+for var in ('SQLITE_SECURE_DELETE', 'SQLITE_THREADSAFE', 'SQLITE_CORE',
+            'SQLITE_ENABLE_FTS3', 'SQLITE_ENABLE_UNLOCK_NOTIFY',
             'SQLITE_ENABLE_DBSTAT_VTAB'):
     DEFINES[var] = 1
 
@@ -63,6 +67,10 @@ if CONFIG['MOZ_DEBUG']:
     DEFINES['SQLITE_DEBUG'] = 1
     DEFINES['SQLITE_ENABLE_API_ARMOR'] = True
 
+if CONFIG['OS_TARGET'] == 'Android':
+    # default to user readable only to fit Android security model
+    DEFINES['SQLITE_DEFAULT_FILE_PERMISSIONS'] = '0600'
+
 # Force using malloc_usable_size when building with jemalloc because _msize
 # causes assertions on Win64. See bug 719579.
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
@@ -78,7 +86,10 @@ DEFINES['SQLITE_OMIT_DECLTYPE'] = True
 # performance and doesn't suffer from a full separate tmp partition.
 # Exclude 32bit platforms due to address space fragmentation issues.
 # System Sqlite is managed through a PRAGMA instead.
-if CONFIG['HAVE_64BIT_BUILD']:
+if CONFIG['OS_TARGET'] == 'Android':
+    # On Android there's no tmp partition, so always use a MEMORY temp store.
+    DEFINES['SQLITE_TEMP_STORE'] = 3
+elif CONFIG['HAVE_64BIT_BUILD']:
     # On 64bit platforms default to a MEMORY temp store for performance.
     DEFINES['SQLITE_TEMP_STORE'] = 2
 

devtools/client/debugger/new/bundle.js

@@ -9828,7 +9828,7 @@ var Debugger =
 	        var host = httpActivity.hostname;
 	
 	        info.hsts = sss.isSecureHost(sss.HEADER_HSTS, host, flags);
-	        info.hpkp = false;
+	        info.hpkp = sss.isSecureHost(sss.HEADER_HPKP, host, flags);
 	      } else {
 	        DevToolsUtils.reportException("NetworkHelper.parseSecurityInfo", "Could not get HSTS/HPKP status as hostname is not available.");
 	        info.hsts = false;

devtools/client/shared/curl.js

@@ -58,21 +58,9 @@ const Curl = {
    *         A cURL command.
    */
   generateCommand: function (data) {
-    const utils = CurlUtils;
+    let utils = CurlUtils;
 
     let command = ["curl"];
-
-    // Make sure to use the following helpers to sanitize arguments before execution.
-    const addParam = value => {
-      const safe = /^[a-zA-Z-]+$/.test(value) ? value : escapeString(value);
-      command.push(safe);
-    };
-
-    const addPostData = value => {
-      const safe = /^[a-zA-Z-]+$/.test(value) ? value : escapeString(value);
-      postData.push(safe);
-    };
-
     let ignoredHeaders = new Set();
 
     // The cURL command is expected to run on the same platform that Firefox runs
@@ -81,7 +69,7 @@ const Curl = {
                        utils.escapeStringWin : utils.escapeStringPosix;
 
     // Add URL.
-    addParam(data.url);
+    command.push(escapeString(data.url));
 
     let postDataText = null;
     let multipartRequest = utils.isMultipartRequest(data);
@@ -91,15 +79,15 @@ const Curl = {
     if (utils.isUrlEncodedRequest(data) ||
           ["PUT", "POST", "PATCH"].includes(data.method)) {
       postDataText = data.postDataText;
-      addPostData("--data-raw");
-      addPostData(utils.writePostDataTextParams(postDataText));
+      postData.push("--data");
+      postData.push(escapeString(utils.writePostDataTextParams(postDataText)));
       ignoredHeaders.add("content-length");
     } else if (multipartRequest) {
       postDataText = data.postDataText;
-      addPostData("--data-binary");
+      postData.push("--data-binary");
       let boundary = utils.getMultipartBoundary(data);
       let text = utils.removeBinaryDataFromMultipartText(postDataText, boundary);
-      addPostData(text);
+      postData.push(escapeString(text));
       ignoredHeaders.add("content-length");
     }
 
@@ -107,15 +95,15 @@ const Curl = {
     // For GET and POST requests this is not necessary as GET is the
     // default. If --data or --binary is added POST is the default.
     if (!(data.method == "GET" || data.method == "POST")) {
-      addParam("-X");
-      addParam(data.method);
+      command.push("-X");
+      command.push(data.method);
     }
 
     // Add -I (HEAD)
     // For servers that supports HEAD.
     // This will fetch the header of a document only.
     if (data.method == "HEAD") {
-      addParam("-I");
+      command.push("-I");
     }
 
     // Add http version.
@@ -126,7 +114,7 @@ const Curl = {
       // data.httpVersion are HTTP/1.0, HTTP/1.1 and HTTP/2.0
       // So in case of HTTP/2.0 (which should ideally be HTTP/2) we are using
       // only major version, and full version in other cases
-      addParam("--http" + (version == "2.0" ? version.split(".")[0] : version));
+      command.push("--http" + (version == "2.0" ? version.split(".")[0] : version));
     }
 
     // Add request headers.
@@ -138,14 +126,14 @@ const Curl = {
     for (let i = 0; i < headers.length; i++) {
       let header = headers[i];
       if (header.name.toLowerCase() === "accept-encoding") {
-        addParam("--compressed");
+        command.push("--compressed");
         continue;
       }
       if (ignoredHeaders.has(header.name.toLowerCase())) {
         continue;
       }
-      addParam("-H");
-      addParam(header.name + ": " + header.value);
+      command.push("-H");
+      command.push(escapeString(header.name + ": " + header.value));
     }
 
     // Add post data.
@@ -400,12 +388,7 @@ const CurlUtils = {
    * Credit: Google DevTools
    */
   escapeStringWin: function (str) {
-    /* 
-       Replace dollar sign because of commands (e.g $(cmd.exe)) in
-       powershell when using double quotes.
-       Useful details http://www.rlmueller.net/PowerShellEscape.htm
-
-       Replace quote by double quote (but not by \") because it is
+    /* Replace quote by double quote (but not by \") because it is
        recognized by both cmd.exe and MS Crt arguments parser.
 
        Replace % by "%" because it could be expanded to an environment
@@ -419,8 +402,7 @@ const CurlUtils = {
        Replace new line outside of quotes since cmd.exe doesn't let
        to do it inside.
     */
-    return "\"" + str.replace(/\$/g, "`$")
-                     .replace(/"/g, "\"\"")
+    return "\"" + str.replace(/"/g, "\"\"")
                      .replace(/%/g, "\"%\"")
                      .replace(/\\/g, "\\\\")
                      .replace(/[\r\n]+/g, "\"^$&\"") + "\"";

devtools/moz.build

@@ -4,14 +4,20 @@
 # 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/.
 
-DIRS += [
-    'server',
-    'shared',
-]
-
 if CONFIG['MOZ_DEVTOOLS']:
     DIRS += ['client']
 
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DIRS += [
+        'server',
+        'shared',
+    ]
+else:
+  DIRS += [
+      'shared/heapsnapshot',
+      'shared/jsinspector',
+  ]
+
 # /browser uses DIST_SUBDIR.  We opt-in to this treatment when building
 # DevTools for the browser to keep the root omni.ja slim for use by external XUL
 # apps.  Mulet also uses this since it includes /browser.

devtools/shared/heapsnapshot/moz.build

@@ -4,12 +4,60 @@
 # 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/.
 
-DevToolsModules(
-    'census-tree-node.js',
-    'CensusUtils.js',
-    'DominatorTreeNode.js',
-    'HeapAnalysesClient.js',
-    'HeapAnalysesWorker.js',
-    'HeapSnapshotFileUtils.js',
-    'shortest-paths.js',
-)
+with Files('**'):
+    BUG_COMPONENT = ('Firefox', 'Developer Tools: Memory')
+
+if CONFIG['ENABLE_TESTS']:
+    DIRS += ['tests/gtest']
+
+XPCSHELL_TESTS_MANIFESTS += [ 'tests/unit/xpcshell.ini' ]
+MOCHITEST_MANIFESTS += [ 'tests/mochitest/mochitest.ini' ]
+MOCHITEST_CHROME_MANIFESTS += [ 'tests/mochitest/chrome.ini' ]
+
+EXPORTS.mozilla.devtools += [
+    'AutoMemMap.h',
+    'CoreDump.pb.h',
+    'DeserializedNode.h',
+    'DominatorTree.h',
+    'FileDescriptorOutputStream.h',
+    'HeapSnapshot.h',
+    'HeapSnapshotTempFileHelperChild.h',
+    'HeapSnapshotTempFileHelperParent.h',
+    'ZeroCopyNSIOutputStream.h',
+]
+
+IPDL_SOURCES += [
+    'PHeapSnapshotTempFileHelper.ipdl',
+]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+SOURCES += [
+    'AutoMemMap.cpp',
+    'CoreDump.pb.cc',
+    'DeserializedNode.cpp',
+    'DominatorTree.cpp',
+    'FileDescriptorOutputStream.cpp',
+    'HeapSnapshot.cpp',
+    'HeapSnapshotTempFileHelperParent.cpp',
+    'ZeroCopyNSIOutputStream.cpp',
+]
+
+# Disable RTTI in google protocol buffer
+DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
+
+FINAL_LIBRARY = 'xul'
+
+if CONFIG['MOZ_DEVTOOLS_SERVER']:
+    DevToolsModules(
+        'census-tree-node.js',
+        'CensusUtils.js',
+        'DominatorTreeNode.js',
+        'HeapAnalysesClient.js',
+        'HeapAnalysesWorker.js',
+        'HeapSnapshotFileUtils.js',
+        'shortest-paths.js',
+    )
+
+if CONFIG['GNU_CXX']:
+    CXXFLAGS += ['-Wno-error=shadow']