Bug 1283394. Part 1 - rename some functions. r=kaku draft
authorJW Wang <jwwang@mozilla.com>
Thu, 30 Jun 2016 14:16:18 +0800
changeset 384318 acf0e0939b6f6016cfb0e04607ccc33fdc883211
parent 383867 1c80cc7afc0e6e5fec16904d7ca2b6d5b32a6666
child 384319 f367fdc680b81c419b90f7aa6b03229d47707a62
push id22239
push userjwwang@mozilla.com
push dateWed, 06 Jul 2016 02:16:20 +0000
reviewerskaku
bugs1283394
milestone50.0a1
Bug 1283394. Part 1 - rename some functions. r=kaku MozReview-Commit-ID: IrdaLYk1hwX
dom/media/NextFrameSeekTask.cpp
dom/media/NextFrameSeekTask.h
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -53,17 +53,17 @@ NextFrameSeekTask::NextFrameSeekTask(con
   , mHasAudio(aInfo.HasAudio())
   , mHasVideo(aInfo.HasVideo())
   , mDuration(aDuration)
 {
   AssertOwnerThread();
   MOZ_ASSERT(HasVideo());
 
   // Configure MediaDecoderReaderWrapper.
-  SetMediaDecoderReaderWrapperCallback();
+  SetCallbacks();
 }
 
 NextFrameSeekTask::~NextFrameSeekTask()
 {
   AssertOwnerThread();
   MOZ_ASSERT(mIsDiscarded);
 }
 
@@ -88,17 +88,17 @@ NextFrameSeekTask::Discard()
 
   // Disconnect MediaDecoder.
   mSeekJob.RejectIfExists(__func__);
 
   // Disconnect MDSM.
   RejectIfExist(__func__);
 
   // Disconnect MediaDecoderReader.
-  CancelMediaDecoderReaderWrapperCallback();
+  CancelCallbacks();
 
   mIsDiscarded = true;
 }
 
 bool
 NextFrameSeekTask::NeedToResetMDSM() const
 {
   AssertOwnerThread();
@@ -406,17 +406,17 @@ NextFrameSeekTask::OnVideoNotDecoded(Med
 
   if (aReason == MediaDecoderReader::END_OF_STREAM) {
     mIsVideoQueueFinished = true;
     CheckIfSeekComplete();
   }
 }
 
 void
-NextFrameSeekTask::SetMediaDecoderReaderWrapperCallback()
+NextFrameSeekTask::SetCallbacks()
 {
   AssertOwnerThread();
 
   // Register dummy callbcak for audio decoding since we don't need to handle
   // the decoded audio samples.
   mAudioCallback = mReader->AudioCallback().Connect(
     OwnerThread(), [this] (AudioCallbackData aData) {
     if (aData.is<MediaData*>()) {
@@ -446,17 +446,17 @@ NextFrameSeekTask::SetMediaDecoderReader
     OwnerThread(), [this] (WaitCallbackData aData) {
     if (aData.is<MediaData::Type>()) {
       EnsureVideoDecodeTaskQueued();
     }
   });
 }
 
 void
-NextFrameSeekTask::CancelMediaDecoderReaderWrapperCallback()
+NextFrameSeekTask::CancelCallbacks()
 {
   AssertOwnerThread();
   mAudioCallback.Disconnect();
   mVideoCallback.Disconnect();
   mAudioWaitCallback.Disconnect();
   mVideoWaitCallback.Disconnect();
 }
 
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -64,19 +64,19 @@ private:
   void OnAudioDecoded(MediaData* aAudioSample);
 
   void OnAudioNotDecoded(MediaDecoderReader::NotDecodedReason aReason);
 
   void OnVideoDecoded(MediaData* aVideoSample);
 
   void OnVideoNotDecoded(MediaDecoderReader::NotDecodedReason aReason);
 
-  void SetMediaDecoderReaderWrapperCallback();
+  void SetCallbacks();
 
-  void CancelMediaDecoderReaderWrapperCallback();
+  void CancelCallbacks();
 
   // Update the seek target's time before resolving this seek task, the updated
   // time will be used in the MDSM::SeekCompleted() to update the MDSM's position.
   void UpdateSeekTargetTime();
 
   /*
    * Data shared with MDSM.
    */