Bug 1372841 - Make HLSResource inherit from MediaResource instead of BaseMediaResource. r?jwwang draft
authorJames Cheng <jacheng@mozilla.com>
Wed, 14 Jun 2017 17:13:42 +0800
changeset 593928 4d57a41cc5b2eda775e43851dfe58dc3b3b69bc2
parent 593717 b266a8d8fd595b84a7d6218d7b8c6b7af0b5027c
child 633274 76f8e7bba82a56eff036a281266300ca7acf9172
push id63873
push userbmo:jacheng@mozilla.com
push dateWed, 14 Jun 2017 09:15:54 +0000
reviewersjwwang
bugs1372841
milestone56.0a1
Bug 1372841 - Make HLSResource inherit from MediaResource instead of BaseMediaResource. r?jwwang MozReview-Commit-ID: 3B6aaGiV77o
dom/media/hls/HLSResource.cpp
dom/media/hls/HLSResource.h
--- a/dom/media/hls/HLSResource.cpp
+++ b/dom/media/hls/HLSResource.cpp
@@ -29,17 +29,20 @@ HLSResourceCallbacksSupport::OnError(int
 {
   MOZ_ASSERT(mResource);
 }
 
 HLSResource::HLSResource(MediaResourceCallback* aCallback,
                          nsIChannel* aChannel,
                          nsIURI* aURI,
                          const MediaContainerType& aContainerType)
-  : BaseMediaResource(aCallback, aChannel, aURI, aContainerType)
+  : mCallback(aCallback)
+  , mChannel(aChannel)
+  , mURI(aURI)
+  , mContainerType(aContainerType)
 {
   nsCString spec;
   nsresult rv = aURI->GetSpec(spec);
   (void)rv;
   HLSResourceCallbacksSupport::Init();
   mJavaCallbacks = GeckoHLSResourceWrapper::Callbacks::New();
   HLSResourceCallbacksSupport::AttachNative(mJavaCallbacks,
                                             mozilla::MakeUnique<HLSResourceCallbacksSupport>(this));
--- a/dom/media/hls/HLSResource.h
+++ b/dom/media/hls/HLSResource.h
@@ -31,17 +31,17 @@ public:
   HLSResourceCallbacksSupport(HLSResource* aResource);
   void OnDataArrived();
   void OnError(int aErrorCode);
 
 private:
   HLSResource* mResource;
 };
 
-class HLSResource final : public BaseMediaResource
+class HLSResource final : public MediaResource
 {
 public:
   HLSResource(MediaResourceCallback* aCallback,
               nsIChannel* aChannel,
               nsIURI* aURI,
               const MediaContainerType& aContainerType);
   ~HLSResource();
   nsresult Close() override { return NS_OK; }
@@ -115,14 +115,18 @@ private:
     return size;
   }
 
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override
   {
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
+  RefPtr<MediaResourceCallback> mCallback;
+  nsCOMPtr<nsIChannel> mChannel;
+  nsCOMPtr<nsIURI> mURI;
+  const MediaContainerType mContainerType;
   java::GeckoHLSResourceWrapper::GlobalRef mHLSResourceWrapper;
   java::GeckoHLSResourceWrapper::Callbacks::GlobalRef mJavaCallbacks;
 };
 
 } // namespace mozilla
 #endif /* HLSResource_h_ */