Bug 1128357 - Fix rebase error. a=bustage
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 11 Mar 2015 22:33:27 -0400
changeset 257633 31275b97d5366070bdcc5c2d9c795a1cf884153f
parent 257632 983b2bf5229e5e4d0712f878131592dfe459c78b
child 257634 646122234d90eb36f8c41dbef272d99566b477e8
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1128357
milestone38.0a2
Bug 1128357 - Fix rebase error. a=bustage
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1509,22 +1509,22 @@ void MediaDecoderStateMachine::SetDorman
   DECODER_LOG("SetDormant=%d", aDormant);
 
   if (aDormant) {
     if (mState == DECODER_STATE_SEEKING) {
       if (mQueuedSeekTarget.IsValid()) {
         // Keep latest seek target
       } else if (mSeekTarget.IsValid()) {
         mQueuedSeekTarget = mSeekTarget;
+      } else if (mCurrentSeekTarget.IsValid()) {
+        mQueuedSeekTarget = mCurrentSeekTarget;
       } else {
         mQueuedSeekTarget = SeekTarget(mCurrentFrameTime,
                                        SeekTarget::Accurate,
                                        MediaDecoderEventVisibility::Suppressed);
-      } else if (mCurrentSeekTarget.IsValid()) {
-        mQueuedSeekTarget = mCurrentSeekTarget;
       }
     } else {
       mQueuedSeekTarget = SeekTarget(mCurrentFrameTime,
                                      SeekTarget::Accurate,
                                      MediaDecoderEventVisibility::Suppressed);
     }
     mSeekTarget.Reset();
     mCurrentSeekTarget.Reset();