Bug 1735299 - We don't need to proxy release of URIs r=nhnt11

Previously nsIURIs were not thread safe. Now they are, so releasing them on any thread is fine. Differential Revision: https://phabricator.services.mozilla.com/D128178
dothq · Oct 19, 2021 · 182d9a3 · 182d9a3
1 parent 0ebf029
commit 182d9a3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/netwerk/protocol/http/ClassifierDummyChannel.cpp b/netwerk/protocol/http/ClassifierDummyChannel.cpp
@@ -96,12 +96,6 @@ ClassifierDummyChannel::ClassifierDummyChannel(nsIURI* aURI,
   SetLoadInfo(aLoadInfo);
 }
 
-ClassifierDummyChannel::~ClassifierDummyChannel() {
-  NS_ReleaseOnMainThread("ClassifierDummyChannel::mURI", mURI.forget());
-  NS_ReleaseOnMainThread("ClassifierDummyChannel::mTopWindowURI",
-                         mTopWindowURI.forget());
-}
-
 void ClassifierDummyChannel::AddClassificationFlags(
     uint32_t aClassificationFlags, bool aThirdParty) {
   if (aThirdParty) {

diff --git a/netwerk/protocol/http/ClassifierDummyChannel.h b/netwerk/protocol/http/ClassifierDummyChannel.h
@@ -71,7 +71,7 @@ class ClassifierDummyChannel final : public nsIChannel,
   void AddClassificationFlags(uint32_t aClassificationFlags, bool aThirdParty);
 
  private:
-  ~ClassifierDummyChannel();
+  ~ClassifierDummyChannel() = default;
 
   nsCOMPtr<nsILoadInfo> mLoadInfo;
   nsCOMPtr<nsIURI> mURI;

diff --git a/netwerk/url-classifier/AsyncUrlChannelClassifier.cpp b/netwerk/url-classifier/AsyncUrlChannelClassifier.cpp
@@ -76,7 +76,7 @@ class URIData {
 
  private:
   URIData();
-  ~URIData();
+  ~URIData() = default;
 
   nsCOMPtr<nsIURI> mURI;
   nsCString mURISpec;
@@ -117,8 +117,6 @@ nsresult URIData::Create(nsIURI* aURI, nsIURI* aInnermostURI,
 
 URIData::URIData() { MOZ_ASSERT(NS_IsMainThread()); }
 
-URIData::~URIData() { NS_ReleaseOnMainThread("URIData:mURI", mURI.forget()); }
-
 bool URIData::IsEqual(nsIURI* aURI) const {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aURI);