Bug 1166598 (part 3) - Use PLDHashTable2 in nsCommandParams. r=froydnj.

--HG-- extra : rebase_source : 8e7e616c93cae653440a6ea2e11cd1c6da2e8821
mozilla · May 6, 2015 · bf1839c · bf1839c
1 parent 51dc9c3
commit bf1839c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/embedding/components/build/nsEmbeddingModule.cpp b/embedding/components/build/nsEmbeddingModule.cpp
@@ -31,7 +31,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserFind)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandTable)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandManager)
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCommandParams, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsCommandParams)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsControllerCommandGroup)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBaseCommandController)
 

diff --git a/embedding/components/commandhandler/nsCommandParams.cpp b/embedding/components/commandhandler/nsCommandParams.cpp
@@ -25,20 +25,12 @@ const PLDHashTableOps nsCommandParams::sHashOps =
 NS_IMPL_ISUPPORTS(nsCommandParams, nsICommandParams)
 
 nsCommandParams::nsCommandParams()
+  : mValuesHash(&sHashOps, sizeof(HashEntry), 2)
 {
-  // init the hash table later
 }
 
 nsCommandParams::~nsCommandParams()
 {
-  PL_DHashTableFinish(&mValuesHash);
-}
-
-nsresult
-nsCommandParams::Init()
-{
-  PL_DHashTableInit(&mValuesHash, &sHashOps, sizeof(HashEntry), 2);
-  return NS_OK;
 }
 
 NS_IMETHODIMP

diff --git a/embedding/components/commandhandler/nsCommandParams.h b/embedding/components/commandhandler/nsCommandParams.h
@@ -20,8 +20,6 @@ class nsCommandParams : public nsICommandParams
   NS_DECL_ISUPPORTS
   NS_DECL_NSICOMMANDPARAMS
 
-  nsresult Init();
-
 protected:
   virtual ~nsCommandParams();
 
@@ -126,7 +124,7 @@ class nsCommandParams : public nsICommandParams
 
   static void HashClearEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry);
 
-  PLDHashTable mValuesHash;
+  PLDHashTable2 mValuesHash;
 
   static const PLDHashTableOps sHashOps;
 };