Bug 815671 part 1. Make RegisterRemoteChrome use InfallibleTArray like its caller does. r=jlebar
authorBoris Zbarsky <bzbarsky@mit.edu>
Thu, 29 Nov 2012 11:14:13 -0500
changeset 123602 9cc4fa4f431b9dc3fce8cac4669912edaa780a70
parent 123601 04c1cc1cb18ebb6f9a0729b13019ee84bdf445a5
child 123603 6469b7a5ea10bac0a29e356947aed14083ac4f05
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlebar
bugs815671
milestone20.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 815671 part 1. Make RegisterRemoteChrome use InfallibleTArray like its caller does. r=jlebar
chrome/src/nsChromeRegistryContent.cpp
chrome/src/nsChromeRegistryContent.h
--- a/chrome/src/nsChromeRegistryContent.cpp
+++ b/chrome/src/nsChromeRegistryContent.cpp
@@ -12,19 +12,19 @@
 
 nsChromeRegistryContent::nsChromeRegistryContent()
 {
   mPackagesHash.Init();
 }
 
 void
 nsChromeRegistryContent::RegisterRemoteChrome(
-    const nsTArray<ChromePackage>& aPackages,
-    const nsTArray<ResourceMapping>& aResources,
-    const nsTArray<OverrideMapping>& aOverrides,
+    const InfallibleTArray<ChromePackage>& aPackages,
+    const InfallibleTArray<ResourceMapping>& aResources,
+    const InfallibleTArray<OverrideMapping>& aOverrides,
     const nsACString& aLocale)
 {
   NS_ABORT_IF_FALSE(mLocale == nsDependentCString(""),
                     "RegisterChrome twice?");
 
   for (uint32_t i = aPackages.Length(); i > 0; ) {
     --i;
     RegisterPackage(aPackages[i]);
--- a/chrome/src/nsChromeRegistryContent.h
+++ b/chrome/src/nsChromeRegistryContent.h
@@ -15,19 +15,19 @@ struct ChromePackage;
 struct ResourceMapping;
 struct OverrideMapping;
 
 class nsChromeRegistryContent : public nsChromeRegistry
 {
  public:
   nsChromeRegistryContent();
   
-  void RegisterRemoteChrome(const nsTArray<ChromePackage>& aPackages,
-                            const nsTArray<ResourceMapping>& aResources,
-                            const nsTArray<OverrideMapping>& aOverrides,
+  void RegisterRemoteChrome(const InfallibleTArray<ChromePackage>& aPackages,
+                            const InfallibleTArray<ResourceMapping>& aResources,
+                            const InfallibleTArray<OverrideMapping>& aOverrides,
                             const nsACString& aLocale);
 
   NS_IMETHOD GetLocalesForPackage(const nsACString& aPackage,
                                   nsIUTF8StringEnumerator* *aResult) MOZ_OVERRIDE;
   NS_IMETHOD CheckForNewChrome() MOZ_OVERRIDE;
   NS_IMETHOD CheckForOSAccessibility() MOZ_OVERRIDE;
   NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic,
                      const PRUnichar* aData) MOZ_OVERRIDE;