Fix clang build failure. draft
authorKit Cambridge <kcambridge@mozilla.com>
Thu, 26 May 2016 17:01:34 -0700
changeset 382023 9dd756b1dc6ae6c82d6e6cfe7e6e85f5b29c9672
parent 381476 0e3f8401b804702c894eb5fdf7eae3cbdf618668
child 382024 6a7b22054ec9d39a3eea63ad7480458e6b244bdb
child 383295 236d3841eb3ef469f02f3e1501b1854ee8b88210
push id21595
push userkcambridge@mozilla.com
push dateTue, 28 Jun 2016 17:47:28 +0000
milestone50.0a1
Fix clang build failure. MozReview-Commit-ID: LYqPHKPL8fy
dom/media/MediaFormatReader.cpp
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -577,17 +577,17 @@ MediaFormatReader::OnDemuxFailed(TrackTy
       NotifyError(aTrack);
       break;
     case DemuxerFailureReason::WAITING_FOR_DATA:
       if (!decoder.mWaitingForData) {
         decoder.mNeedDraining = true;
       }
       NotifyWaitingForData(aTrack);
       break;
-    case DemuxerFailureReason::CANCELED: MOZ_FALLTHROUGH;
+    case DemuxerFailureReason::CANCELED:
     case DemuxerFailureReason::SHUTDOWN:
       if (decoder.HasPromise()) {
         decoder.RejectPromise(CANCELED, __func__);
       }
       break;
     default:
       MOZ_ASSERT(false);
       break;
@@ -1062,17 +1062,17 @@ MediaFormatReader::InternalSeek(TrackTyp
                       switch (aResult) {
                         case DemuxerFailureReason::WAITING_FOR_DATA:
                           self->NotifyWaitingForData(aTrack);
                           break;
                         case DemuxerFailureReason::END_OF_STREAM:
                           decoder.mTimeThreshold.reset();
                           self->NotifyEndOfStream(aTrack);
                           break;
-                        case DemuxerFailureReason::CANCELED: MOZ_FALLTHROUGH;
+                        case DemuxerFailureReason::CANCELED:
                         case DemuxerFailureReason::SHUTDOWN:
                           decoder.mTimeThreshold.reset();
                           break;
                         default:
                           decoder.mTimeThreshold.reset();
                           self->NotifyError(aTrack);
                           break;
                       }
@@ -1551,26 +1551,26 @@ MediaFormatReader::OnVideoSkipCompleted(
 void
 MediaFormatReader::OnVideoSkipFailed(MediaTrackDemuxer::SkipFailureHolder aFailure)
 {
   MOZ_ASSERT(OnTaskQueue());
   LOG("Skipping failed, skipped %u frames", aFailure.mSkipped);
   mSkipRequest.Complete();
 
   switch (aFailure.mFailure) {
-    case DemuxerFailureReason::END_OF_STREAM: MOZ_FALLTHROUGH;
+    case DemuxerFailureReason::END_OF_STREAM:
     case DemuxerFailureReason::WAITING_FOR_DATA:
       // Some frames may have been output by the decoder since we initiated the
       // videoskip process and we know they would be late.
       DropDecodedSamples(TrackInfo::kVideoTrack);
       // We can't complete the skip operation, will just service a video frame
       // normally.
       NotifyDecodingRequested(TrackInfo::kVideoTrack);
       break;
-    case DemuxerFailureReason::CANCELED: MOZ_FALLTHROUGH;
+    case DemuxerFailureReason::CANCELED:
     case DemuxerFailureReason::SHUTDOWN:
       if (mVideo.HasPromise()) {
         mVideo.RejectPromise(CANCELED, __func__);
       }
       break;
     default:
       NotifyError(TrackType::kVideoTrack);
       break;