Bug 1393365 - MediaResource doesn't need to inherit nsISupports. r=cpearce

MozReview-Commit-ID: LoSctajrULP

--HG--
extra : rebase_source : 69b6a1db6e41092408814699996f2995d153c526

dom/media/MediaResource.cpp

@@ -74,7 +74,6 @@ MediaResource::Destroy()
 
 NS_IMPL_ADDREF(MediaResource)
 NS_IMPL_RELEASE_WITH_DESTROY(MediaResource, Destroy())
-NS_IMPL_QUERY_INTERFACE0(MediaResource)
 
 ChannelMediaResource::ChannelMediaResource(MediaResourceCallback* aCallback,
                                            nsIChannel* aChannel,

dom/media/MediaResource.h

@@ -149,7 +149,7 @@ typedef media::IntervalSet<int64_t> MediaByteRangeSet;
  * access, so the FileMediaResource implementation class bypasses the cache.
  * MediaResource::Create automatically chooses the best implementation class.
  */
-class MediaResource : public nsISupports
+class MediaResource
 {
 public:
   // Our refcounting is threadsafe, and when our refcount drops to zero
@@ -157,7 +157,8 @@ public:
   // Note that this means it's safe for references to this object to be
   // released on a non main thread, but the destructor will always run on
   // the main thread.
-  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_METHOD_(MozExternalRefCountType) AddRef(void);
+  NS_METHOD_(MozExternalRefCountType) Release(void);
 
   // Get the current principal for the channel
   virtual already_AddRefed<nsIPrincipal> GetCurrentPrincipal() = 0;
@@ -235,6 +236,8 @@ protected:
 
 private:
   void Destroy();
+  mozilla::ThreadSafeAutoRefCnt mRefCnt;
+  NS_DECL_OWNINGTHREAD
 };
 
 class BaseMediaResource : public MediaResource {