Backed out changeset d92f391b3b0c (bug 1922838) for backing out bug 1915351

Author: amarc-mozilla

accessible/atk/AccessibleWrap.cpp

@@ -391,7 +391,7 @@ static GType GetMaiAtkType(uint16_t interfacesBits) {
   type = g_type_register_static(MAI_TYPE_ATK_OBJECT, atkTypeName, &tinfo,
                                 GTypeFlags(0));
 
-  for (uint32_t index = 0; index < std::size(atk_if_infos); index++) {
+  for (uint32_t index = 0; index < ArrayLength(atk_if_infos); index++) {
     if (interfacesBits & (1 << index)) {
       g_type_add_interface_static(type,
                                   GetAtkTypeForMai((MaiInterfaceType)index),

accessible/atk/nsMaiInterfaceText.cpp

@@ -550,7 +550,7 @@ void textInterfaceInitCB(AtkTextIface* aIface) {
   }
 
   // Cache the string values of the atk text attribute names.
-  for (uint32_t i = 0; i < std::size(sAtkTextAttrNames); i++) {
+  for (uint32_t i = 0; i < ArrayLength(sAtkTextAttrNames); i++) {
     sAtkTextAttrNames[i] =
         atk_text_attribute_get_name(static_cast<AtkTextAttribute>(i));
   }

accessible/base/ARIAMap.cpp

@@ -1531,7 +1531,7 @@ uint8_t aria::GetFirstValidRoleMapIndexExcluding(
       return Compare(role, aEntry.ARIARoleString(),
                      nsCaseInsensitiveStringComparator);
     };
-    if (BinarySearchIf(sWAIRoleMaps, 0, std::size(sWAIRoleMaps), comparator,
+    if (BinarySearchIf(sWAIRoleMaps, 0, ArrayLength(sWAIRoleMaps), comparator,
                        &idx)) {
       return idx;
     }
@@ -1581,7 +1581,7 @@ bool aria::IsRoleMapIndexValid(uint8_t aRoleMapIndex) {
     case LANDMARK_ROLE_MAP_ENTRY_INDEX:
       return true;
   }
-  return aRoleMapIndex < std::size(sWAIRoleMaps);
+  return aRoleMapIndex < ArrayLength(sWAIRoleMaps);
 }
 
 uint64_t aria::UniversalStatesFor(mozilla::dom::Element* aElement) {
@@ -1593,7 +1593,7 @@ uint64_t aria::UniversalStatesFor(mozilla::dom::Element* aElement) {
 }
 
 uint8_t aria::AttrCharacteristicsFor(nsAtom* aAtom) {
-  for (uint32_t i = 0; i < std::size(gWAIUnivAttrMap); i++) {
+  for (uint32_t i = 0; i < ArrayLength(gWAIUnivAttrMap); i++) {
     if (gWAIUnivAttrMap[i].attributeName == aAtom) {
       return gWAIUnivAttrMap[i].characteristics;
     }
@@ -1615,7 +1615,7 @@ const nsRoleMapEntry* aria::GetRoleMap(const nsStaticAtom* aAriaRole) {
     return Compare(role, aEntry.ARIARoleString());
   };
   size_t idx;
-  if (BinarySearchIf(sWAIRoleMaps, 0, std::size(sWAIRoleMaps), comparator,
+  if (BinarySearchIf(sWAIRoleMaps, 0, ArrayLength(sWAIRoleMaps), comparator,
                      &idx)) {
     return GetRoleMapFromIndex(idx);
   }

accessible/base/Logging.cpp

@@ -74,7 +74,7 @@ static void EnableLogging(const char* aModulesStr) {
   const char* token = aModulesStr;
   while (*token != '\0') {
     size_t tokenLen = strcspn(token, ",");
-    for (unsigned int idx = 0; idx < std::size(sModuleMap); idx++) {
+    for (unsigned int idx = 0; idx < ArrayLength(sModuleMap); idx++) {
       if (strncmp(token, sModuleMap[idx].mStr, tokenLen) == 0) {
 #if !defined(MOZ_PROFILING) && (!defined(DEBUG) || defined(MOZ_OPTIMIZE))
         // Stack tracing on profiling enabled or debug not optimized builds.
@@ -977,7 +977,7 @@ bool logging::IsEnabledAll(uint32_t aModules) {
 }
 
 bool logging::IsEnabled(const nsAString& aModuleStr) {
-  for (unsigned int idx = 0; idx < std::size(sModuleMap); idx++) {
+  for (unsigned int idx = 0; idx < ArrayLength(sModuleMap); idx++) {
     if (aModuleStr.EqualsASCII(sModuleMap[idx].mStr)) {
       return sModules & sModuleMap[idx].mModule;
     }

accessible/base/TextAttrs.cpp

@@ -127,14 +127,14 @@ void TextAttrsMgr::GetAttributes(AccAttributes* aAttributes,
 
   // Expose text attributes if applicable.
   if (aAttributes) {
-    for (uint32_t idx = 0; idx < std::size(attrArray); idx++) {
+    for (uint32_t idx = 0; idx < ArrayLength(attrArray); idx++) {
       attrArray[idx]->Expose(aAttributes, mIncludeDefAttrs);
     }
   }
 
   // Expose text attributes range where they are applied if applicable.
   if (aStartOffset) {
-    GetRange(attrArray, std::size(attrArray), aStartOffset, aEndOffset);
+    GetRange(attrArray, ArrayLength(attrArray), aStartOffset, aEndOffset);
   }
 }
 

accessible/base/TextLeafRange.cpp

@@ -470,7 +470,7 @@ FindDOMTextOffsetAttributes(LocalAccessible* aAcc, int32_t aRenderedStart,
           {SelectionType::eSpellCheck, nsGkAtoms::spelling},
           {SelectionType::eTargetText, nsGkAtoms::mark},
       };
-  result.SetCapacity(std::size(kSelectionTypesToAttributes));
+  result.SetCapacity(ArrayLength(kSelectionTypesToAttributes));
   for (auto [selType, attr] : kSelectionTypesToAttributes) {
     dom::Selection* domSel = frameSel->GetSelection(selType);
     if (!domSel) {

accessible/base/nsAccessibilityService.cpp

@@ -453,9 +453,9 @@ uint64_t nsAccessibilityService::gCacheDomains =
     nsAccessibilityService::kDefaultCacheDomains;
 
 nsAccessibilityService::nsAccessibilityService()
-    : mHTMLMarkupMap(std::size(sHTMLMarkupMapList)),
-      mMathMLMarkupMap(std::size(sMathMLMarkupMapList)),
-      mXULMarkupMap(std::size(sXULMarkupMapList)) {}
+    : mHTMLMarkupMap(ArrayLength(sHTMLMarkupMapList)),
+      mMathMLMarkupMap(ArrayLength(sMathMLMarkupMapList)),
+      mXULMarkupMap(ArrayLength(sXULMarkupMapList)) {}
 
 nsAccessibilityService::~nsAccessibilityService() {
   NS_ASSERTION(IsShutdown(), "Accessibility wasn't shutdown!");
@@ -1082,10 +1082,10 @@ already_AddRefed<DOMStringList> nsAccessibilityService::GetStringStates(
 void nsAccessibilityService::GetStringEventType(uint32_t aEventType,
                                                 nsAString& aString) {
   static_assert(
-      nsIAccessibleEvent::EVENT_LAST_ENTRY == std::size(kEventTypeNames),
+      nsIAccessibleEvent::EVENT_LAST_ENTRY == ArrayLength(kEventTypeNames),
       "nsIAccessibleEvent constants are out of sync to kEventTypeNames");
 
-  if (aEventType >= std::size(kEventTypeNames)) {
+  if (aEventType >= ArrayLength(kEventTypeNames)) {
     aString.AssignLiteral("unknown");
     return;
   }
@@ -1095,10 +1095,11 @@ void nsAccessibilityService::GetStringEventType(uint32_t aEventType,
 
 void nsAccessibilityService::GetStringEventType(uint32_t aEventType,
                                                 nsACString& aString) {
-  MOZ_ASSERT(nsIAccessibleEvent::EVENT_LAST_ENTRY == std::size(kEventTypeNames),
-             "nsIAccessibleEvent constants are out of sync to kEventTypeNames");
+  MOZ_ASSERT(
+      nsIAccessibleEvent::EVENT_LAST_ENTRY == ArrayLength(kEventTypeNames),
+      "nsIAccessibleEvent constants are out of sync to kEventTypeNames");
 
-  if (aEventType >= std::size(kEventTypeNames)) {
+  if (aEventType >= ArrayLength(kEventTypeNames)) {
     aString.AssignLiteral("unknown");
     return;
   }
@@ -1536,15 +1537,15 @@ bool nsAccessibilityService::Init(uint64_t aCacheDomains) {
 
   eventListenerService->AddListenerChangeListener(this);
 
-  for (uint32_t i = 0; i < std::size(sHTMLMarkupMapList); i++) {
+  for (uint32_t i = 0; i < ArrayLength(sHTMLMarkupMapList); i++) {
     mHTMLMarkupMap.InsertOrUpdate(sHTMLMarkupMapList[i].tag,
                                   &sHTMLMarkupMapList[i]);
   }
   for (const auto& info : sMathMLMarkupMapList) {
     mMathMLMarkupMap.InsertOrUpdate(info.tag, &info);
   }
 
-  for (uint32_t i = 0; i < std::size(sXULMarkupMapList); i++) {
+  for (uint32_t i = 0; i < ArrayLength(sXULMarkupMapList); i++) {
     mXULMarkupMap.InsertOrUpdate(sXULMarkupMapList[i].tag,
                                  &sXULMarkupMapList[i]);
   }
@@ -1755,7 +1756,7 @@ void nsAccessibilityService::MarkupAttributes(
   if (!markupMap) return;
 
   dom::Element* el = aAcc->IsLocal() ? aAcc->AsLocal()->Elm() : nullptr;
-  for (uint32_t i = 0; i < std::size(markupMap->attrs); i++) {
+  for (uint32_t i = 0; i < ArrayLength(markupMap->attrs); i++) {
     const MarkupAttrInfo* info = markupMap->attrs + i;
     if (!info->name) break;
 

accessible/base/nsAccessibilityService.h

@@ -311,7 +311,7 @@ class nsAccessibilityService final : public mozilla::a11y::DocManager,
     const mozilla::a11y::MarkupMapInfo* markupMap =
         GetMarkupMapInfoFor(aSource);
     if (markupMap) {
-      for (size_t i = 0; i < std::size(markupMap->attrs); i++) {
+      for (size_t i = 0; i < mozilla::ArrayLength(markupMap->attrs); i++) {
         const mozilla::a11y::MarkupAttrInfo* info = markupMap->attrs + i;
         if (info->name == aAtom) {
           return info->value;

accessible/generic/DocAccessible.cpp

@@ -65,7 +65,7 @@ static nsStaticAtom* const kRelationAttrs[] = {
     nsGkAtoms::aria_errormessage, nsGkAtoms::_for,
     nsGkAtoms::control,           nsGkAtoms::popovertarget};
 
-static const uint32_t kRelationAttrsLen = std::size(kRelationAttrs);
+static const uint32_t kRelationAttrsLen = ArrayLength(kRelationAttrs);
 
 static nsStaticAtom* const kSingleElementRelationIdlAttrs[] = {
     nsGkAtoms::popovertarget};

accessible/generic/RootAccessible.cpp

@@ -153,7 +153,7 @@ nsresult RootAccessible::AddEventListeners() {
 
   if (nstarget) {
     for (const char *const *e = kEventTypes, *const *e_end =
-                                                 std::end(kEventTypes);
+                                                 ArrayEnd(kEventTypes);
          e < e_end; ++e) {
       nsresult rv = nstarget->AddEventListener(NS_ConvertASCIItoUTF16(*e), this,
                                                true, true);
@@ -169,7 +169,7 @@ nsresult RootAccessible::RemoveEventListeners() {
   nsCOMPtr<EventTarget> target = window ? window->GetParentTarget() : nullptr;
   if (target) {
     for (const char *const *e = kEventTypes, *const *e_end =
-                                                 std::end(kEventTypes);
+                                                 ArrayEnd(kEventTypes);
          e < e_end; ++e) {
       target->RemoveEventListener(NS_ConvertASCIItoUTF16(*e), this, true);
     }

accessible/ipc/RemoteAccessible.cpp

@@ -1234,7 +1234,7 @@ nsTArray<bool> RemoteAccessible::PreProcessRelations(AccAttributes* aFields) {
   if (!DomainsAreActive(CacheDomain::Relations)) {
     return {};
   }
-  nsTArray<bool> updateTracker(std::size(kRelationTypeAtoms));
+  nsTArray<bool> updateTracker(ArrayLength(kRelationTypeAtoms));
   for (auto const& data : kRelationTypeAtoms) {
     if (data.mValidTag) {
       // The relation we're currently processing only applies to particular
@@ -1310,7 +1310,7 @@ void RemoteAccessible::PostProcessRelations(const nsTArray<bool>& aToUpdate) {
     return;
   }
   size_t updateCount = aToUpdate.Length();
-  MOZ_ASSERT(updateCount == std::size(kRelationTypeAtoms),
+  MOZ_ASSERT(updateCount == ArrayLength(kRelationTypeAtoms),
              "Did not note update status for every relation type!");
   for (size_t i = 0; i < updateCount; i++) {
     if (aToUpdate.ElementAt(i)) {

accessible/mac/mozAccessible.mm

@@ -468,7 +468,7 @@ - (NSString*)moxRoleDescription {
 
   if (subrole) {
     size_t idx = 0;
-    if (BinarySearchIf(sRoleDescrMap, 0, std::size(sRoleDescrMap),
+    if (BinarySearchIf(sRoleDescrMap, 0, ArrayLength(sRoleDescrMap),
                        RoleDescrComparator(subrole), &idx)) {
       return utils::LocalizedString(sRoleDescrMap[idx].description);
     }

accessible/windows/ia2/ia2Accessible.cpp

@@ -77,7 +77,7 @@ ia2Accessible::get_nRelations(long* aNRelations) {
     return CO_E_OBJNOTCONNECTED;
   }
 
-  for (uint32_t idx = 0; idx < std::size(sRelationTypePairs); idx++) {
+  for (uint32_t idx = 0; idx < ArrayLength(sRelationTypePairs); idx++) {
     if (sRelationTypePairs[idx].second == IA2_RELATION_NULL) continue;
 
     Relation rel = acc->RelationByType(sRelationTypePairs[idx].first);
@@ -98,7 +98,7 @@ ia2Accessible::get_relation(long aRelationIndex,
   }
 
   long relIdx = 0;
-  for (uint32_t idx = 0; idx < std::size(sRelationTypePairs); idx++) {
+  for (uint32_t idx = 0; idx < ArrayLength(sRelationTypePairs); idx++) {
     if (sRelationTypePairs[idx].second == IA2_RELATION_NULL) continue;
 
     RelationType relationType = sRelationTypePairs[idx].first;
@@ -131,7 +131,7 @@ ia2Accessible::get_relations(long aMaxRelations,
   }
 
   for (uint32_t idx = 0;
-       idx < std::size(sRelationTypePairs) && *aNRelations < aMaxRelations;
+       idx < ArrayLength(sRelationTypePairs) && *aNRelations < aMaxRelations;
        idx++) {
     if (sRelationTypePairs[idx].second == IA2_RELATION_NULL) continue;
 
@@ -484,7 +484,7 @@ ia2Accessible::get_relationTargetsOfType(BSTR aType, long aMaxTargets,
   *aNTargets = 0;
 
   Maybe<RelationType> relationType;
-  for (uint32_t idx = 0; idx < std::size(sRelationTypePairs); idx++) {
+  for (uint32_t idx = 0; idx < ArrayLength(sRelationTypePairs); idx++) {
     if (wcscmp(aType, sRelationTypePairs[idx].second) == 0) {
       relationType.emplace(sRelationTypePairs[idx].first);
       break;

accessible/windows/msaa/LazyInstantiator.cpp

@@ -210,7 +210,7 @@ bool LazyInstantiator::IsBlockedInjection() {
     return false;
   }
 
-  for (size_t index = 0, len = std::size(gBlockedInprocDlls); index < len;
+  for (size_t index = 0, len = ArrayLength(gBlockedInprocDlls); index < len;
        ++index) {
     const DllBlockInfo& blockedDll = gBlockedInprocDlls[index];
     HMODULE module = ::GetModuleHandleW(blockedDll.mName);
@@ -247,7 +247,8 @@ bool LazyInstantiator::ShouldInstantiate(const DWORD aClientPid) {
     nsAutoString leafName;
     rv = clientExe->GetLeafName(leafName);
     if (NS_SUCCEEDED(rv)) {
-      for (size_t i = 0, len = std::size(gBlockedRemoteClients); i < len; ++i) {
+      for (size_t i = 0, len = ArrayLength(gBlockedRemoteClients); i < len;
+           ++i) {
         if (leafName.EqualsIgnoreCase(gBlockedRemoteClients[i])) {
           // If client exe is in our blocklist, do not instantiate.
           return false;

accessible/windows/msaa/MsaaAccessible.cpp

@@ -216,7 +216,7 @@ void MsaaAccessible::FireWinEvent(Accessible* aTarget, uint32_t aEventType) {
                     nsIAccessibleEvent::EVENT_LAST_ENTRY,
                 "MSAA event map skewed");
 
-  if (aEventType == 0 || aEventType >= std::size(gWinEventMap)) {
+  if (aEventType == 0 || aEventType >= ArrayLength(gWinEventMap)) {
     MOZ_ASSERT_UNREACHABLE("invalid event type");
     return;
   }

accessible/windows/uia/uiaRawElmProvider.cpp

@@ -318,7 +318,7 @@ uiaRawElmProvider::GetRuntimeId(__RPC__deref_out_opt SAFEARRAY** aRuntimeIds) {
   *aRuntimeIds = SafeArrayCreateVector(VT_I4, 0, 2);
   if (!*aRuntimeIds) return E_OUTOFMEMORY;
 
-  for (LONG i = 0; i < (LONG)std::size(ids); i++)
+  for (LONG i = 0; i < (LONG)ArrayLength(ids); i++)
     SafeArrayPutElement(*aRuntimeIds, &i, (void*)&(ids[i]));
 
   return S_OK;

browser/app/nsBrowserApp.cpp

@@ -92,7 +92,8 @@ __attribute__((constructor)) static void SSE2Check() {
   // Using write() in order to avoid jemalloc-based buffering. Ignoring return
   // values, since there isn't much we could do on failure and there is no
   // point in trying to recover from errors.
-  MOZ_UNUSED(write(STDERR_FILENO, sSSE2Message, std::size(sSSE2Message) - 1));
+  MOZ_UNUSED(
+      write(STDERR_FILENO, sSSE2Message, MOZ_ARRAY_LENGTH(sSSE2Message) - 1));
   // _exit() instead of exit() to avoid running the usual "at exit" code.
   _exit(255);
 }

browser/app/winlauncher/ErrorHandler.cpp

@@ -305,7 +305,7 @@ static bool AddWscInfo(mozilla::JSONWriter& aJson) {
   const CLSID clsid = __uuidof(WSCProductList);
   const IID iid = __uuidof(IWSCProductList);
 
-  for (uint32_t index = 0; index < std::size(gProvKeys); ++index) {
+  for (uint32_t index = 0; index < mozilla::ArrayLength(gProvKeys); ++index) {
     // NB: A separate instance of IWSCProductList is needed for each distinct
     // security provider type; MSDN says that we cannot reuse the same object
     // and call Initialize() to pave over the previous data.
@@ -368,11 +368,11 @@ static bool AddModuleInfo(const nsAutoHandle& aSnapshot,
 
     wchar_t leaf[_MAX_FNAME] = {};
     if (::_wsplitpath_s(module.szExePath, nullptr, 0, nullptr, 0, leaf,
-                        std::size(leaf), nullptr, 0)) {
+                        mozilla::ArrayLength(leaf), nullptr, 0)) {
       return false;
     }
 
-    if (_wcslwr_s(leaf, std::size(leaf))) {
+    if (_wcslwr_s(leaf, mozilla::ArrayLength(leaf))) {
       return false;
     }
 
@@ -487,7 +487,8 @@ static bool PrepPing(const PingThreadContext& aContext, const std::wstring& aId,
   tm gmTm;
   if (!gmtime_s(&gmTm, &now)) {
     char isoTimeBuf[32] = {};
-    if (strftime(isoTimeBuf, std::size(isoTimeBuf), "%FT%T.000Z", &gmTm)) {
+    if (strftime(isoTimeBuf, mozilla::ArrayLength(isoTimeBuf), "%FT%T.000Z",
+                 &gmTm)) {
       aJson.StringProperty("creationDate", isoTimeBuf);
     }
   }
@@ -532,7 +533,7 @@ static bool PrepPing(const PingThreadContext& aContext, const std::wstring& aId,
 
   WCHAR localeName[LOCALE_NAME_MAX_LENGTH] = {};
   int localeNameLen =
-      ::GetUserDefaultLocaleName(localeName, std::size(localeName));
+      ::GetUserDefaultLocaleName(localeName, mozilla::ArrayLength(localeName));
   if (localeNameLen) {
     auto localeNameUtf8 = WideToUTF8(localeName, localeNameLen - 1);
     if (localeNameUtf8) {
@@ -646,19 +647,19 @@ static bool DoSendPing(const PingThreadContext& aContext) {
 
   wchar_t drive[_MAX_DRIVE] = {};
   wchar_t dir[_MAX_DIR] = {};
-  if (_wsplitpath_s(exePath.get(), drive, std::size(drive), dir, std::size(dir),
-                    nullptr, 0, nullptr, 0)) {
+  if (_wsplitpath_s(exePath.get(), drive, mozilla::ArrayLength(drive), dir,
+                    mozilla::ArrayLength(dir), nullptr, 0, nullptr, 0)) {
     return false;
   }
 
   wchar_t pingSenderPath[MAX_PATH + 1] = {};
-  if (_wmakepath_s(pingSenderPath, std::size(pingSenderPath), drive, dir,
-                   L"pingsender", L"exe")) {
+  if (_wmakepath_s(pingSenderPath, mozilla::ArrayLength(pingSenderPath), drive,
+                   dir, L"pingsender", L"exe")) {
     return false;
   }
 
   // Construct the telemetry URL
-  wchar_t urlBuf[std::size(kUrl) + kGuidCharLenNoBracesNoNul] = {};
+  wchar_t urlBuf[mozilla::ArrayLength(kUrl) + kGuidCharLenNoBracesNoNul] = {};
   if (wcscpy_s(urlBuf, kUrl)) {
     return false;
   }
@@ -671,8 +672,8 @@ static bool DoSendPing(const PingThreadContext& aContext) {
   wchar_t* pingSenderArgv[] = {pingSenderPath, urlBuf,
                                const_cast<wchar_t*>(fileName.c_str())};
 
-  mozilla::UniquePtr<wchar_t[]> pingSenderCmdLine(
-      mozilla::MakeCommandLine(std::size(pingSenderArgv), pingSenderArgv));
+  mozilla::UniquePtr<wchar_t[]> pingSenderCmdLine(mozilla::MakeCommandLine(
+      mozilla::ArrayLength(pingSenderArgv), pingSenderArgv));
 
   // Now start pingsender to handle the rest
   PROCESS_INFORMATION pi;

browser/app/winlauncher/LaunchUnelevated.cpp

@@ -109,7 +109,7 @@ static mozilla::LauncherResult<bool> IsAdminByAppCompat(
   wchar_t* tokenContext = nullptr;
   const wchar_t* token = wcstok_s(valueData.get(), kDelimiters, &tokenContext);
   while (token) {
-    if (!_wcsnicmp(token, kRunAsAdmin, std::size(kRunAsAdmin))) {
+    if (!_wcsnicmp(token, kRunAsAdmin, mozilla::ArrayLength(kRunAsAdmin))) {
       return true;
     }
     token = wcstok_s(nullptr, kDelimiters, &tokenContext);