Adding RemoveAndDelete() to nsObjectHashtable

xpcom/ds/nsHashtable.cpp

@@ -356,6 +356,18 @@ nsObjectHashtable::Reset()
     nsHashtable::Reset(mDestroyElementFun, mDestroyElementClosure);
 }
 
+PRBool
+nsObjectHashtable::RemoveAndDelete(nsHashKey *aKey)
+{
+    void *value = Remove(aKey);
+    if (value && mDestroyElementFun)
+    {
+        return (*mDestroyElementFun)(aKey, value, mDestroyElementClosure);
+    }
+    else
+        return PR_FALSE;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // nsSupportsHashtable: an nsHashtable where the elements are nsISupports*
 

xpcom/ds/nsHashtable.h

@@ -75,6 +75,7 @@ public:
 
   nsHashtable *Clone();
   void Reset();
+  PRBool RemoveAndDelete(nsHashKey *aKey);
 
 protected:
   static PR_CALLBACK PRIntn CopyElement(PLHashEntry *he, PRIntn i, void *arg);