Bug 1096078 - Restore use of Destroy() for DOMMediaStream. r=jesup

dothq · Nov 13, 2014 · f1b2045 · f1b2045
1 parent b21b6a2
commit f1b2045
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp
@@ -107,10 +107,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(DOMMediaStream)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(DOMMediaStream,
                                                 DOMEventTargetHelper)
-  if (tmp->mListener) {
-    // Make sure |mListener| cannot call back after |mTracks| is collected
-    tmp->mListener->Forget();
-  }
+  tmp->Destroy();
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mWindow)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mTracks)
   NS_IMPL_CYCLE_COLLECTION_UNLINK(mConsumersToKeepAlive)