Bug 1421875. P1 - rename MediaDecoder::NotifyDataArrivedInternal(). draft
authorJW Wang <jwwang@mozilla.com>
Thu, 30 Nov 2017 10:51:56 +0800
changeset 706011 3dc725ad54a7c0e5ac3331976905fe09bc0f1e74
parent 705450 84001497b7a017f4c95933a1a228ecc2eec958db
child 706012 efb0dfc09be2031b35b512417bae840961ee1b0f
push id91664
push userjwwang@mozilla.com
push dateFri, 01 Dec 2017 01:21:04 +0000
bugs1421875
milestone59.0a1
Bug 1421875. P1 - rename MediaDecoder::NotifyDataArrivedInternal(). MozReview-Commit-ID: DVzTX4GePtB
dom/media/ChannelMediaDecoder.cpp
dom/media/MediaDecoder.cpp
dom/media/MediaDecoder.h
--- a/dom/media/ChannelMediaDecoder.cpp
+++ b/dom/media/ChannelMediaDecoder.cpp
@@ -69,17 +69,17 @@ ChannelMediaDecoder::ResourceCallback::N
 
 /* static */ void
 ChannelMediaDecoder::ResourceCallback::TimerCallback(nsITimer* aTimer,
                                                      void* aClosure)
 {
   MOZ_ASSERT(NS_IsMainThread());
   ResourceCallback* thiz = static_cast<ResourceCallback*>(aClosure);
   MOZ_ASSERT(thiz->mDecoder);
-  thiz->mDecoder->NotifyDataArrivedInternal();
+  thiz->mDecoder->NotifyReaderDataArrived();
   thiz->mTimerArmed = false;
 }
 
 void
 ChannelMediaDecoder::ResourceCallback::NotifyDataArrived()
 {
   MOZ_ASSERT(NS_IsMainThread());
   if (!mDecoder) {
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1386,33 +1386,32 @@ MediaDecoder::SizeOfAudioQueue()
   MOZ_ASSERT(NS_IsMainThread());
   if (mDecoderStateMachine) {
     return mDecoderStateMachine->SizeOfAudioQueue();
   }
   return 0;
 }
 
 void
-MediaDecoder::NotifyDataArrivedInternal()
+MediaDecoder::NotifyReaderDataArrived()
 {
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
 
-  nsresult rv =
-    mReader->OwnerThread()->Dispatch(
-      NewRunnableMethod("MediaFormatReader::NotifyDataArrived",
-                        mReader.get(),
-                        &MediaFormatReader::NotifyDataArrived));
+  nsresult rv = mReader->OwnerThread()->Dispatch(
+    NewRunnableMethod("MediaFormatReader::NotifyDataArrived",
+                      mReader.get(),
+                      &MediaFormatReader::NotifyDataArrived));
   MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
 }
 
 void
 MediaDecoder::NotifyDataArrived()
 {
-  NotifyDataArrivedInternal();
+  NotifyReaderDataArrived();
   DownloadProgressed();
 }
 
 // Provide access to the state machine object
 MediaDecoderStateMachine*
 MediaDecoder::GetStateMachine() const
 {
   MOZ_ASSERT(NS_IsMainThread());
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -509,17 +509,17 @@ private:
   // is synchronised on a monitor. The lifetime of this object is
   // after mPlayState is LOADING and before mPlayState is SHUTDOWN. It
   // is safe to access it during this period.
   //
   // Explicitly prievate to force access via accessors.
   RefPtr<MediaDecoderStateMachine> mDecoderStateMachine;
 
 protected:
-  void NotifyDataArrivedInternal();
+  void NotifyReaderDataArrived();
   void DiscardOngoingSeekIfExists();
   virtual void CallSeek(const SeekTarget& aTarget);
 
   // Called to notify fetching media data is in progress.
   // Called on the main thread only.
   virtual void DownloadProgressed();
 
   // Called by MediaResource when the principal of the resource has