Bug 1660954. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D88113
dothq · Sep 21, 2020 · 55f9e3c · 55f9e3c
1 parent 89d33e1
commit 55f9e3c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/dom/abort/AbortSignal.cpp b/dom/abort/AbortSignal.cpp
@@ -26,12 +26,8 @@ void AbortSignalImpl::Abort() {
 
   mAborted = true;
 
-  // We might be deleted as a result of aborting a follower, so ensure we live
-  // until all followers have been aborted.
-  RefPtr<AbortSignalImpl> pinThis = this;
-
   // Let's inform the followers.
-  for (AbortFollower* follower : mFollowers.ForwardRange()) {
+  for (RefPtr<AbortFollower> follower : mFollowers.ForwardRange()) {
     follower->Abort();
   }
 }

diff --git a/dom/abort/AbortSignal.h b/dom/abort/AbortSignal.h
@@ -8,6 +8,7 @@
 #define mozilla_dom_AbortSignal_h
 
 #include "mozilla/DOMEventTargetHelper.h"
+#include "nsISupportsImpl.h"
 #include "nsTObserverArray.h"
 
 namespace mozilla {
@@ -20,6 +21,8 @@ class AbortSignalImpl;
 // AbortSignalImpl.
 class AbortFollower {
  public:
+  NS_INLINE_DECL_PURE_VIRTUAL_REFCOUNTING
+
   virtual void Abort() = 0;
 
   void Follow(AbortSignalImpl* aSignal);
@@ -40,6 +43,9 @@ class AbortFollower {
 // Unfollow() when Unlinking.
 class AbortSignalImpl : public AbortFollower, public nsISupports {
  public:
+  using nsISupports::AddRef;
+  using nsISupports::Release;
+
   explicit AbortSignalImpl(bool aAborted);
 
   bool Aborted() const;

diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
@@ -141,7 +141,7 @@ class AbortSignalProxy final : public AbortFollower {
   };
 
  public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AbortSignalProxy)
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(AbortSignalProxy, override)
 
   AbortSignalProxy(AbortSignalImpl* aSignalImpl,
                    nsIEventTarget* aMainThreadEventTarget)

diff --git a/dom/fetch/Fetch.h b/dom/fetch/Fetch.h
@@ -122,6 +122,9 @@ nsresult ExtractByteStreamFromBody(const fetch::ResponseBodyInit& aBodyInit,
 template <class Derived>
 class FetchBody : public BodyStreamHolder, public AbortFollower {
  public:
+  using BodyStreamHolder::AddRef;
+  using BodyStreamHolder::Release;
+
   bool GetBodyUsed(ErrorResult& aRv) const;
 
   // For use in assertions. On success, returns true if the body is used, false