Bug 1399760. P1 - remove the CopySegmentToCache() member function. draft
authorJW Wang <jwwang@mozilla.com>
Wed, 20 Sep 2017 11:12:48 +0800
changeset 667462 71c9a373a316ceba0093935437919b0898634cb2
parent 667303 a0eb21bf55e1c1ae0ba311e6f2273da05c712799
child 667463 d58361930c66a573c8cb75cd284f4d180cce9d2e
push id80715
push userjwwang@mozilla.com
push dateWed, 20 Sep 2017 04:01:13 +0000
bugs1399760
milestone57.0a1
Bug 1399760. P1 - remove the CopySegmentToCache() member function. MozReview-Commit-ID: 3D9RiK3PJUf
dom/media/ChannelMediaResource.cpp
dom/media/ChannelMediaResource.h
--- 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;