Bug 856455 - Make nsCOMArray::SetCapacity return void; r=bsmedberg

--HG-- extra : rebase_source : 38cdef904f9b7fc33bd3f41bd19b1778dfbd7990
dothq · Mar 31, 2013 · b0d7171 · b0d7171
1 parent c9d752c
commit b0d7171
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/content/base/src/nsDOMMutationObserver.cpp b/content/base/src/nsDOMMutationObserver.cpp
@@ -477,10 +477,7 @@ nsDOMMutationObserver::Observe(nsINode& aTarget,
       aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
       return;
     }
-    if (!filters.SetCapacity(len)) {
-      aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-      return;
-    }
+    filters.SetCapacity(len);
 
     for (uint32_t i = 0; i < len; ++i) {
       nsCOMPtr<nsIAtom> a = do_GetAtom(filtersAsString[i]);

diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp
@@ -221,8 +221,7 @@ nsMimeTypeArray::GetMimeTypes()
         }
       }
       // now we know how many there are, start gathering them.
-      if (!mMimeTypeArray.SetCapacity(pluginMimeTypeCount))
-        return NS_ERROR_OUT_OF_MEMORY;
+      mMimeTypeArray.SetCapacity(pluginMimeTypeCount);
 
       mPluginMimeTypeCount = pluginMimeTypeCount;
       mInited = true;

diff --git a/netwerk/base/src/nsLoadGroup.cpp b/netwerk/base/src/nsLoadGroup.cpp
@@ -707,9 +707,7 @@ NS_IMETHODIMP
 nsLoadGroup::GetRequests(nsISimpleEnumerator * *aRequests)
 {
     nsCOMArray<nsIRequest> requests;
-    if (!requests.SetCapacity(mRequests.entryCount)) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
+    requests.SetCapacity(mRequests.entryCount);
 
     PL_DHashTableEnumerate(&mRequests, AppendRequestsToCOMArray, &requests);
 

diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp
@@ -1658,9 +1658,7 @@ NS_IMETHODIMP
 InMemoryDataSource::GetAllResources(nsISimpleEnumerator** aResult)
 {
     nsCOMArray<nsIRDFNode> nodes;
-    if (!nodes.SetCapacity(mForwardArcs.entryCount)) {
-      return NS_ERROR_OUT_OF_MEMORY;
-    }
+    nodes.SetCapacity(mForwardArcs.entryCount);
 
     // Enumerate all of our entries into an nsCOMArray
     PL_DHashTableEnumerate(&mForwardArcs, ResourceEnumerator, &nodes);

diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -733,12 +733,10 @@ FileSystemDataSource::ArcLabelsOut(nsIRDFResource *source,
     if (! labels)
     return NS_ERROR_NULL_POINTER;
 
-    nsresult rv;
-
     if (source == mNC_FileSystemRoot)
     {
         nsCOMArray<nsIRDFResource> resources;
-        if (!resources.SetCapacity(2)) return NS_ERROR_OUT_OF_MEMORY;
+        resources.SetCapacity(2);
 
         resources.AppendObject(mNC_Child);
         resources.AppendObject(mNC_pulse);
@@ -748,7 +746,7 @@ FileSystemDataSource::ArcLabelsOut(nsIRDFResource *source,
     else if (isFileURI(source))
     {
         nsCOMArray<nsIRDFResource> resources;
-        if (!resources.SetCapacity(2)) return NS_ERROR_OUT_OF_MEMORY;
+        resources.SetCapacity(2);
 
         if (isDirURI(source))
         {

diff --git a/xpcom/ds/nsPersistentProperties.cpp b/xpcom/ds/nsPersistentProperties.cpp
@@ -611,8 +611,7 @@ nsPersistentProperties::Enumerate(nsISimpleEnumerator** aResult)
   nsCOMArray<nsIPropertyElement> props;
 
   // We know the necessary size; we can avoid growing it while adding elements
-  if (!props.SetCapacity(mTable.entryCount))
-    return NS_ERROR_OUT_OF_MEMORY;
+  props.SetCapacity(mTable.entryCount);
 
   // Step through hash entries populating a transient array
   uint32_t n =

diff --git a/xpcom/glue/nsCOMArray.h b/xpcom/glue/nsCOMArray.h
@@ -153,10 +153,8 @@ class NS_COM_GLUE nsCOMArray_base
 
     // Ensures there is enough space to store a total of aCapacity objects.
     // This method never deletes any objects.
-    bool SetCapacity(uint32_t aCapacity) {
+    void SetCapacity(uint32_t aCapacity) {
         mArray.SetCapacity(aCapacity);
-        // TODO: Make this method return void
-        return true;
     }
     uint32_t Capacity() {
         return mArray.Capacity();