Bug 1282658. Part 3 - rename some functions. r=kaku.
authorJW Wang <jwwang@mozilla.com>
Tue, 28 Jun 2016 11:59:43 +0800
changeset 303760 156ad7d5fdacf6815bacd7a5197814acb149306c
parent 303759 badd48f1ff4aaaeb69e2e25318b067decb1a1ee2
child 303761 05bcd2db0e70260de11d4ca6aaf4d7ca5b3378ff
push id30401
push usercbook@mozilla.com
push dateWed, 06 Jul 2016 09:40:34 +0000
treeherdermozilla-central@a7d6bb9e7d12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskaku
bugs1282658
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1282658. Part 3 - rename some functions. r=kaku. MozReview-Commit-ID: AbYzpTPrjd0
dom/media/AccurateSeekTask.cpp
dom/media/AccurateSeekTask.h
--- a/dom/media/AccurateSeekTask.cpp
+++ b/dom/media/AccurateSeekTask.cpp
@@ -61,17 +61,17 @@ AccurateSeekTask::AccurateSeekTask(const
   NS_ASSERTION(seekTime >= 0 && seekTime <= end,
                "Can only seek in range [0,duration]");
   mSeekJob.mTarget.SetTime(media::TimeUnit::FromMicroseconds(seekTime));
 
   mDropAudioUntilNextDiscontinuity = HasAudio();
   mDropVideoUntilNextDiscontinuity = HasVideo();
 
   // Configure MediaDecoderReaderWrapper.
-  SetMediaDecoderReaderWrapperCallback();
+  SetCallbacks();
 }
 
 AccurateSeekTask::~AccurateSeekTask()
 {
   AssertOwnerThread();
   MOZ_ASSERT(mIsDiscarded);
 }
 
@@ -97,17 +97,17 @@ AccurateSeekTask::Discard()
   // Disconnect MediaDecoder.
   mSeekJob.RejectIfExists(__func__);
 
   // Disconnect MDSM.
   RejectIfExist(__func__);
 
   // Disconnect MediaDecoderReaderWrapper.
   mSeekRequest.DisconnectIfExists();
-  CancelMediaDecoderReaderWrapperCallback();
+  CancelCallbacks();
 
   mIsDiscarded = true;
 }
 
 bool
 AccurateSeekTask::NeedToResetMDSM() const
 {
   AssertOwnerThread();
@@ -607,17 +607,17 @@ AccurateSeekTask::OnVideoNotDecoded(Medi
 
     mIsVideoQueueFinished = true;
     mDropVideoUntilNextDiscontinuity = false; // To make IsVideoSeekComplete() return TRUE.
     CheckIfSeekComplete();
   }
 }
 
 void
-AccurateSeekTask::SetMediaDecoderReaderWrapperCallback()
+AccurateSeekTask::SetCallbacks()
 {
   AssertOwnerThread();
 
   mAudioCallback = mReader->AudioCallback().Connect(
     OwnerThread(), [this] (AudioCallbackData aData) {
     if (aData.is<MediaData*>()) {
       OnAudioDecoded(aData.as<MediaData*>());
     } else {
@@ -646,17 +646,17 @@ AccurateSeekTask::SetMediaDecoderReaderW
     OwnerThread(), [this] (WaitCallbackData aData) {
     if (aData.is<MediaData::Type>()) {
       EnsureVideoDecodeTaskQueued();
     }
   });
 }
 
 void
-AccurateSeekTask::CancelMediaDecoderReaderWrapperCallback()
+AccurateSeekTask::CancelCallbacks()
 {
   AssertOwnerThread();
   mAudioCallback.Disconnect();
   mVideoCallback.Disconnect();
   mAudioWaitCallback.Disconnect();
   mVideoWaitCallback.Disconnect();
 }
 } // namespace mozilla
--- a/dom/media/AccurateSeekTask.h
+++ b/dom/media/AccurateSeekTask.h
@@ -70,19 +70,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();
 
   /*
    * Internal state.
    */
   const int64_t mCurrentTimeBeforeSeek;
   const uint32_t mAudioRate;  // Audio sample rate.
   const bool mHasAudio;
   const bool mHasVideo;