Bug 1209351 (part 5) - Optimize nsTHashTable::RemoveEntry() usage in security/. r=keeler.

--HG--
extra : rebase_source : 74877baad7a7e019c7151efaad96d7b8ccc4b6f5

security/apps/AppSignatureVerification.cpp

@@ -811,7 +811,7 @@ OpenSignedAppFile(AppTrustedRoot aTrustedRoot, nsIFile* aJarFile,
     }
 
     // Remove the item so we can check for leftover items later
-    items.RemoveEntry(entryFilename);
+    items.RemoveEntry(item);
   }
 
   // We verified that every entry that we require to be signed is signed. But,
@@ -1321,7 +1321,7 @@ CheckDirForUnsignedFiles(nsIFile* aDir,
       }
 
       // Remove the item so we can check for leftover items later
-      aItems.RemoveEntry(curName);
+      aItems.RemoveEntry(item);
     }
   }
   files->Close();

security/manager/ssl/CertBlocklist.cpp

@@ -348,14 +348,15 @@ CertBlocklist::AddRevokedCertInternal(const nsACString& aEncodedDN,
 
 
   if (aItemState == CertNewFromBlocklist) {
-    // we want SaveEntries to be a no-op if no new entries are added
-    if (!mBlocklist.Contains(item)) {
+    // We want SaveEntries to be a no-op if no new entries are added.
+    nsGenericHashKey<CertBlocklistItem>* entry = mBlocklist.GetEntry(item);
+    if (!entry) {
       mModified = true;
+    } else {
+      // Ensure that any existing item is replaced by a fresh one so we can
+      // use mIsCurrent to decide which entries to write out.
+      mBlocklist.RemoveEntry(entry);
     }
-
-    // Ensure that any existing item is replaced by a fresh one so we can
-    // use mIsCurrent to decide which entries to write out
-    mBlocklist.RemoveEntry(item);
     item.mIsCurrent = true;
   }
   mBlocklist.PutEntry(item);