Bug 1323931. Part 6 - remove unused functions. r?kaku draft
authorJW Wang <jwwang@mozilla.com>
Fri, 16 Dec 2016 16:09:35 +0800
changeset 450847 0d261ce6e79e4e9be8627710f1d6d1c975cb2e89
parent 450846 795f197e5d522b96d22001dfab42c6306a520b5e
child 539841 3e4d4b9c535fd6c52c2ab72be0657f473cf53b7a
push id38961
push userjwwang@mozilla.com
push dateMon, 19 Dec 2016 03:21:27 +0000
reviewerskaku
bugs1323931
milestone53.0a1
Bug 1323931. Part 6 - remove unused functions. r?kaku MozReview-Commit-ID: LdyMhmOicSc
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -881,17 +881,17 @@ public:
 
     if (mSeekJob.mTarget.IsFast()) {
       // Non-precise seek; we can stop the seek at the first sample.
       mMaster->Push(aAudio);
       mDoneAudioSeeking = true;
     } else {
       nsresult rv = DropAudioUpToSeekTarget(aAudio->As<AudioData>());
       if (NS_FAILED(rv)) {
-        OnSeekTaskRejected(rv);
+        mMaster->DecodeError(rv);
         return;
       }
     }
 
     if (!mDoneAudioSeeking) {
       RequestAudioData();
       return;
     }
@@ -907,17 +907,17 @@ public:
 
     if (mSeekJob.mTarget.IsFast()) {
       // Non-precise seek. We can stop the seek at the first sample.
       mMaster->Push(aVideo);
       mDoneVideoSeeking = true;
     } else {
       nsresult rv = DropVideoUpToSeekTarget(aVideo);
       if (NS_FAILED(rv)) {
-        OnSeekTaskRejected(rv);
+        mMaster->DecodeError(rv);
         return;
       }
     }
 
     if (!mDoneVideoSeeking) {
       RequestVideoData();
       return;
     }
@@ -962,17 +962,17 @@ public:
           mMaster->Push(mFirstVideoFrameAfterSeek);
         }
       }
       MaybeFinishSeek();
       return;
     }
 
     // This is a decode error, delegate to the generic error path.
-    OnSeekTaskRejected(aError);
+    mMaster->DecodeError(aError);
   }
 
   void HandleAudioWaited(MediaData::Type aType) override
   {
     MOZ_ASSERT(!mDoneAudioSeeking || !mDoneVideoSeeking, "Seek shouldn't be finished");
 
     // Ignore pending requests from video-only seek.
     if (mSeekJob.mTarget.IsVideoOnly()) {
@@ -1067,19 +1067,18 @@ private:
     }
     if (!mDoneAudioSeeking) {
       RequestAudioData();
     }
   }
 
   void OnSeekRejected(const MediaResult& aError) {
     mSeekRequest.Complete();
-
     MOZ_ASSERT(NS_FAILED(aError), "Cancels should also disconnect mSeekRequest");
-    OnSeekTaskRejected(aError);
+    mMaster->DecodeError(aError);
   }
 
   void RequestAudioData()
   {
     MOZ_ASSERT(!mDoneAudioSeeking);
     MOZ_ASSERT(!Reader()->IsRequestingAudioData());
     MOZ_ASSERT(!Reader()->IsWaitingAudioData());
     Reader()->RequestAudioData();
@@ -1217,30 +1216,20 @@ private:
     }
 
     return NS_OK;
   }
 
   void MaybeFinishSeek()
   {
     if (mDoneAudioSeeking && mDoneVideoSeeking) {
-      OnSeekTaskResolved();
+      SeekCompleted();
     }
   }
 
-  void OnSeekTaskResolved()
-  {
-    SeekCompleted();
-  }
-
-  void OnSeekTaskRejected(const MediaResult& aError)
-  {
-    mMaster->DecodeError(aError);
-  }
-
   /*
    * Track the current seek promise made by the reader.
    */
   MozPromiseRequestHolder<MediaDecoderReader::SeekPromise> mSeekRequest;
 
   /*
    * Internal state.
    */