Bug 1372841 - Make HLSResource inherit from MediaResource instead of BaseMediaResource. r?jwwang
MozReview-Commit-ID: 3B6aaGiV77o
--- 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_ */