Re-unify most of gfx

Re-unify most of the layout engine
Re-unify most of DOM
2022-09-08 16:50:40 +00:00 · 2022-09-07 13:04:19 +00:00 · 2022-09-07 12:47:24 +00:00
17230 changed files with 1867159 additions and 1511214 deletions
@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.

-Switching to C++17 requires CLOBBER to pick up compiler conf. (Issue #2281)
+Issue #1971 - Update to ICU 63 requires clobber
@@ -160,12 +160,18 @@ endif
 .PHONY: install-manifests
 install-manifests: $(addprefix install-,$(install_manifests))

-.PHONY: $(addprefix install-,$(install_manifests))
-$(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
-	$(addprefix $(call py_action,process_install_manifest,--track install_$(subst /,_,$*).track $*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))
+# 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

-# Dummy wrapper rule to allow the faster backend to piggy back
-$(addprefix install-,$(subst /,_,$(filter dist/%,$(install_manifests)))): install-dist_%: install-dist/% ;
+.PHONY: $(addprefix install-,$(subst /,_,$(install_manifests)))
+$(addprefix install-,$(install_manifests)): install-%: $(install_manifest_depends)
+	$(addprefix $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))

 .PHONY: install-tests
 install-tests: install-test-files
@@ -175,9 +181,10 @@ 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,--track install__test_files.track _tests _build_manifests/install/_test_files)
+	$(call py_action,process_install_manifest,--no-remove _tests _build_manifests/install/_test_files)

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

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

 # For historical reasons that are unknown, $(DIST)/sdk is always blown away
@@ -33,7 +33,5 @@ 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?
-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).
+## 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).
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -7,10 +7,6 @@
 * ROLE(geckoRole, stringRole, atkRole, macRole, msaaRole, ia2Role, nameRule)
 */

-#ifndef NSAccessibilityCellRole
-#define NSAccessibilityCellRole NSAccessibilityUnknownRole
-#endif
-
 ROLE(NOTHING,
     "nothing",
     ATK_ROLE_UNKNOWN,
@@ -18,6 +18,10 @@
 #include "mozilla/AppUnits.h"
 #include "mozilla/gfx/2D.h"

+#if defined(MOZ_WIDGET_GTK)
+#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
+#endif
+
 using namespace mozilla;
 using namespace mozilla::a11y;

@@ -649,14 +653,28 @@ TextAttrsMgr::FontWeightTextAttr::
  if (font->IsSyntheticBold())
    return 700;

-  // On Windows, font->GetStyle()->weight will give the same weight as
-  // fontEntry->Weight(), the weight of the first font in the font group,
-  // which may not be the weight of the font face used to render the
-  // characters. On Mac, font->GetStyle()->weight will just give the same
-  // number as getComputedStyle(). fontEntry->Weight() will give the weight
-  // of the font face used.
-  gfxFontEntry *fontEntry = font->GetFontEntry();
-  return fontEntry->Weight();
+  bool useFontEntryWeight = true;
+
+  // Under Linux, when gfxPangoFontGroup code is used,
+  // font->GetStyle()->weight will give the absolute weight requested of the
+  // font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor
+  // which doesn't initialize the weight field.
+#if defined(MOZ_WIDGET_GTK)
+  useFontEntryWeight = gfxPlatformGtk::UseFcFontList();
+#endif
+
+  if (useFontEntryWeight) {
+    // On Windows, font->GetStyle()->weight will give the same weight as
+    // fontEntry->Weight(), the weight of the first font in the font group,
+    // which may not be the weight of the font face used to render the
+    // characters. On Mac, font->GetStyle()->weight will just give the same
+    // number as getComputedStyle(). fontEntry->Weight() will give the weight
+    // of the font face used.
+    gfxFontEntry *fontEntry = font->GetFontEntry();
+    return fontEntry->Weight();
+  } else {
+    return font->GetStyle()->weight;
+  }
 }

 ////////////////////////////////////////////////////////////////////////////////
@@ -44,9 +44,7 @@
 #ifdef XP_WIN
 #include "mozilla/a11y/Compatibility.h"
 #include "mozilla/dom/ContentChild.h"
-#ifdef MOZ_ENABLE_NPAPI
 #include "HTMLWin32ObjectAccessible.h"
-#endif
 #include "mozilla/StaticPtr.h"
 #endif

@@ -57,9 +55,7 @@
 #include "nsImageFrame.h"
 #include "nsIObserverService.h"
 #include "nsLayoutUtils.h"
-#ifdef MOZ_ENABLE_NPAPI
 #include "nsPluginFrame.h"
-#endif
 #include "nsSVGPathGeometryFrame.h"
 #include "nsTreeBodyFrame.h"
 #include "nsTreeColumns.h"
@@ -83,7 +79,7 @@
 #include "XULTabAccessible.h"
 #include "XULTreeGridAccessibleWrap.h"

-#if (defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)) && defined(MOZ_ENABLE_NPAPI)
+#if defined(XP_WIN) || defined(MOZ_ACCESSIBILITY_ATK)
 #include "nsNPAPIPluginInstance.h"
 #endif

@@ -435,7 +431,6 @@ private:
 NS_IMPL_ISUPPORTS(PluginTimerCallBack, nsITimerCallback)
 #endif

-#ifdef MOZ_ENABLE_NPAPI
 already_AddRefed<Accessible>
 nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,
                                               nsIContent* aContent,
@@ -498,7 +493,6 @@ nsAccessibilityService::CreatePluginAccessible(nsPluginFrame* aFrame,

  return nullptr;
 }
-#endif // MOZ_ENABLE_NPAPI

 void
 nsAccessibilityService::DeckPanelSwitched(nsIPresShell* aPresShell,
@@ -1644,13 +1638,11 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame,
    case eOuterDocType:
      newAcc = new OuterDocAccessible(aContent, document);
      break;
-#ifdef MOZ_ENABLE_NPAPI
    case ePluginType: {
      nsPluginFrame* pluginFrame = do_QueryFrame(aFrame);
      newAcc = CreatePluginAccessible(pluginFrame, aContent, aContext);
      break;
    }
-#endif
    case eTextLeafType:
      newAcc = new TextLeafAccessibleWrap(aContent, document);
      break;
@@ -20,9 +20,7 @@
 class nsImageFrame;
 class nsIArray;
 class nsIPersistentProperties;
-#ifdef MOZ_ENABLE_NPAPI
 class nsPluginFrame;
-#endif
 class nsITreeView;

 namespace mozilla {
@@ -89,11 +87,9 @@ public:

  Accessible* GetRootDocumentAccessible(nsIPresShell* aPresShell,
                                        bool aCanCreate);
-#ifdef MOZ_ENABLE_NPAPI
  already_AddRefed<Accessible>
    CreatePluginAccessible(nsPluginFrame* aFrame, nsIContent* aContent,
                           Accessible* aContext);
-#endif

  /**
   * Adds/remove ATK root accessible for gtk+ native window to/from children
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -486,14 +486,13 @@ DocAccessibleParent::SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy)
  IAccessibleHolder holder(Move(ptr));
  Unused << SendParentCOMProxy(holder);
 }
-#ifdef MOZ_ENABLE_NPAPI
+
 bool
 DocAccessibleParent::RecvGetWindowedPluginIAccessible(
      const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy)
 {
  return false;
 }
-#endif

 #endif // defined(XP_WIN)

@@ -143,11 +143,10 @@ public:

 #if defined(XP_WIN)
  void SetCOMProxy(const RefPtr<IAccessible>& aCOMProxy);
-#ifdef MOZ_ENABLE_NPAPI
+
  virtual bool RecvGetWindowedPluginIAccessible(
      const WindowsHandle& aHwnd, IAccessibleHolder* aPluginCOMProxy) override;
-#endif // MOZ_ENABLE_NPAPI
-#endif // XP_WIN
+#endif

 private:

@@ -177,7 +176,7 @@ private:
  uint32_t AddSubtree(ProxyAccessible* aParent,
                      const nsTArray<AccessibleData>& aNewTree, uint32_t aIdx,
                      uint32_t aIdxInParent);
-  [[nodiscard]] bool CheckDocTree() const;
+  MOZ_MUST_USE bool CheckDocTree() const;
  xpcAccessibleGeneric* GetXPCAccessible(ProxyAccessible* aProxy);

  nsTArray<DocAccessibleParent*> mChildDocs;
@@ -61,10 +61,8 @@ parent:
   */
  async BindChildDoc(PDocAccessible aChildDoc, uint64_t aID);

-#ifdef MOZ_ENABLE_NPAPI
  sync GetWindowedPluginIAccessible(WindowsHandle aHwnd)
    returns (IAccessibleHolder aPluginCOMProxy);
-#endif

 child:
  async ParentCOMProxy(IAccessibleHolder aParentCOMProxy);
@@ -8,7 +8,7 @@ if CONFIG['COMPILE_ENVIRONMENT']:

 # With --disable-accessibility, we need to compile PDocAccessible.ipdl (which
 # also depends on COMPtrTypes.h), but not the C++.
-PREPROCESSED_IPDL_SOURCES += ['PDocAccessible.ipdl']
+IPDL_SOURCES += ['PDocAccessible.ipdl']
 EXPORTS.mozilla.a11y += ['COMPtrTypes.h']

 if CONFIG['ACCESSIBILITY']:
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
 /* 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/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -295,7 +295,6 @@ enum CheckboxValue {

@implementation mozPaneAccessible

-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 - (NSUInteger)accessibilityArrayAttributeCount:(NSString*)attribute
 {
  AccessibleWrap* accWrap = [self getGeckoAccessible];
@@ -314,7 +313,6 @@ enum CheckboxValue {

  return [super accessibilityArrayAttributeCount:attribute];
 }
-#endif

 - (NSArray*)children
 {
@@ -1,4 +1,6 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -47,24 +49,6 @@ ConvertToNSArray(nsTArray<ProxyAccessible*>& aArray)
  return nativeArray;
 }

-// Convert to an object without @ syntax
-static inline id
-ConvertToId(NSInteger val)
-{
-    return [NSString stringWithFormat:@"%i", val];
-}
-
-// Missing from SDK 10.5
-#if !defined(MAC_OS_X_VERSION_10_6) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6)
-#define __IntToNSString(x) ([NSString stringWithFormat:@"%i", x])
-#define NSAccessibilityRowIndexRangeAttribute @"AXRowIndexRange"
-#define NSAccessibilityColumnIndexRangeAttribute @"AXColumnIndexRange"
-#define NSAccessibilityRowHeaderUIElementsAttribute @"AXRowHeaderUIElements"
-#define NSAccessibilityColumnHeaderUIElementsAttribute @"AXColumnHeaderUIElements"
-#define NSAccessibilityRowCountAttribute @"AXRowCount"
-#define NSAccessibilityColumnCountAttribute @"AXColumnCount"
-#endif
-
@implementation mozTablePartAccessible
 - (BOOL)isLayoutTablePart;
 {
@@ -101,14 +85,10 @@ ConvertToId(NSInteger val)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
-#else
-  NSArray* additionalAttributes = [[NSArray alloc] init];
-#endif

  static NSArray* tableAttrs = nil;
  if (!tableAttrs) {
@@ -130,9 +110,9 @@ ConvertToId(NSInteger val)
  if (AccessibleWrap* accWrap = [self getGeckoAccessible]) {
    TableAccessible* table = accWrap->AsTable();
    if ([attribute isEqualToString:NSAccessibilityRowCountAttribute])
-      return ConvertToId(table->RowCount());
+      return @(table->RowCount());
    if ([attribute isEqualToString:NSAccessibilityColumnCountAttribute])
-      return ConvertToId(table->ColCount());
+      return @(table->ColCount());
    if ([attribute isEqualToString:NSAccessibilityRowsAttribute]) {
      // Create a new array with the list of table rows.
      NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
@@ -149,9 +129,9 @@ ConvertToId(NSInteger val)
    }
  } else if (ProxyAccessible* proxy = [self getProxyAccessible]) {
    if ([attribute isEqualToString:NSAccessibilityRowCountAttribute])
-      return ConvertToId(proxy->TableRowCount());
+      return @(proxy->TableRowCount());
    if ([attribute isEqualToString:NSAccessibilityColumnCountAttribute])
-      return ConvertToId(proxy->TableColumnCount());
+      return @(proxy->TableColumnCount());
    if ([attribute isEqualToString:NSAccessibilityRowsAttribute]) {
      // Create a new array with the list of table rows.
      NSMutableArray* nativeArray = [[NSMutableArray alloc] init];
@@ -177,14 +157,10 @@ ConvertToId(NSInteger val)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
-#else
-  NSArray* additionalAttributes = [[NSArray alloc] init];
-#endif

  static NSArray* tableRowAttrs = nil;
  if (!tableRowAttrs) {
@@ -240,14 +216,10 @@ ConvertToId(NSInteger val)
 {
  NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NIL;

-#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
  NSArray* additionalAttributes = [super additionalAccessibilityAttributeNames];
  if ([self isLayoutTablePart]) {
    return additionalAttributes;
  }
-#else
-  NSArray* additionalAttributes = [[NSArray alloc] init];
-#endif

  static NSArray* tableCellAttrs = nil;
  if (!tableCellAttrs) {
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
 /* 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/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -173,7 +173,7 @@ public: // construction, destruction
  /**
   * Find an accessible by the given child ID in cached documents.
   */
-  [[nodiscard]] already_AddRefed<IAccessible>
+  MOZ_MUST_USE already_AddRefed<IAccessible>
  GetIAccessibleFor(const VARIANT& aVarChild, bool* aIsDefunct);

  virtual void GetNativeInterface(void **aOutAccessible) override;
@@ -198,7 +198,7 @@ protected:
  /**
   * Find a remote accessible by the given child ID.
   */
-  [[nodiscard]] already_AddRefed<IAccessible>
+  MOZ_MUST_USE already_AddRefed<IAccessible>
  GetRemoteIAccessibleFor(const VARIANT& aVarChild);

  /**
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
 /* 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/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
 /* 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/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -38,13 +38,6 @@ SOURCES += [
    'XULTreeGridAccessibleWrap.cpp',
 ]

-if CONFIG['MOZ_ENABLE_NPAPI']:
-    SOURCES += [
-        'HTMLWin32ObjectAccessible.cpp',
-    ]
-
-
-
 LOCAL_INCLUDES += [
    '/accessible/base',
    '/accessible/generic',
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
+ */
 /* 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/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,4 +1,6 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=2:
+ */
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1,80 +0,0 @@
-dnl Map old names of Autoconf macros to new regularized names.
-dnl This file is part of Autoconf.
-dnl Copyright (C) 1994 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl General macros.
-dnl
-define(AC_WARN, [indir([AC_MSG_WARN], $@)])dnl
-define(AC_ERROR, [indir([AC_MSG_ERROR], $@)])dnl
-AC_DEFUN(AC_PROGRAM_CHECK, [indir([AC_CHECK_PROG], $@)])dnl
-AC_DEFUN(AC_PROGRAM_PATH, [indir([AC_PATH_PROG], $@)])dnl
-AC_DEFUN(AC_PROGRAMS_CHECK, [indir([AC_CHECK_PROGS], $@)])dnl
-AC_DEFUN(AC_PROGRAMS_PATH, [indir([AC_PATH_PROGS], $@)])dnl
-AC_DEFUN(AC_PREFIX, [indir([AC_PREFIX_PROGRAM], $@)])dnl
-AC_DEFUN(AC_HEADER_EGREP, [indir([AC_EGREP_HEADER], $@)])dnl
-AC_DEFUN(AC_PROGRAM_EGREP, [indir([AC_EGREP_CPP], $@)])dnl
-AC_DEFUN(AC_TEST_PROGRAM, [indir([AC_TRY_RUN], $@)])dnl
-AC_DEFUN(AC_TEST_CPP, [indir([AC_TRY_CPP], $@)])dnl
-AC_DEFUN(AC_HEADER_CHECK, [indir([AC_CHECK_HEADER], $@)])dnl
-AC_DEFUN(AC_FUNC_CHECK, [indir([AC_CHECK_FUNC], $@)])dnl
-AC_DEFUN(AC_HAVE_FUNCS, [indir([AC_CHECK_FUNCS], $@)])dnl
-AC_DEFUN(AC_HAVE_HEADERS, [indir([AC_CHECK_HEADERS], $@)])dnl
-AC_DEFUN(AC_SIZEOF_TYPE, [indir([AC_CHECK_SIZEOF], $@)])dnl
-dnl
-dnl Specific macros.
-dnl
-AC_DEFUN(AC_GCC_TRADITIONAL, [indir([AC_PROG_GCC_TRADITIONAL])])dnl
-AC_DEFUN(AC_MINUS_C_MINUS_O, [indir([AC_PROG_CC_C_O])])dnl
-AC_DEFUN(AC_SET_MAKE, [indir([AC_PROG_MAKE_SET])])dnl
-AC_DEFUN(AC_YYTEXT_POINTER, [indir([AC_DECL_YYTEXT])])dnl
-AC_DEFUN(AC_LN_S, [indir([AC_PROG_LN_S])])dnl
-AC_DEFUN(AC_STDC_HEADERS, [indir([AC_HEADER_STDC])])dnl
-AC_DEFUN(AC_MAJOR_HEADER, [indir([AC_HEADER_MAJOR])])dnl
-AC_DEFUN(AC_STAT_MACROS_BROKEN, [indir([AC_HEADER_STAT])])dnl
-AC_DEFUN(AC_SYS_SIGLIST_DECLARED, [indir([AC_DECL_SYS_SIGLIST])])dnl
-AC_DEFUN(AC_GETGROUPS_T, [indir([AC_TYPE_GETGROUPS])])dnl
-AC_DEFUN(AC_UID_T, [indir([AC_TYPE_UID_T])])dnl
-AC_DEFUN(AC_SIZE_T, [indir([AC_TYPE_SIZE_T])])dnl
-AC_DEFUN(AC_PID_T, [indir([AC_TYPE_PID_T])])dnl
-AC_DEFUN(AC_OFF_T, [indir([AC_TYPE_OFF_T])])dnl
-AC_DEFUN(AC_MODE_T, [indir([AC_TYPE_MODE_T])])dnl
-AC_DEFUN(AC_RETSIGTYPE, [indir([AC_TYPE_SIGNAL])])dnl
-AC_DEFUN(AC_MMAP, [indir([AC_FUNC_MMAP])])dnl
-AC_DEFUN(AC_VPRINTF, [indir([AC_FUNC_VPRINTF])])dnl
-AC_DEFUN(AC_VFORK, [indir([AC_FUNC_VFORK])])dnl
-AC_DEFUN(AC_WAIT3, [indir([AC_FUNC_WAIT3])])dnl
-AC_DEFUN(AC_ALLOCA, [indir([AC_FUNC_ALLOCA])])dnl
-AC_DEFUN(AC_GETLOADAVG, [indir([AC_FUNC_GETLOADAVG])])dnl
-AC_DEFUN(AC_UTIME_NULL, [indir([AC_FUNC_UTIME_NULL])])dnl
-AC_DEFUN(AC_STRCOLL, [indir([AC_FUNC_STRCOLL])])dnl
-AC_DEFUN(AC_SETVBUF_REVERSED, [indir([AC_FUNC_SETVBUF_REVERSED])])dnl
-AC_DEFUN(AC_TIME_WITH_SYS_TIME, [indir([AC_HEADER_TIME])])dnl
-AC_DEFUN(AC_TIMEZONE, [indir([AC_STRUCT_TIMEZONE])])dnl
-AC_DEFUN(AC_ST_BLOCKS, [indir([AC_STRUCT_ST_BLOCKS])])dnl
-AC_DEFUN(AC_ST_BLKSIZE, [indir([AC_STRUCT_ST_BLKSIZE])])dnl
-AC_DEFUN(AC_ST_RDEV, [indir([AC_STRUCT_ST_RDEV])])dnl
-AC_DEFUN(AC_CROSS_CHECK, [indir([AC_C_CROSS])])dnl
-AC_DEFUN(AC_CHAR_UNSIGNED, [indir([AC_C_CHAR_UNSIGNED])])dnl
-AC_DEFUN(AC_LONG_DOUBLE, [indir([AC_C_LONG_DOUBLE])])dnl
-AC_DEFUN(AC_WORDS_BIGENDIAN, [indir([AC_C_BIGENDIAN])])dnl
-AC_DEFUN(AC_INLINE, [indir([AC_C_INLINE])])dnl
-AC_DEFUN(AC_CONST, [indir([AC_C_CONST])])dnl
-AC_DEFUN(AC_LONG_FILE_NAMES, [indir([AC_SYS_LONG_FILE_NAMES])])dnl
-AC_DEFUN(AC_RESTARTABLE_SYSCALLS, [indir([AC_SYS_RESTARTABLE_SYSCALLS])])dnl
-AC_DEFUN(AC_FIND_X, [indir([AC_PATH_X])])dnl
-AC_DEFUN(AC_FIND_XTRA, [indir([AC_PATH_XTRA])])dnl
@@ -1,28 +0,0 @@
-dnl Driver that loads the Autoconf macro files.
-dnl Requires GNU m4.
-dnl This file is part of Autoconf.
-dnl Copyright (C) 1994 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-dnl 02111-1307, USA.
-dnl
-dnl Written by David MacKenzie.
-dnl
-include(acgeneral.m4)dnl
-builtin(include, acspecific.m4)dnl
-builtin(include, acoldnames.m4)dnl
-dnl Do not sinclude acsite.m4 here, because it may not be installed
-dnl yet when Autoconf is frozen.
-dnl Do not sinclude ./aclocal.m4 here, to prevent it from being frozen.
@@ -1,159 +0,0 @@
-#! @SHELL@
-# autoconf -- create `configure' using m4 macros
-# Copyright (C) 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# If given no args, create `configure' from template file `configure.in'.
-# With one arg, create a configure script on standard output from
-# the given template file.
-
-usage="\
-Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir]
-       [-l dir] [--localdir=dir] [--version] [template-file]"
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-: ${AC_MACRODIR=@datadir@}
-: ${M4=@M4@}
-: ${AWK=@AWK@}
-case "${M4}" in
-/*) # Handle the case that m4 has moved since we were configured.
-    # It may have been found originally in a build directory.
-    test -f "${M4}" || M4=m4 ;;
-esac
-
-: ${TMPDIR=/tmp}
-tmpout=${TMPDIR}/acout.$$
-localdir=
-show_version=no
-
-while test $# -gt 0 ; do
-   case "${1}" in
-      -h | --help | --h* )
-         echo "${usage}" 1>&2; exit 0 ;;
-      --localdir=* | --l*=* )
-         localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
-         shift ;;
-      -l | --localdir | --l*)
-         shift
-         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-         localdir="${1}"
-         shift ;;
-      --macrodir=* | --m*=* )
-         AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`"
-         shift ;;
-      -m | --macrodir | --m* )
-         shift
-         test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-         AC_MACRODIR="${1}"
-         shift ;;
-      --version | --v* )
-         show_version=yes; shift ;;
-      -- )     # Stop option processing
-        shift; break ;;
-      - )	# Use stdin as input.
-        break ;;
-      -* )
-        echo "${usage}" 1>&2; exit 1 ;;
-      * )
-        break ;;
-   esac
-done
-
-if test $show_version = yes; then
-  version=`sed -n 's/define.AC_ACVERSION.[ 	]*\([0-9.]*\).*/\1/p' \
-    $AC_MACRODIR/acgeneral.m4`
-  echo "Autoconf version $version"
-  exit 0
-fi
-
-case $# in
-  0) infile=configure.in ;;
-  1) infile="$1" ;;
-  *) echo "$usage" >&2; exit 1 ;;
-esac
-
-trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
-
-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
-if test z$infile = z-; then
-  infile=$tmpin
-  cat > $infile
-elif test ! -r "$infile"; then
-  echo "autoconf: ${infile}: No such file or directory" >&2
-  exit 1
-fi
-
-if test -n "$localdir"; then
-  use_localdir="-I$localdir -DAC_LOCALDIR=$localdir"
-else
-  use_localdir=
-fi
-
-# Use the frozen version of Autoconf if available.
-r= f=
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
-case `$M4 --help < /dev/null 2>&1` in
-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
-*traditional*) ;;
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
-esac
-
-$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
-  { rm -f $tmpin $tmpout; exit 2; }
-
-# You could add your own prefixes to pattern if you wanted to check for
-# them too, e.g. pattern='\(AC_\|ILT_\)', except that UNIX sed doesn't do
-# alternation.
-pattern="AC_"
-
-status=0
-if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then
-  echo "autoconf: Undefined macros:" >&2
-  sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout |
-    while read macro; do
-      grep -n "^[^#]*$macro" $infile /dev/null
-      test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro"
-    done | sort -u >&2
-  status=1
-fi
-
-if test $# -eq 0; then
-  exec 4> configure; chmod +x configure
-else
-  exec 4>&1
-fi
-
-# Put the real line numbers into configure to make config.log more helpful.
-$AWK '
-/__oline__/ { printf "%d:", NR + 1 }
-           { print }
-' $tmpout | sed '
-/__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/
-' >&4
-
-rm -f $tmpout
-
-exit $status
@@ -179,12 +179,10 @@ if test "$GNU_CC"; then
    CFLAGS="$CFLAGS -fno-math-errno -pipe"
    CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-math-errno -pipe"

-    case "${host_cpu}" in
-      i*86)
-        CFLAGS="$CFLAGS -msse2 -mfpmath=sse"
-        CXXFLAGS="$CXXFLAGS -msse2 -mfpmath=sse"
-        ;;
-    esac
+    if test "$CPU_ARCH" = "x86" -o "$CPU_ARCH" = "x86_64"; then
+      CFLAGS="$CFLAGS -msse2 -mfpmath=sse"
+      CXXFLAGS="$CXXFLAGS -msse2 -mfpmath=sse"
+    fi

    if test -z "$CLANG_CC"; then
        case "$CC_VERSION" in
@@ -192,9 +190,9 @@ if test "$GNU_CC"; then
            AC_MSG_ERROR([Unsupported GCC version.])
            ;;
        *)
-            # Lifetime Dead Store Elimination level 2 (default in GCC) breaks Goanna.
-            # Instead of completely disabling this optimization, we force level 1
-            # optimization instead with -flifetime-dse=1.
+            # Lifetime Dead Store Elimination level 2 (default in GCC6+) breaks Gecko.
+            # Instead of completely disabling this optimization on newer GCC's,
+            # we'll force them to use level 1 optimization with -flifetime-dse=1.
            # Add it first so that a mozconfig can override by setting CFLAGS/CXXFLAGS.
            CFLAGS="-flifetime-dse=1 $CFLAGS"
            CXXFLAGS="-flifetime-dse=1 $CXXFLAGS"
@@ -28,14 +28,17 @@ if test -n "$USE_ICU"; then
    fi
    MOZ_ICU_VERSION="$version"

-    ICU_DATA_FILE_BIG="icudt${version}b.dat"
+    # TODO: the l is actually endian-dependent
+    # We could make this set as 'l' or 'b' for little or big, respectively,
+    # but we'd need to check in a big-endian version of the file.
    ICU_DATA_FILE="icudt${version}l.dat"

    dnl We won't build ICU data as a separate file when building
-    dnl ICU as a shared library, as we need to fold the data into
-    dnl the shared library in order for consumers like Spidermonkey
-    dnl to use it without code duplication.
-    if test -z "$MOZ_SHARED_ICU"; then
+    dnl JS standalone so that embedders don't have to deal with it.
+    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
        MOZ_ICU_DATA_ARCHIVE=1
    else
        MOZ_ICU_DATA_ARCHIVE=
@@ -43,19 +46,17 @@ if test -n "$USE_ICU"; then
 fi

 AC_SUBST(MOZ_ICU_VERSION)
+AC_SUBST(ENABLE_INTL_API)
 AC_SUBST(USE_ICU)
-AC_SUBST(ICU_DATA_FILE_BIG)
 AC_SUBST(ICU_DATA_FILE)
 AC_SUBST(MOZ_ICU_DATA_ARCHIVE)
-AC_SUBST(MOZ_SHARED_ICU)

 if test -n "$USE_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
-    if test -z "$MOZ_SHARED_ICU"; then
-       AC_DEFINE(U_STATIC_IMPLEMENTATION)
-    fi
+    dnl We build ICU as a static library.
+    AC_DEFINE(U_STATIC_IMPLEMENTATION)
    dnl Source files that use ICU should have control over which parts of the ICU
    dnl namespace they want to use.
    AC_DEFINE(U_USING_ICU_NAMESPACE,0)
@@ -13,7 +13,7 @@ MOZ_ARG_ENABLE_BOOL(address-sanitizer,
    MOZ_ASAN= )
 if test -n "$MOZ_ASAN"; then
    MOZ_LLVM_HACKS=1
-    if test "$OS_ARCH" = "WINNT"; then
+    if test -n "$CLANG_CL"; then
        # Look for the ASan runtime binary
        if test "$CPU_ARCH" = "x86_64"; then
          MOZ_CLANG_RT_ASAN_LIB=clang_rt.asan_dynamic-x86_64.dll
@@ -27,14 +27,14 @@ if test -n "$MOZ_ASAN"; then
        fi
        AC_SUBST(MOZ_CLANG_RT_ASAN_LIB_PATH)
        # Suppressing errors in recompiled code.
-        if test -n "$CLANG_CL"; then
+        if test "$OS_ARCH" = "WINNT"; then
            CFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CFLAGS"
            CXXFLAGS="-fsanitize-blacklist=$_topsrcdir/build/sanitizers/asan_blacklist_win.txt $CXXFLAGS"
        fi
    fi
    CFLAGS="-fsanitize=address $CFLAGS"
    CXXFLAGS="-fsanitize=address $CXXFLAGS"
-    if test "$OS_ARCH" != "WINNT"; then
+    if test -z "$CLANG_CL"; then
        LDFLAGS="-fsanitize=address $LDFLAGS"
    fi
    AC_DEFINE(MOZ_ASAN)
@@ -80,40 +80,6 @@ if test -n "$MOZ_TSAN"; then
 fi
 AC_SUBST(MOZ_TSAN)

-dnl ========================================================
-dnl = Use Leak Sanitizer
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(leak-sanitizer,
-[  --enable-leak-sanitizer       Enable Leak Sanitizer (default=no)],
-   MOZ_LSAN=1,
-   MOZ_LSAN= )
-if test -n "$MOZ_LSAN"; then
-    MOZ_LLVM_HACKS=1
-    LDFLAGS="-fsanitize=leak $LDFLAGS"
-    AC_DEFINE(MOZ_LSAN)
-    MOZ_PATH_PROG(LLVM_SYMBOLIZER, llvm-symbolizer)
-fi
-AC_SUBST(MOZ_LSAN)
-
-dnl ========================================================
-dnl = Use Undefined Behavior Sanitizer
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(undefined-sanitizer,
-[  --enable-undefined-sanitizer       Enable Undefined Behavior Sanitizer (default=no)],
-   MOZ_UBSAN=1,
-   MOZ_UBSAN= )
-if test -n "$MOZ_UBSAN"; then
-    MOZ_LLVM_HACKS=1
-    CFLAGS="-fsanitize=undefined $CFLAGS"
-    CXXFLAGS="-fsanitize=undefined $CXXFLAGS"
-    if test -z "$CLANG_CL"; then
-        LDFLAGS="-fsanitize=undefined $LDFLAGS"
-    fi
-    AC_DEFINE(MOZ_UBSAN)
-    MOZ_PATH_PROG(LLVM_SYMBOLIZER, llvm-symbolizer)
-fi
-AC_SUBST(MOZ_UBSAN)
-
 # The LLVM symbolizer is used by all sanitizers
 AC_SUBST(LLVM_SYMBOLIZER)

@@ -33,3 +33,10 @@ endif
 # correctly.  Note that the binary produced here is a host tool and doesn't need
 # to be distributed.
 MACOSX_DEPLOYMENT_TARGET :=
+
+# Temporarily relax the requirements for libstdc++ symbol versions on static
+# analysis plugin in order to use a recent clang by accepting libstdc++ from
+# gcc 4.4.0 (GLIBCXX_3.4.11).
+ifdef CHECK_STDCXX
+CHECK_STDCXX = $(call CHECK_SYMBOLS,$(1),GLIBCXX,libstdc++,v[1] > 3 || (v[1] == 3 && v[2] == 4 && v[3] > 11))
+endif
@@ -58,11 +58,9 @@ FINAL_TARGET_FILES += ['/.gdbinit']
 FINAL_TARGET_PP_FILES += ['.gdbinit_python.in']
 OBJDIR_FILES += ['!/dist/bin/.gdbinit_python']

-# Install the clang runtime library for ASAN next to the binaries we produce.
-if CONFIG['MOZ_ASAN'] and CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']:
-    FINAL_TARGET_FILES += [CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]
-if CONFIG['LLVM_SYMBOLIZER']:
-    FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']]
+# Install the clang-cl runtime library for ASAN next to the binaries we produce.
+if CONFIG['MOZ_ASAN'] and CONFIG['CLANG_CL']:
+    FINAL_TARGET_FILES += ['%' + CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]

 if CONFIG['MOZ_APP_BASENAME']:
    FINAL_TARGET_PP_FILES += ['application.ini']
@@ -74,61 +74,6 @@ def check_headers(*headers, **kwargs):
    return checks


-# Determine whether to add a given flag to the given lists of flags for C or
-# C++ compilation.
-# - `flag` is the flag to test
-# - `cflags` is a @depends function for the list of C compiler flags to add to
-# - `cxxflags` is a @depends function for the list of C++ compiler flags to
-#   add to
-# - `test_flags` is a list of flags to pass to the compiler instead of merely
-#   passing `flag`. This is especially useful for checking warning flags. If
-#   this list is empty, `flag` will be passed on its own.
-# - `compiler` (optional) is the compiler to test against (c_compiler or
-#   cxx_compiler, from toolchain.configure). When omitted, both compilers
-#   are tested; the list of flags added to is dependent on the compiler tested.
-# - `when` (optional) is a @depends function or option name conditioning
-#   when the warning flag is wanted.
-# - `check`, when not set, skips checking whether the flag is supported and
-#   adds it to the list of flags unconditionally.
-@template
-def check_and_add_flags(flag, cflags, cxxflags, test_flags,
-                        compiler=None, when=None, check=True):
-    if compiler is not None:
-        compilers = (compiler,)
-    else:
-        compilers = (c_compiler, cxx_compiler)
-
-    if when is None:
-        when = always
-
-    if test_flags:
-        flags = test_flags
-    else:
-        flags = [flag]
-
-    for c in compilers:
-        assert c in (c_compiler, cxx_compiler)
-        lang, list_of_flags = {
-            c_compiler: ('C', cflags),
-            cxx_compiler: ('C++', cxxflags),
-        }[c]
-
-        @depends(c, when)
-        def result(c, when):
-            if when and c.type in ('clang', 'gcc'):
-                return True
-
-        if check:
-            result = c.try_compile(
-                flags=flags, when=result,
-                check_msg='whether the %s compiler supports %s' % (lang, flag))
-
-        @depends(result, list_of_flags)
-        def maybe_add_flag(result, list_of_flags):
-            if result:
-                list_of_flags.append(flag)
-
-
@depends(c_compiler)
 def warnings_cflags(c_compiler):
    return []
@@ -151,21 +96,48 @@ def warnings_cxxflags(cxx_compiler):
 #   for add_gcc_warning().
@template
 def check_and_add_gcc_warning(warning, compiler=None, when=None, check=True):
-    # GCC and clang will fail if given an unknown warning option like
-    # -Wfoobar. But later versions won't fail if given an unknown negated
-    # warning option like -Wno-foobar. So when we are checking for support
-    # of a negated warning option, we actually test the positive form, but
-    # add the negated form to the flags variable.
-    if warning.startswith('-Wno-') and not warning.startswith('-Wno-error='):
-        flags = ['-Werror', '-W' + warning[5:]]
-    elif warning.startswith('-Werror='):
-        flags = [warning]
+    if compiler:
+        compilers = (compiler,)
    else:
-        flags = ['-Werror', warning]
+        compilers = (c_compiler, cxx_compiler)

-    check_and_add_flags(warning, warnings_cflags, warnings_cxxflags,
-                        flags, compiler=compiler, when=when, check=check)
+    when = when or always

+    for c in compilers:
+        assert c in (c_compiler, cxx_compiler)
+        lang, warnings_flags = {
+            c_compiler: ('C', warnings_cflags),
+            cxx_compiler: ('C++', warnings_cxxflags),
+        }[c]
+
+        # GCC and clang will fail if given an unknown warning option like
+        # -Wfoobar. But later versions won't fail if given an unknown negated
+        # warning option like -Wno-foobar. So when we are checking for support
+        # of a negated warning option, we actually test the positive form, but
+        # add the negated form to the flags variable.
+        if (warning.startswith('-Wno-') and
+                not warning.startswith('-Wno-error=')):
+            flags = ['-Werror', '-W' + warning[5:]]
+        elif warning.startswith('-Werror='):
+            flags = [warning]
+        else:
+            flags = ['-Werror', warning]
+
+        @depends(c, when)
+        def result(c, when):
+            if when and c.type in ('clang', 'gcc'):
+                return True
+
+        if check:
+            result = c.try_compile(
+                flags=flags, when=result,
+                check_msg='whether the %s compiler supports %s' % (lang,
+                                                                   warning))
+
+        @depends(result, warnings_flags)
+        def maybe_add_flag(result, warnings_flags):
+            if result:
+                warnings_flags.append(warning)

 # Add the given warning to the list of warning flags for the build.
 # - `warning` is the warning flag (e.g. -Wfoo)
@@ -177,45 +149,3 @@ def check_and_add_gcc_warning(warning, compiler=None, when=None, check=True):
@template
 def add_gcc_warning(warning, compiler=None, when=None):
    check_and_add_gcc_warning(warning, compiler, when, check=False)
-
-
-# Like the warning checks above, but for general compilation flags.
-@dependable
-def compilation_cflags():
-    return []
-
-
-@dependable
-def compilation_cxxflags():
-    return []
-
-
-# Tests whether GCC or clang support the given compilation flag; if the flag
-# is supported, add it to the list of compilation flags for the build.
-# - `flag` is the flag to test
-# - `compiler` (optional) is the compiler to test against (c_compiler or
-#   cxx_compiler, from toolchain.configure). When omitted, both compilers
-#   are tested.
-# - `when` (optional) is a @depends function or option name conditioning
-#   when the warning flag is wanted.
-# - `check`, when not set, skips checking whether the flag is supported and
-#   adds it to the list of flags unconditionally. This is only meant for
-#   add_gcc_flag().
-@template
-def check_and_add_gcc_flag(flag, compiler=None, when=None, check=True):
-    flags = ['-Werror', flag]
-
-    check_and_add_flags(flag, compilation_cflags, compilation_cxxflags,
-                        flags, compiler=compiler, when=when, check=check)
-
-
-# Add the given flag to the list of flags for the build.
-# - `flag` is the flag (e.g. -fno-sized-deallocation)
-# - `compiler` (optional) is the compiler to add the flag for (c_compiler or
-#   cxx_compiler, from toolchain.configure). When omitted, the flag is added
-#   for both compilers.
-# - `when` (optional) is a @depends function or option name conditioning
-#   when the flag is wanted.
-@template
-def add_gcc_flag(warning, compiler=None, when=None):
-    check_and_add_gcc_flag(warning, compiler, when, check=False)
@@ -1,13 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; 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/.
-
-# We support C++14, but we don't want to enable the sized deallocation
-# facilities in C++14 yet.
-check_and_add_gcc_flag('-fno-sized-deallocation', compiler=cxx_compiler)
-
-# Please keep these last in this file.
-add_old_configure_assignment('_COMPILATION_CFLAGS', compilation_cflags)
-add_old_configure_assignment('_COMPILATION_CXXFLAGS', compilation_cxxflags)
@@ -499,14 +499,6 @@ set_config('INTEL_ARCHITECTURE', delayed_getattr(target_variables,
                                                 'INTEL_ARCHITECTURE'))
 set_config('TARGET_CPU', delayed_getattr(target, 'raw_cpu'))
 set_config('TARGET_OS', delayed_getattr(target, 'raw_os'))
-set_config('TARGET_ENDIANNESS', delayed_getattr(target, 'endianness'))
-
-@depends(target)
-def target_is_big_endian(target):
-    if target.endianness == 'big':
-        return True
-
-set_define('TARGET_ENDIAN_BIG', target_is_big_endian)


@depends(host)
@@ -599,9 +591,7 @@ imply_option('--enable-project', application)

@depends(check_build_environment, '--help')
 def default_project(build_env, help):
-    if build_env.topobjdir.endswith('/js/src'):
-        return 'js'
-    return 'xulrunner'
+    return 'js'

 option('--enable-project', nargs=1, default=default_project,
       help='Project to build')
@@ -648,7 +638,7 @@ def build_project(noncomm_build, project, external_source_dir, build_env, help):

    build_app = project[0]

-    if not external_source_dir and build_app not in ('xulrunner', 'js'):
+    if not external_source_dir and build_app not in ('js'):
        if noncomm_build:
            log.info("=====WARNING WARNING WARNING=====")
            log.info("UNSUPPORTED NONCOMM-BUILD: Application code SHOULD NOT be put inside the platform tree, and doing so may have unforseen consequences if/when platform code is changed.")
@@ -10,28 +10,66 @@ def encoded_open(path, mode):
    return codecs.open(path, mode, encoding)


-m4 = check_prog(
-    "M4",
-    (
-        "gm4",
-        "m4",
-    ),
-)
+option(env='AUTOCONF', nargs=1, help='Path to autoconf 2.13')

-@depends('OLD_CONFIGURE', mozconfig, awk, m4, check_build_environment, shell,
+@depends(mozconfig, 'AUTOCONF')
+@checking('for autoconf')
+@imports(_from='os.path', _import='exists')
+@imports('re')
+def autoconf(mozconfig, autoconf):
+    mozconfig_autoconf = None
+    if mozconfig['path']:
+        make_extra = mozconfig['make_extra']
+        if make_extra:
+            for assignment in make_extra:
+                m = re.match('(?:export\s+)?AUTOCONF\s*:?=\s*(.+)$',
+                             assignment)
+                if m:
+                    mozconfig_autoconf = m.group(1)
+
+    autoconf = autoconf[0] if autoconf else None
+
+    for ac in (mozconfig_autoconf, autoconf, 'autoconf-2.13', 'autoconf2.13',
+               'autoconf213'):
+        if ac:
+            autoconf = find_program(ac)
+            if autoconf:
+                break
+    else:
+        fink = find_program('fink')
+        if fink:
+            autoconf = os.path.normpath(os.path.join(
+                fink, '..', '..', 'lib', 'autoconf2.13', 'bin', 'autoconf'))
+        else:
+            brew = find_program('brew')
+            if brew:
+                autoconf = os.path.normpath(os.path.join(
+                    brew, '..', '..', 'Cellar', 'autoconf213', '2.13', 'bin',
+                    'autoconf213'))
+
+    if not autoconf:
+        die('Could not find autoconf 2.13')
+
+    if not exists(autoconf):
+        die('Could not find autoconf 2.13 at %s', autoconf)
+
+    return autoconf
+
+set_config('AUTOCONF', autoconf)
+
+
+@depends('OLD_CONFIGURE', mozconfig, autoconf, check_build_environment, shell,
         old_configure_assignments, build_project)
@imports(_from='__builtin__', _import='open')
@imports(_from='__builtin__', _import='print')
@imports('glob')
-@imports('sys')
@imports('itertools')
@imports('subprocess')
 # Import getmtime without overwriting the sandbox os.path.
@imports(_from='os.path', _import='getmtime')
@imports(_from='os.path', _import='exists')
@imports(_from='mozbuild.shellutil', _import='quote')
-@imports(_from='os', _import='environ')
-def prepare_configure(old_configure, mozconfig, awk, m4, build_env, shell,
+def prepare_configure(old_configure, mozconfig, autoconf, build_env, shell,
                      old_configure_assignments, build_project):
    # os.path.abspath in the sandbox will ensure forward slashes on Windows,
    # which is actually necessary because this path actually ends up literally
@@ -60,22 +98,11 @@ def prepare_configure(old_configure, mozconfig, awk, m4, build_env, shell,
            refresh = False

    if refresh:
-        autoconf = os.path.join(build_env.topsrcdir, 'build', 'autoconf', 'autoconf.sh')
        log.info('Refreshing %s with %s', old_configure, autoconf)
-        env = dict(environ)
-        env['M4'] = m4
-        env['AWK'] = awk
-        env['AC_MACRODIR'] = os.path.join(build_env.topsrcdir, 'build', 'autoconf')
-        my_env = env
-        # Handle Python 2.7 not allowing unicode in the environment on Windows
-        if sys.platform == 'win32':
-            my_env = dict()
-            for e in env:
-                my_env[e.encode('ascii','ignore')] = env[e].encode('ascii','ignore')
        script = subprocess.check_output([
            shell, autoconf,
            '--localdir=%s' % os.path.dirname(old_configure),
-            old_configure + '.in'], env=my_env)
+            old_configure + '.in'])

        # Make old-configure append to config.log, where we put our own log.
        # This could be done with a m4 macro, but it's way easier this way
@@ -100,6 +127,10 @@ def prepare_configure(old_configure, mozconfig, awk, m4, build_env, shell,
                for key in mozconfig[t]['removed'].keys():
                    inject("unset %s" % key)

+        # Autoconf is special, because it might be passed from
+        # mozconfig['make_extra'], which we don't pass automatically above.
+        inject('export AUTOCONF=%s' % quote(autoconf))
+
        for assignment in old_configure_assignments:
            inject(assignment)

@@ -125,9 +156,7 @@ 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',
@@ -148,6 +177,7 @@ def old_configure_options(*options):
    '--enable-directshow',
    '--enable-dtrace',
    '--enable-dump-painting',
+    '--enable-eme',
    '--enable-elf-hack',
    '--enable-extensions',
    '--enable-faststripe',
@@ -164,8 +194,6 @@ def old_configure_options(*options):
    '--enable-ion',
    '--enable-ios-target',
    '--enable-jitspew',
-    '--enable-js-lto',
-    '--enable-leak-sanitizer',
    '--enable-libjpeg-turbo',
    '--enable-libproxy',
    '--enable-llvm-hacks',
@@ -176,7 +204,6 @@ def old_configure_options(*options):
    '--enable-necko-wifi',
    '--enable-negotiateauth',
    '--enable-nfc',
-    '--enable-npapi',
    '--enable-nspr-build',
    '--enable-official-branding',
    '--enable-official-vendor',
@@ -198,13 +225,13 @@ def old_configure_options(*options):
    '--enable-safe-browsing',
    '--enable-sandbox',
    '--enable-security-sqlstore',
-    '--enable-shared-icu',
    '--enable-shared-media',
    '--enable-signmar',
    '--enable-simulator',
    '--enable-small-chunk-size',
    '--enable-startup-notification',
    '--enable-startupcache',
+    '--enable-stdcxx-compat',
    '--enable-strip',
    '--enable-synth-pico',
    '--enable-system-cairo',
@@ -215,7 +242,6 @@ def old_configure_options(*options):
    '--enable-thread-sanitizer',
    '--enable-trace-logging',
    '--enable-ui-locale',
-    '--enable-undefined-sanitizer',
    '--enable-universalchardet',
    '--enable-updater',
    '--enable-url-classifier',
@@ -246,9 +272,6 @@ def old_configure_options(*options):
    '--with-ios-sdk',
    '--with-jitreport-granularity',
    '--with-macbundlename-prefix',
-    '--with-macbundle-entitlement',
-    '--with-macbundle-identity',
-    '--with-macbundle-type',
    '--with-macos-private-frameworks',
    '--with-macos-sdk',
    '--with-nspr-cflags',
@@ -268,7 +291,6 @@ def old_configure_options(*options):
    '--with-thumb-interwork',
    '--with-unify-dist',
    '--with-user-appdir',
-    '--with-xulrunner-stub-name',
    '--x-includes',
    '--x-libraries',

@@ -276,17 +298,15 @@ def old_configure_options(*options):
    '--enable-ldap',
    '--enable-mapi',
    '--enable-calendar',
-    '--enable-inspector',
-    '--enable-irc',
    '--enable-incomplete-external-linkage',
    '--enable-mailnews',
    '--enable-mailnews-oauth2',
-    '--enable-classic-account-wizard',
    
    # Below are configure flags used by Pale Moon
    '--disable-browser-statusbar',
    '--disable-sync',
    '--disable-personas',
+    '--enable-phoenix-extensions',
    
    # Below are configure flags used by Basilisk
    '--disable-webextensions',
@@ -171,9 +171,6 @@ include('compilers-util.configure')
 def try_preprocess(compiler, language, source):
    return try_invoke_compiler(compiler, language, source, ['-E'])

-def msvc_std14(): return '-std:c++14'
-def msvc_std17(): return '-std:c++17'
-
@imports(_from='mozbuild.configure.constants', _import='CompilerType')
@imports(_from='mozbuild.configure.constants',
         _import='CPU_preprocessor_checks')
@@ -282,13 +279,6 @@ def get_compiler_info(compiler, language):
            'Unknown compiler or compiler not supported.')

    cplusplus = int(data.get('cplusplus', '0L').rstrip('L'))
-    if language == 'C++' and type=='msvc' and cplusplus == 199711:
-        # Note: MSVC still reports 199711L for __cplusplus. Fix the report by
-        # assuming it does what we asked it to do.
-        if msvc_std14() in compiler:
-            cplusplus = 201402
-        elif msvc_std17() in compiler:
-            cplusplus = 201703
    stdc_version = int(data.get('STDC_VERSION', '0L').rstrip('L'))

    version = data.get('VERSION')
@@ -340,16 +330,16 @@ def check_compiler(compiler, language, target):
        if info.type in ('clang-cl', 'clang', 'gcc'):
            append_flag('-std=gnu99')

-    cxx17_version = 201703
+    # Note: MSVC, while supporting C++11, still reports 199711L for __cplusplus.
+    # Note: this is a strict version check because we used to always add
+    # -std=gnu++11.
    if info.language == 'C++':
-        if info.language_version != cxx17_version:
-            # Compiler doesn't default to C++17, so add the appropriate flag.
-            if info.type in ('clang', 'gcc'):
-                # We're on Clang or GCC, enable C++17 and add GNU extensions.
-                append_flag('-std=gnu++17')
-            else:
-                # We're on MSVC; enable C++17 language mode.
-                append_flag('-std:c++17')
+        if info.type in ('clang', 'gcc') and info.language_version != 201103:
+            append_flag('-std=gnu++11')
+        # MSVC 2015 headers include C++14 features, but don't guard them
+        # with appropriate checks.
+        if info.type == 'clang-cl' and info.language_version != 201402:
+            append_flag('-std=c++14')

    # We force clang-cl to emulate Visual C++ 2015 Update 3 with fallback to
    # cl.exe.
@@ -654,17 +644,11 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
                              host_or_target)

        # Check that the additional flags we got are enough to not require any
-        # more flags. If we get an exception, just ignore it; it's liable to be
-        # invalid command-line flags, which means the compiler we're checking
-        # doesn't support those command-line flags and will fail one or more of
-        # the checks below.
-        try:
-            if info.flags:
-                flags += info.flags
-                info = check_compiler(wrapper + [compiler] + flags, language,
-                                      host_or_target)
-        except FatalCheckError:
-            pass
+        # more flags.
+        if info.flags:
+            flags += info.flags
+            info = check_compiler(wrapper + [compiler] + flags, language,
+                                  host_or_target)

        if not info.target_cpu or info.target_cpu != host_or_target.cpu:
            raise FatalCheckError(
@@ -690,6 +674,10 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
                   info.target_endianness or 'unknown', host_or_target_str,
                   host_or_target.endianness))

+        if info.flags:
+            raise FatalCheckError(
+                'Unknown compiler or compiler not supported.')
+
        # Compiler version checks
        # ===================================================
        # Check the compiler version here instead of in `compiler_version` so
@@ -701,7 +689,7 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
                % info.version)

        # If you want to bump the version check here search for
-        # cxx_alignof above, and see the associated comment.
+        # __cpp_static_assert above, and see the associated comment.
        if info.type == 'clang' and not info.version:
            raise FatalCheckError(
                'Only clang/llvm 3.6 or newer is supported.')
@@ -716,10 +704,6 @@ def compiler(language, host_or_target, c_compiler=None, other_compiler=None,
                    'See https://developer.mozilla.org/en/'
                    'Windows_Build_Prerequisites' % info.version)

-        if info.flags:
-            raise FatalCheckError(
-                'Unknown compiler or compiler not supported.')
-
        return namespace(
            wrapper=wrapper,
            compiler=compiler,
@@ -18,6 +18,9 @@ add_old_configure_assignment(
 # lots of useful warnings
 add_gcc_warning('-Wall')

+# catches C++ version forward-compat issues
+add_gcc_warning('-Wc++11-compat', cxx_compiler)
+
 # catches bugs, e.g. "if (c); foo();", few false positives
 add_gcc_warning('-Wempty-body')

@@ -52,7 +55,10 @@ check_and_add_gcc_warning('-Wclass-varargs')
 check_and_add_gcc_warning('-Wloop-analysis')

 # catches C++ version forward-compat issues
-# check_and_add_gcc_warning('-Wc++2a-compat', cxx_compiler)
+check_and_add_gcc_warning('-Wc++11-compat-pedantic', cxx_compiler)
+check_and_add_gcc_warning('-Wc++14-compat', cxx_compiler)
+check_and_add_gcc_warning('-Wc++14-compat-pedantic', cxx_compiler)
+check_and_add_gcc_warning('-Wc++1z-compat', cxx_compiler)

 # catches unintentional switch case fallthroughs
 check_and_add_gcc_warning('-Wimplicit-fallthrough', cxx_compiler)
@@ -8,6 +8,9 @@ def Binary():
    '''Generic template for target binaries. Meant to be used by other
    templates.'''

+    if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']:
+        USE_LIBS += ['stdc++compat']
+
    # Ideally, we'd support not adding this to the LIB_IS_C_ONLY case,
    # but that variable is actually only set in db/sqlite/src, which
    # doesn't build a shared library on the relevant platforms anyways.
@@ -74,11 +77,27 @@ def Framework(name):
    IS_FRAMEWORK = True


+@template
+def HostStdCppCompat():
+    '''Template for libstdc++ compatibility for host binaries.'''
+
+    if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
+        HOST_USE_LIBS += ['host_stdc++compat']
+
+
@template
 def HostProgram(name, c_only=False):
    '''Template for build tools executables.'''
    HOST_PROGRAM = name

+    # With context-based templates, this won't be needed anymore, and will
+    # work better than relying on the caller setting it, but at the moment,
+    # this is the best we have. And it doesn't matter /that/ much, so there's
+    # really only one place using this, where it does matter to avoid the
+    # extra dependency (because it creates a circular one).
+    if not c_only:
+        HostStdCppCompat()
+

@template
 def HostSimplePrograms(names, ext='.cpp'):
@@ -90,6 +109,8 @@ def HostSimplePrograms(names, ext='.cpp'):
    HOST_SOURCES += ['%s%s' % (name.replace('host_', ''), ext)
        for name in names]

+    HostStdCppCompat()
+

@template
 def HostLibrary(name):
@@ -3,9 +3,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] or CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
+    DIRS += ['stdc++compat']
+
 if CONFIG['USE_ELF_HACK']:
    DIRS += ['elfhack']

+if CONFIG['LLVM_SYMBOLIZER']:
+    FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']]
+
 SDK_FILES.bin += [
    'run-mozilla.sh',
 ]
@@ -0,0 +1,15 @@
+# Avoid dependency on libstdc++ 4.7
+ac_add_options --enable-stdcxx-compat
+
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+if [ -f "$TOOLTOOL_DIR/clang/lib/libstdc++.so" ]; then
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/clang/lib
+elif [ -f "$TOOLTOOL_DIR/gcc/lib/libstdc++.so" ]; then
+  # We put both 32-bits and 64-bits library path in LD_LIBRARY_PATH: ld.so
+  # will prefer the files in the 32-bits path when loading 32-bits executables,
+  # and the files in the 64-bits path when loading 64-bits executables.
+  LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gcc/lib64:$TOOLTOOL_DIR/gcc/lib
+fi
+
+mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
@@ -30,3 +30,5 @@ ac_add_options --enable-pie
 ac_add_options --disable-install-strip
 # -gline-tables-only results in significantly smaller binaries.
 ac_add_options --enable-debug-symbols="-gline-tables-only"
+
+. "$topsrcdir/build/unix/mozconfig.stdcxx"
@@ -0,0 +1,7 @@
+# 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/.
+
+ENABLE_CLANG_PLUGIN :=
+
+include $(topsrcdir)/config/rules.mk
@@ -0,0 +1,23 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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_LIBSTDCXX_TARGET_VERSION']:
+    Library('stdc++compat')
+    SOURCES += ['stdc++compat.cpp']
+
+if CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']:
+    HostLibrary('host_stdc++compat')
+    HOST_SOURCES += [
+        'stdc++compat.cpp',
+    ]
+
+FORCE_STATIC_LIB = True
+
+NO_PGO = True
+
+DISABLE_STL_WRAPPING = True
+
+DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION']
+HOST_DEFINES['MOZ_LIBSTDCXX_VERSION'] = CONFIG['MOZ_LIBSTDCXX_HOST_VERSION']
@@ -0,0 +1,78 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <ostream>
+#include <istream>
+#include <string>
+#include <stdarg.h>
+#include <stdio.h>
+#include <mozilla/Assertions.h>
+
+/* GLIBCXX_3.4.8  is from gcc 4.1.1 (111691)
+   GLIBCXX_3.4.9  is from gcc 4.2.0 (111690)
+   GLIBCXX_3.4.10 is from gcc 4.3.0 (126287)
+   GLIBCXX_3.4.11 is from gcc 4.4.0 (133006)
+   GLIBCXX_3.4.12 is from gcc 4.4.1 (147138)
+   GLIBCXX_3.4.13 is from gcc 4.4.2 (151127)
+   GLIBCXX_3.4.14 is from gcc 4.5.0 (151126)
+   GLIBCXX_3.4.15 is from gcc 4.6.0 (160071)
+   GLIBCXX_3.4.16 is from gcc 4.6.1 (172240)
+   GLIBCXX_3.4.17 is from gcc 4.7.0 (174383)
+   GLIBCXX_3.4.18 is from gcc 4.8.0 (190787)
+   GLIBCXX_3.4.19 is from gcc 4.8.1 (199309)
+   GLIBCXX_3.4.20 is from gcc 4.9.0 (199307)
+   GLIBCXX_3.4.21 is from gcc 5.0 (210290)
+
+This file adds the necessary compatibility tricks to avoid symbols with
+version GLIBCXX_3.4.16 and bigger, keeping binary compatibility with
+libstdc++ 4.6.1.
+
+*/
+
+#define GLIBCXX_VERSION(a, b, c) (((a) << 16) | ((b) << 8) | (c))
+
+#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 20)
+namespace std {
+
+    /* We shouldn't be throwing exceptions at all, but it sadly turns out
+       we call STL (inline) functions that do. */
+    void __throw_out_of_range_fmt(char const* fmt, ...)
+    {
+        va_list ap;
+        char buf[1024]; // That should be big enough.
+
+        va_start(ap, fmt);
+        vsnprintf(buf, sizeof(buf), fmt, ap);
+        buf[sizeof(buf) - 1] = 0;
+        va_end(ap);
+
+        __throw_range_error(buf);
+    }
+
+}
+#endif
+
+#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 20)
+/* Technically, this symbol is not in GLIBCXX_3.4.20, but in CXXABI_1.3.8,
+   but that's equivalent, version-wise. Those calls are added by the compiler
+   itself on `new Class[n]` calls. */
+extern "C" void
+__cxa_throw_bad_array_new_length()
+{
+    MOZ_CRASH();
+}
+#endif
+
+#if MOZ_LIBSTDCXX_VERSION >= GLIBCXX_VERSION(3, 4, 21)
+/* While we generally don't build with exceptions, we have some host tools
+ * that do use them. libstdc++ from GCC 5.0 added exception constructors with
+ * char const* argument. Older versions only have a constructor with
+ * std::string. */
+namespace std {
+    runtime_error::runtime_error(char const* s)
+    : runtime_error(std::string(s))
+    {
+    }
+}
+#endif
@@ -18,6 +18,16 @@
   obj:/lib/libdbus-1.so.3.4.0
   ...
 }
+{
+   Bug 793600
+   Memcheck:Leak
+   fun:realloc
+   obj:/usr/lib/libfontconfig.so.1.4.4
+   ...
+   fun:FcDefaultSubstitute
+   fun:_ZN17gfxPangoFontGroup11MakeFontSetEP14_PangoLanguagedP9nsAutoRefI10_FcPatternE
+   ...
+}
 {
   Bug 794366
   Memcheck:Leak
@@ -18,6 +18,16 @@
   obj:/lib64/libdbus-1.so.3.4.0
   ...
 }
+{
+   Bug 793600
+   Memcheck:Leak
+   fun:realloc
+   obj:/usr/lib64/libfontconfig.so.1.4.4
+   ...
+   fun:FcDefaultSubstitute
+   fun:_ZN17gfxPangoFontGroup11MakeFontSetEP14_PangoLanguagedP9nsAutoRefI10_FcPatternE
+   ...
+}
 # Fontconfig is going fancy with its cache structure and that confuses valgrind.
 # https://bugs.freedesktop.org/show_bug.cgi?id=8215
 # https://bugs.freedesktop.org/show_bug.cgi?id=8428
@@ -51,12 +51,12 @@ public:
  // Don't use this method for anything else than debugging!
  void CreateAnonymizedSuffix(nsACString& aStr) const;

-  [[nodiscard]] bool PopulateFromSuffix(const nsACString& aStr);
+  MOZ_MUST_USE bool PopulateFromSuffix(const nsACString& aStr);

  // Populates the attributes from a string like
  // |uri!key1=value1&key2=value2| and returns the uri without the suffix.
-  [[nodiscard]] bool PopulateFromOrigin(const nsACString& aOrigin,
-                                        nsACString& aOriginNoSuffix);
+  MOZ_MUST_USE bool PopulateFromOrigin(const nsACString& aOrigin,
+                                       nsACString& aOriginNoSuffix);

  // Helper function to match mIsPrivateBrowsing to existing private browsing
  // flags. Once all other flags are removed, this can be removed too.
@@ -287,6 +287,8 @@ 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(f75f502d-79fd-48be-a079-e5a7b8f80c8b)]
+[scriptable, builtinclass, uuid(3da7b133-f1a0-4de9-a2bc-5c49014c1077)]
 interface nsIPrincipal : nsISerializable
 {
    /**
@@ -333,6 +333,15 @@ 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();
 };

 /**
@@ -85,7 +85,7 @@ nsJSPrincipals::Destroy(JSPrincipals *jsprin)
 #ifdef DEBUG

 // Defined here so one can do principals->dump() in the debugger
-void
+JS_PUBLIC_API(void)
 JSPrincipals::dump()
 {
    if (debugToken == nsJSPrincipals::DEBUG_TOKEN) {
Author	SHA1	Message	Date
Moonchild	00c5c3e7c2	Re-unify most of gfx	2022-09-08 16:50:40 +00:00
Moonchild	b8cebb4993	Re-unify most of the layout engine	2022-09-07 13:04:19 +00:00
Moonchild	63875c9e04	Re-unify most of DOM	2022-09-07 12:47:24 +00:00