Commit hourCycle test.

For some reason this is non-functional...

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Switching to C++17 requires CLOBBER to pick up compiler conf. (Issue #2281)
+Touching ICU's build system requires a CLOBBER. (Issue #2165)

accessible/base/ARIAMap.cpp

@@ -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/. */

accessible/base/ARIAMap.h

@@ -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/. */

accessible/base/MarkupMap.h

@@ -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/. */

accessible/base/TextAttrs.cpp

@@ -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;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

accessible/base/nsTextEquivUtils.cpp

@@ -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/. */

accessible/base/nsTextEquivUtils.h

@@ -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/. */

accessible/generic/ApplicationAccessible.cpp

@@ -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/. */

accessible/generic/ApplicationAccessible.h

@@ -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/. */

accessible/ipc/DocAccessibleParent.h

@@ -176,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;

accessible/mac/ARIAGridAccessibleWrap.h

@@ -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/. */

accessible/mac/ApplicationAccessibleWrap.h

@@ -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/. */

accessible/mac/HTMLTableAccessibleWrap.h

@@ -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/. */

accessible/mac/ImageAccessibleWrap.h

@@ -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/. */

accessible/mac/mozHTMLAccessible.h

@@ -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/. */

accessible/mac/mozHTMLAccessible.mm

@@ -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/. */

accessible/mac/mozTableAccessible.h

@@ -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/. */

accessible/mac/mozTableAccessible.mm

@@ -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/. */

accessible/other/ARIAGridAccessibleWrap.h

@@ -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/. */

accessible/other/ApplicationAccessibleWrap.h

@@ -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/. */

accessible/other/HTMLTableAccessibleWrap.h

@@ -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/. */

accessible/other/ImageAccessibleWrap.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleAction.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleAction.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleComponent.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleComponent.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleEditableText.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleEditableText.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleHyperlink.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleHyperlink.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleHypertext.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleHypertext.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleImage.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleImage.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleRelation.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleRelation.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleTable.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleTable.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleTableCell.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleTableCell.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleText.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleText.h

@@ -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/. */

accessible/windows/ia2/ia2AccessibleValue.cpp

@@ -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/. */

accessible/windows/ia2/ia2AccessibleValue.h

@@ -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/. */

accessible/windows/msaa/ARIAGridAccessibleWrap.cpp

@@ -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/. */

accessible/windows/msaa/ARIAGridAccessibleWrap.h

@@ -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/. */

accessible/windows/msaa/AccessibleWrap.h

@@ -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);
 
   /**

accessible/windows/msaa/ApplicationAccessibleWrap.cpp

@@ -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/. */

accessible/windows/msaa/ApplicationAccessibleWrap.h

@@ -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/. */

accessible/windows/msaa/HTMLTableAccessibleWrap.cpp

@@ -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/. */

accessible/windows/msaa/HTMLTableAccessibleWrap.h

@@ -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/. */

accessible/windows/msaa/HyperTextAccessibleWrap.cpp

@@ -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/. */

accessible/windows/msaa/HyperTextAccessibleWrap.h

@@ -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/. */

accessible/windows/msaa/ImageAccessibleWrap.cpp

@@ -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/. */

accessible/windows/msaa/ImageAccessibleWrap.h

@@ -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/. */

accessible/windows/msaa/nsEventMap.h

@@ -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/. */

accessible/windows/msaa/nsWinUtils.cpp

@@ -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/. */

accessible/windows/msaa/nsWinUtils.h

@@ -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/. */

build/autoconf/sanitize.m4

@@ -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)
 

build/moz.build

@@ -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']

build/moz.configure/compile-checks.configure

@@ -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)

build/moz.configure/flags.configure

@@ -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)

build/moz.configure/old.configure

@@ -179,6 +179,7 @@ def old_configure_options(*options):
     '--enable-directshow',
     '--enable-dtrace',
     '--enable-dump-painting',
+    '--enable-eme',
     '--enable-elf-hack',
     '--enable-extensions',
     '--enable-faststripe',
@@ -195,8 +196,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',
@@ -246,7 +245,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',
@@ -277,9 +275,7 @@ 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',
@@ -306,8 +302,6 @@ def old_configure_options(*options):
     '--enable-ldap',
     '--enable-mapi',
     '--enable-calendar',
-    '--enable-inspector',
-    '--enable-irc',
     '--enable-incomplete-external-linkage',
     '--enable-mailnews',
     '--enable-mailnews-oauth2',

build/moz.configure/toolchain.configure

@@ -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,

build/moz.configure/warnings.configure

@@ -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)

build/unix/moz.build

@@ -9,6 +9,9 @@ if CONFIG['MOZ_LIBSTDCXX_TARGET_VERSION'] or CONFIG['MOZ_LIBSTDCXX_HOST_VERSION'
 if CONFIG['USE_ELF_HACK']:
     DIRS += ['elfhack']
 
+if CONFIG['LLVM_SYMBOLIZER']:
+    FINAL_TARGET_FILES += ['/' + CONFIG['LLVM_SYMBOLIZER']]
+
 SDK_FILES.bin += [
     'run-mozilla.sh',
 ]

build/valgrind/i386-redhat-linux-gnu.sup

@@ -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

build/valgrind/x86_64-redhat-linux-gnu.sup

@@ -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

caps/BasePrincipal.h

@@ -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.

caps/nsNullPrincipalURI.cpp

@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
  * 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/. */

caps/nsNullPrincipalURI.h

@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * vim: sw=2 ts=2 sts=2 expandtab
  * 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/. */

chrome/nsChromeProtocolHandler.cpp

@@ -1,4 +1,5 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:set ts=4 sw=4 sts=4 et cin: */
 /* 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/. */

chrome/test/unit/test_data_protocol_registration.js

@@ -1,4 +1,5 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+ * vim: sw=2 ts=2 sts=2 tw=78 expandtab :
  * 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/. */

chrome/test/unit/test_no_remote_registration.js

@@ -1,4 +1,5 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
+ * vim: sw=2 ts=2 sts=2 tw=78 expandtab :
  * 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/. */

client.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 # 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/.

config/check_spidermonkey_style.py

@@ -82,7 +82,6 @@ included_inclnames_to_ignore = set([
     'unicode/plurrule.h',       # ICU
     'unicode/timezone.h',       # ICU
     'unicode/ucal.h',           # ICU
-    'unicode/uchar.h',          # ICU
     'unicode/uclean.h',         # ICU
     'unicode/ucol.h',           # ICU
     'unicode/udat.h',           # ICU

config/external/ffi/moz.build

@@ -128,9 +128,3 @@ else:
         '/js/src/ctypes/libffi/src/%s/%s' % (CONFIG['FFI_TARGET_DIR'], s)
         for s in sorted(ffi_srcs)
     ]
-
-    # Explicitly enable WPO and LTCG in MSVC if we're doing LTO.
-    if CONFIG['JS_LTO']:
-        if CONFIG['_MSC_VER'] and not CONFIG['CLANG_CL']:
-            CFLAGS += [ '-GL' ]
-            CXXFLAGS += [ '-GL' ]

config/external/lgpllibs/lgpllibs.def

@@ -0,0 +1,10 @@
+; 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/.
+
+LIBRARY lgpllibs.dll
+
+EXPORTS
+        av_rdft_init
+        av_rdft_calc
+        av_rdft_end

config/external/lgpllibs/moz.build

@@ -4,10 +4,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The lgpllibs library stores symbols from third-party LGPL licensed libraries,
-# such as libsoundtouch. It fulfills the requirement of dynamically linking
-# these symbols into Goanna.
+# such as libav and libsoundtouch. It fulfills the requirement of dynamically
+# linking these symbols into gecko.
 #
 # Any library added here should also be reflected in the about:license page.
 
 GeckoSharedLibrary('lgpllibs', linkage=None)
 SHARED_LIBRARY_NAME = 'lgpllibs'
+
+if CONFIG['MOZ_LIBAV_FFT']:
+    DIRS += ['/media/libav']
+    DEFFILE = SRCDIR + '/lgpllibs.def'

config/gcc-stl-wrapper.template.h

@@ -1,5 +1,7 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: sw=2 ts=8 et :
+ */
+/* 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/. */
 

config/makefiles/autotargets.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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,

config/makefiles/debugmake.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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,

config/makefiles/makeutils.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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,

config/makefiles/nonrecursive.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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

config/makefiles/target_binaries.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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

config/milestone.txt

@@ -8,4 +8,4 @@
 # Referenced by milestone.py.
 #--------------------------------------------------------
 
-6.5.0
+6.1.0

config/msvc-stl-wrapper.template.h

@@ -1,5 +1,7 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
+ * vim: sw=2 ts=8 et :
+ */
+/* 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/. */
 

config/rules.mk

@@ -1,4 +1,5 @@
 # -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
 #
 # 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,

devtools/client/debugger/new/bundle.js

@@ -2509,10 +2509,6 @@ var Debugger =
 	
 	  var Attribute = _require9.Attribute;
 	
-	  var _require23 = __webpack_require__(460);
-	
-	  var BigInt = _require23.BigInt;
-	
 	  var _require10 = __webpack_require__(47);
 	
 	  var DateTime = _require10.DateTime;
@@ -2569,7 +2565,7 @@ var Debugger =
 	  // XXX there should be a way for extensions to register a new
 	  // or modify an existing rep.
 	
-	  var reps = [RegExp, StyleSheet, Event, DateTime, TextNode, Attribute, Func, ArrayRep, Document, Window, ObjectWithText, ObjectWithURL, GripArray, GripMap, Grip, Undefined, Null, StringRep, Number, BigInt, SymbolRep];
+	  var reps = [RegExp, StyleSheet, Event, DateTime, TextNode, Attribute, Func, ArrayRep, Document, Window, ObjectWithText, ObjectWithURL, GripArray, GripMap, Grip, Undefined, Null, StringRep, Number, SymbolRep];
 	
 	  /**
 	   * Generic rep that is using for rendering native JS types or an object.
@@ -2609,12 +2605,10 @@ var Debugger =
 	    var defaultRep = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : Obj;
 	
 	    var type = typeof object;
-	    if (type == "object") {
-	      if (object instanceof String) {
-	        type = "string";
-	      } else if (["symbol", "BigInt"].includes(object.type)) {
-	        type = object.type;
-	      }
+	    if (type == "object" && object instanceof String) {
+	      type = "string";
+	    } else if (type == "object" && object.type === "symbol") {
+	      type = "symbol";
 	    }
 	
 	    if (isGrip(object)) {
@@ -58331,59 +58325,6 @@ var Debugger =
 	  setBundle
 	};
 
-/***/ },
-/* 460 */
-/***/ function(module, exports, __webpack_require__) {
-
-	var __WEBPACK_AMD_DEFINE_RESULT__;/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-	/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
-	/* 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/. */
-	
-	"use strict";
-	
-	// Make this available to both AMD and CJS environments
-	
-	!(__WEBPACK_AMD_DEFINE_RESULT__ = function (require, exports, module) {
-	  // Dependencies
-	  var React = __webpack_require__(2);
-	
-	  // Shortcuts
-	  var span = React.DOM.span;
-	
-	  /**
-	   * Renders a number
-	   */
-	
-	  var BigInt = React.createClass({
-	    displayName: "BigInt",
-	
-        propTypes: {
-          object: React.PropTypes.object.isRequired
-        },
-	
-	    render: function () {
-          let {object} = this.props;
-          let {text} = object;
-	
-	      return span({ className: "objectBox objectBox-number" }, `${text}n`);
-	    }
-	  });
-	
-	  function supportsObject(object, type) {
-	    return type == "BigInt";
-	  }
-	
-	  // Exports from this module
-	
-	  exports.BigInt = {
-	    rep: BigInt,
-	    supportsObject: supportsObject
-	  };
-	}.call(exports, __webpack_require__, exports, module), __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
-
-
 /***/ }
 /******/ ]);
 //# sourceMappingURL=bundle.js.map

devtools/client/debugger/new/pretty-print-worker.js

@@ -1068,7 +1068,7 @@ var Debugger =
 	    // be either 3, or 5, or 6. This influences support for strict
 	    // mode, the set of reserved words, support for getters and
 	    // setters and other features.
-	    ecmaVersion: 6,
+	    ecmaVersion: 5,
 	    // Turn on `strictSemicolons` to prevent the parser from doing
 	    // automatic semicolon insertion.
 	    strictSemicolons: false,

devtools/client/dom/content/dom-view.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */

devtools/client/framework/source-map-worker.js

@@ -87,8 +87,7 @@ async function _resolveAndFetch(generatedSource) : SourceMapConsumer {
   // Fetch the sourcemap over the network and create it.
   const sourceMapURL = _resolveSourceMapURL(generatedSource);
   const fetched = await fetch(
-    sourceMapURL, { loadFromCache: false,
-                    redirect: error }
+    sourceMapURL, { loadFromCache: false }
   );
 
   // Create the source map and fix it up.

devtools/client/inspector/components/inspector-tab-panel.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */

devtools/client/inspector/rules/test/browser_rules_completion-new-property_multiline.js

@@ -39,14 +39,14 @@ add_task(function* () {
 
   // Calculate offsets to click in the middle of the first box quad.
   let rect = prop.editor.valueSpan.getBoundingClientRect();
-  let firstQuadBounds = prop.editor.valueSpan.getBoxQuads()[0].getBounds();
+  let firstQuad = prop.editor.valueSpan.getBoxQuads()[0];
   // For a multiline value, the first quad left edge is not aligned with the
   // bounding rect left edge. The offsets expected by focusEditableField are
   // relative to the bouding rectangle, so we need to translate the x-offset.
-  let x = firstQuadBounds.left - rect.left + firstQuadBounds.width / 2;
+  let x = firstQuad.bounds.left - rect.left + firstQuad.bounds.width / 2;
   // The first quad top edge is aligned with the bounding top edge, no
   // translation needed here.
-  let y = firstQuadBounds.height / 2;
+  let y = firstQuad.bounds.height / 2;
 
   info("Focusing the css property editable value");
   let editor = yield focusEditableField(view, prop.editor.valueSpan, x, y);

devtools/client/jsonview/css/general.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */

devtools/client/jsonview/css/headers-panel.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */

devtools/client/jsonview/css/json-panel.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */

devtools/client/jsonview/css/main.css

@@ -1,3 +1,4 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
 /* 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/. */