Bug 1399760. P1 - remove the CopySegmentToCache() member function.
MozReview-Commit-ID: 3D9RiK3PJUf
--- a/dom/media/ChannelMediaResource.cpp
+++ b/dom/media/ChannelMediaResource.cpp
@@ -377,35 +377,27 @@ ChannelMediaResource::OnChannelRedirect(
int64_t aOffset)
{
mChannel = aNew;
mSuspendAgent.NotifyChannelOpened(mChannel);
return SetupChannelHeaders(aOffset);
}
nsresult
-ChannelMediaResource::CopySegmentToCache(const char* aFromSegment,
- uint32_t aCount,
- uint32_t* aWriteCount)
-{
- mCacheStream.NotifyDataReceived(aCount, aFromSegment);
- *aWriteCount = aCount;
- return NS_OK;
-}
-
-nsresult
ChannelMediaResource::CopySegmentToCache(nsIInputStream* aInStream,
void* aResource,
const char* aFromSegment,
uint32_t aToOffset,
uint32_t aCount,
uint32_t* aWriteCount)
{
ChannelMediaResource* res = static_cast<ChannelMediaResource*>(aResource);
- return res->CopySegmentToCache(aFromSegment, aCount, aWriteCount);
+ res->mCacheStream.NotifyDataReceived(aCount, aFromSegment);
+ *aWriteCount = aCount;
+ return NS_OK;
}
nsresult
ChannelMediaResource::OnDataAvailable(nsIRequest* aRequest,
nsIInputStream* aStream,
uint32_t aCount)
{
// This might happen off the main thread.
--- a/dom/media/ChannelMediaResource.h
+++ b/dom/media/ChannelMediaResource.h
@@ -173,20 +173,16 @@ protected:
static nsresult CopySegmentToCache(nsIInputStream* aInStream,
void* aResource,
const char* aFromSegment,
uint32_t aToOffset,
uint32_t aCount,
uint32_t* aWriteCount);
- nsresult CopySegmentToCache(const char* aFromSegment,
- uint32_t aCount,
- uint32_t* aWriteCount);
-
// Main thread access only
RefPtr<Listener> mListener;
// When this flag is set, if we get a network error we should silently
// reopen the stream.
bool mReopenOnError;
// Any thread access
MediaCacheStream mCacheStream;