Bug 1289211 - Rename InfallibleTArray to nsTArray in chrome/ r=mconley
authorBarret Rennie <barret@brennie.ca>
Wed, 10 Jul 2019 03:58:10 +0000
changeset 482195 f1e513edd27d9f1d42189f533e7adc2885b02a31
parent 482194 97c36afd06420842387a5cfcd7073b8b8b7b123b
child 482196 3c9837d8ce91659a00a14569e0cecaeca41fc09d
push id113654
push useraiakab@mozilla.com
push dateWed, 10 Jul 2019 22:00:37 +0000
treeherdermozilla-inbound@8c710c79d4a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1289211
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1289211 - Rename InfallibleTArray to nsTArray in chrome/ r=mconley Differential Revision: https://phabricator.services.mozilla.com/D36939
chrome/nsChromeRegistryChrome.cpp
chrome/nsChromeRegistryContent.cpp
chrome/nsChromeRegistryContent.h
--- a/chrome/nsChromeRegistryChrome.cpp
+++ b/chrome/nsChromeRegistryChrome.cpp
@@ -233,19 +233,19 @@ nsChromeRegistryChrome::CheckForNewChrom
 static void SerializeURI(nsIURI* aURI, SerializedURI& aSerializedURI) {
   if (!aURI) return;
 
   aURI->GetSpec(aSerializedURI.spec);
 }
 
 void nsChromeRegistryChrome::SendRegisteredChrome(
     mozilla::dom::PContentParent* aParent) {
-  InfallibleTArray<ChromePackage> packages;
-  InfallibleTArray<SubstitutionMapping> resources;
-  InfallibleTArray<OverrideMapping> overrides;
+  nsTArray<ChromePackage> packages;
+  nsTArray<SubstitutionMapping> resources;
+  nsTArray<OverrideMapping> overrides;
 
   for (auto iter = mPackagesHash.Iter(); !iter.Done(); iter.Next()) {
     ChromePackage chromePackage;
     ChromePackageFromPackageEntry(iter.Key(), iter.UserData(), &chromePackage,
                                   SKIN);
     packages.AppendElement(chromePackage);
   }
 
--- a/chrome/nsChromeRegistryContent.cpp
+++ b/chrome/nsChromeRegistryContent.cpp
@@ -8,20 +8,20 @@
 #include "nsChromeRegistryContent.h"
 #include "nsString.h"
 #include "nsNetUtil.h"
 #include "nsIResProtocolHandler.h"
 
 nsChromeRegistryContent::nsChromeRegistryContent() {}
 
 void nsChromeRegistryContent::RegisterRemoteChrome(
-    const InfallibleTArray<ChromePackage>& aPackages,
-    const InfallibleTArray<SubstitutionMapping>& aSubstitutions,
-    const InfallibleTArray<OverrideMapping>& aOverrides,
-    const nsACString& aLocale, bool aReset) {
+    const nsTArray<ChromePackage>& aPackages,
+    const nsTArray<SubstitutionMapping>& aSubstitutions,
+    const nsTArray<OverrideMapping>& aOverrides, const nsACString& aLocale,
+    bool aReset) {
   MOZ_ASSERT(aReset || mLocale.IsEmpty(), "RegisterChrome twice?");
 
   if (aReset) {
     mPackagesHash.Clear();
     mOverrideTable.Clear();
     // XXX Can't clear resources.
   }
 
--- a/chrome/nsChromeRegistryContent.h
+++ b/chrome/nsChromeRegistryContent.h
@@ -12,21 +12,20 @@
 struct ChromePackage;
 struct SubstitutionMapping;
 struct OverrideMapping;
 
 class nsChromeRegistryContent : public nsChromeRegistry {
  public:
   nsChromeRegistryContent();
 
-  void RegisterRemoteChrome(
-      const InfallibleTArray<ChromePackage>& aPackages,
-      const InfallibleTArray<SubstitutionMapping>& aResources,
-      const InfallibleTArray<OverrideMapping>& aOverrides,
-      const nsACString& aLocale, bool aReset);
+  void RegisterRemoteChrome(const nsTArray<ChromePackage>& aPackages,
+                            const nsTArray<SubstitutionMapping>& aResources,
+                            const nsTArray<OverrideMapping>& aOverrides,
+                            const nsACString& aLocale, bool aReset);
 
   NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
                                   nsIUTF8StringEnumerator** aResult) override;
   NS_IMETHOD CheckForNewChrome() override;
   NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
                      const char16_t* aData) override;
   NS_IMETHOD IsLocaleRTL(const nsACString& package, bool* aResult) override;
   NS_IMETHOD GetSelectedLocale(const nsACString& aPackage, bool aAsBCP47,