Bug 1398659. P4 - remove unused code and add some assertions.
MozReview-Commit-ID: LRgF9qjdMXz
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -222,45 +222,36 @@ ChannelMediaDecoder::Shutdown()
// Force any outstanding seek and byterange requests to complete
// to prevent shutdown from deadlocking.
if (mResource) {
mResource->Close();
}
}
nsresult
-ChannelMediaDecoder::OpenResource(nsIStreamListener** aStreamListener)
-{
- MOZ_ASSERT(NS_IsMainThread());
- if (aStreamListener) {
- *aStreamListener = nullptr;
- }
- return mResource->Open(aStreamListener);
-}
-
-nsresult
ChannelMediaDecoder::Load(nsIChannel* aChannel,
bool aIsPrivateBrowsing,
nsIStreamListener** aStreamListener)
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!mResource);
+ MOZ_ASSERT(aStreamListener);
mResource =
BaseMediaResource::Create(mResourceCallback, aChannel, aIsPrivateBrowsing);
if (!mResource) {
return NS_ERROR_FAILURE;
}
nsresult rv = MediaShutdownManager::Instance().Register(this);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
- rv = OpenResource(aStreamListener);
+ rv = mResource->Open(aStreamListener);
NS_ENSURE_SUCCESS(rv, rv);
// Set mode to METADATA since we are about to read metadata.
mResource->SetReadMode(MediaCacheStream::MODE_METADATA);
SetStateMachine(CreateStateMachine());
NS_ENSURE_TRUE(GetStateMachine(), NS_ERROR_FAILURE);
--- a/dom/media/ChannelMediaDecoder.h
+++ b/dom/media/ChannelMediaDecoder.h
@@ -88,17 +88,16 @@ public:
private:
void PinForSeek() override;
void UnpinForSeek() override;
// Create a new state machine to run this decoder.
MediaDecoderStateMachine* CreateStateMachine();
- nsresult OpenResource(nsIStreamListener** aStreamListener);
nsresult Load(BaseMediaResource* aOriginal);
// Called by MediaResource when the download has ended.
// Called on the main thread only. aStatus is the result from OnStopRequest.
void NotifyDownloadEnded(nsresult aStatus);
// Called by the MediaResource to keep track of the number of bytes read
// from the resource. Called on the main by an event runner dispatched
--- a/dom/media/MediaCache.cpp
+++ b/dom/media/MediaCache.cpp
@@ -2531,20 +2531,17 @@ MediaCacheStream::ReadFromCache(char* aB
return NS_OK;
}
nsresult
MediaCacheStream::Init(int64_t aContentLength)
{
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
-
- if (mMediaCache) {
- return NS_OK;
- }
+ MOZ_ASSERT(!mMediaCache, "Has been initialized.");
if (aContentLength > 0) {
uint32_t length = uint32_t(std::min(aContentLength, int64_t(UINT32_MAX)));
LOG("MediaCacheStream::NotifyDataLength(this=%p) "
"MEDIACACHESTREAM_NOTIFIED_LENGTH=%" PRIu32,
this,
length);
Telemetry::Accumulate(
--- a/dom/media/MediaResource.cpp
+++ b/dom/media/MediaResource.cpp
@@ -510,43 +510,37 @@ ChannelMediaResource::OnDataAvailable(ns
return rv;
NS_ASSERTION(read > 0, "Read 0 bytes while data was available?");
count -= read;
}
return NS_OK;
}
-nsresult ChannelMediaResource::Open(nsIStreamListener **aStreamListener)
+nsresult
+ChannelMediaResource::Open(nsIStreamListener** aStreamListener)
{
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
+ MOZ_ASSERT(aStreamListener);
+ MOZ_ASSERT(mChannel);
int64_t cl = -1;
- if (mChannel) {
- nsCOMPtr<nsIHttpChannel> hc = do_QueryInterface(mChannel);
- if (hc && !IsPayloadCompressed(hc)) {
- if (NS_FAILED(hc->GetContentLength(&cl))) {
- cl = -1;
- }
+ nsCOMPtr<nsIHttpChannel> hc = do_QueryInterface(mChannel);
+ if (hc && !IsPayloadCompressed(hc)) {
+ if (NS_FAILED(hc->GetContentLength(&cl))) {
+ cl = -1;
}
}
nsresult rv = mCacheStream.Init(cl);
- if (NS_FAILED(rv))
+ if (NS_FAILED(rv)) {
return rv;
- NS_ASSERTION(mOffset == 0, "Who set mOffset already?");
-
- if (!mChannel) {
- // When we're a clone, the decoder might ask us to Open even though
- // we haven't established an mChannel (because we might not need one)
- NS_ASSERTION(!aStreamListener,
- "Should have already been given a channel if we're to return a stream listener");
- return NS_OK;
}
+ MOZ_ASSERT(mOffset == 0, "Who set mOffset already?");
return OpenChannel(aStreamListener);
}
nsresult ChannelMediaResource::OpenChannel(nsIStreamListener** aStreamListener)
{
NS_ASSERTION(NS_IsMainThread(), "Only call on main thread");
NS_ENSURE_TRUE(mChannel, NS_ERROR_NULL_POINTER);
NS_ASSERTION(!mListener, "Listener should have been removed by now");