Bug 1377370. P1 - remove unused HLSResource::mURI.
MozReview-Commit-ID: F3L2RcdjjZw
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -1436,17 +1436,17 @@ MediaResource::Create(MediaResourceCallb
if (!containerType) {
return nullptr;
}
RefPtr<MediaResource> resource;
#ifdef MOZ_ANDROID_HLS_SUPPORT
if (DecoderTraits::IsHttpLiveStreamingType(containerType.value())) {
- resource = new HLSResource(aCallback, aChannel, uri);
+ resource = new HLSResource(aCallback, aChannel);
return resource.forget();
}
#endif
// Let's try to create a FileMediaResource in case the channel is a nsIFile
nsCOMPtr<nsIFileChannel> fc = do_QueryInterface(aChannel);
if (fc) {
resource = new FileMediaResource(aCallback, aChannel, uri);
--- a/dom/media/hls/HLSResource.cpp
+++ b/dom/media/hls/HLSResource.cpp
@@ -37,22 +37,19 @@ void
HLSResourceCallbacksSupport::OnError(int aErrorCode)
{
MOZ_ASSERT(NS_IsMainThread());
if (mResource) {
mResource->onError(aErrorCode);
}
}
-HLSResource::HLSResource(MediaResourceCallback* aCallback,
- nsIChannel* aChannel,
- nsIURI* aURI)
+HLSResource::HLSResource(MediaResourceCallback* aCallback, nsIChannel* aChannel)
: mCallback(aCallback)
, mChannel(aChannel)
- , mURI(aURI)
{
nsCString spec;
nsresult rv = aURI->GetSpec(spec);
(void)rv;
HLSResourceCallbacksSupport::Init();
mJavaCallbacks = GeckoHLSResourceWrapper::Callbacks::New();
mCallbackSupport = new HLSResourceCallbacksSupport(this);
HLSResourceCallbacksSupport::AttachNative(mJavaCallbacks, mCallbackSupport);
--- a/dom/media/hls/HLSResource.h
+++ b/dom/media/hls/HLSResource.h
@@ -114,16 +114,15 @@ private:
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override
{
return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
}
RefPtr<MediaResourceCallback> mCallback;
nsCOMPtr<nsIChannel> mChannel;
- nsCOMPtr<nsIURI> mURI;
java::GeckoHLSResourceWrapper::GlobalRef mHLSResourceWrapper;
java::GeckoHLSResourceWrapper::Callbacks::GlobalRef mJavaCallbacks;
RefPtr<HLSResourceCallbacksSupport> mCallbackSupport;
};
} // namespace mozilla
#endif /* HLSResource_h_ */