bug 801466 - part 3 1/2 remove some prmem usage from dom/ and docshell/ r=mounir

docshell/base/nsDocShell.cpp

@@ -161,7 +161,6 @@
 #include "nsIJARChannel.h"
 
 #include "prlog.h"
-#include "prmem.h"
 
 #include "nsISelectionDisplay.h"
 

dom/base/nsGlobalWindow.cpp

@@ -32,7 +32,6 @@
 // Helper Classes
 #include "nsXPIDLString.h"
 #include "nsJSUtils.h"
-#include "prmem.h"
 #include "jsapi.h"              // for JSAutoRequest
 #include "jsdbgapi.h"           // for JS_ClearWatchPointsForObject
 #include "jsfriendapi.h"        // for JS_GetGlobalForFrame

dom/base/nsJSEnvironment.cpp

@@ -49,7 +49,6 @@
 #include "nsIObjectInputStream.h"
 #include "nsIObjectOutputStream.h"
 #include "nsDOMScriptObjectHolder.h"
-#include "prmem.h"
 #include "WrapperFactory.h"
 #include "nsGlobalWindow.h"
 #include "nsScriptNameSpaceManager.h"
@@ -4106,24 +4105,18 @@ public:
 
 protected:
   JSContext *mContext;
-  jsval *mArgv;
+  FallibleTArray<jsval> mArgv;
-  uint32_t mArgc;
 };
 
 nsJSArgArray::nsJSArgArray(JSContext *aContext, uint32_t argc, jsval *argv,
                            nsresult *prv) :
-    mContext(aContext),
+    mContext(aContext)
-    mArgv(nullptr),
-    mArgc(argc)
 {
   // copy the array - we don't know its lifetime, and ours is tied to xpcom
   // refcounting.  Alloc zero'd array so cleanup etc is safe.
-  if (argc) {
+  if (!mArgv.EnsureLengthAtLeast(argc)) {
-    mArgv = (jsval *) PR_CALLOC(argc * sizeof(jsval));
+    *prv = NS_ERROR_OUT_OF_MEMORY;
-    if (!mArgv) {
+    return;
-      *prv = NS_ERROR_OUT_OF_MEMORY;
-      return;
-    }
   }
 
   // Callers are allowed to pass in a null argv even for argc > 0. They can
@@ -4148,13 +4141,10 @@ nsJSArgArray::~nsJSArgArray()
 void
 nsJSArgArray::ReleaseJSObjects()
 {
-  if (mArgv) {
+  if (!mArgv.IsEmpty())
-    PR_DELETE(mArgv);
-  }
-  if (mArgc > 0) {
-    mArgc = 0;
     NS_DROP_JS_OBJECTS(this, nsJSArgArray);
-  }
+
+  mArgv.Clear();
 }
 
 // QueryInterface implementation for nsJSArgArray
@@ -4167,12 +4157,10 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsJSArgArray)
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(nsJSArgArray)
-  jsval *argv = tmp->mArgv;
+  uint32_t length = tmp->mArgv.Length();
-  if (argv) {
+  for (uint32_t i = 0; i < length; i++) {
-    jsval *end;
+      if (JSVAL_IS_GCTHING(tmp->mArgv[i])) {
-    for (end = argv + tmp->mArgc; argv < end; ++argv) {
+        NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(JSVAL_TO_GCTHING(tmp->mArgv[i]),
-      if (JSVAL_IS_GCTHING(*argv))
-        NS_IMPL_CYCLE_COLLECTION_TRACE_JS_CALLBACK(JSVAL_TO_GCTHING(*argv),
                                                    "mArgv[i]")
     }
   }
@@ -4190,15 +4178,15 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsJSArgArray)
 nsresult
 nsJSArgArray::GetArgs(uint32_t *argc, void **argv)
 {
-  *argv = (void *)mArgv;
+  *argv = (void *)mArgv.Elements();
-  *argc = mArgc;
+  *argc = mArgv.Length();
   return NS_OK;
 }
 
 // nsIArray impl
 NS_IMETHODIMP nsJSArgArray::GetLength(uint32_t *aLength)
 {
-  *aLength = mArgc;
+  *aLength = mArgv.Length();
   return NS_OK;
 }
 
@@ -4206,7 +4194,7 @@ NS_IMETHODIMP nsJSArgArray::GetLength(uint32_t *aLength)
 NS_IMETHODIMP nsJSArgArray::QueryElementAt(uint32_t index, const nsIID & uuid, void * *result)
 {
   *result = nullptr;
-  if (index >= mArgc)
+  if (index >= mArgv.Length())
     return NS_ERROR_INVALID_ARG;
 
   if (uuid.Equals(NS_GET_IID(nsIVariant)) || uuid.Equals(NS_GET_IID(nsISupports))) {

dom/file/ArchiveZipEvent.cpp

@@ -191,7 +191,7 @@ ArchiveReaderZipEvent::Exec()
     }
 
     // Read the name:
-    char* filename = (char*)PR_Malloc(filenameLen + 1);
+    nsAutoArrayPtr<char> filename(new char[filenameLen + 1]);
     rv = inputStream->Read(filename, filenameLen, &ret);
     if (NS_FAILED(rv) || ret != filenameLen) {
       return RunShare(NS_ERROR_UNEXPECTED);
@@ -204,8 +204,6 @@ ArchiveReaderZipEvent::Exec()
       mFileList.AppendElement(new ArchiveZipItem(filename, centralStruct, mOptions));
     }
 
-    PR_Free(filename);
-
     // Ignore the rest
     seekableStream->Seek(nsISeekableStream::NS_SEEK_CUR, extraLen + commentLen);
   }

dom/plugins/base/nsPluginDirServiceProvider.cpp

@@ -8,7 +8,6 @@
 #include "nsCRT.h"
 #include "nsIFile.h"
 #include "nsDependentString.h"
-#include "prmem.h"
 #include "nsArrayEnumerator.h"
 #include "mozilla/Preferences.h"