Skip to content

Commit 385fb34

Browse files
shindlishindli
committed
Backed out 4 changesets (bug 1416724) for failing /builds/worker/workspace/build/src/dom/media/hls/HLSDemuxer.cpp:89:5 r=backout on a CLOSED TREE
Backed out changeset 45352aa4319d (bug 1416724) Backed out changeset 01d1e5263bcd (bug 1416724) Backed out changeset bc854c315ec8 (bug 1416724) Backed out changeset 35a50167485d (bug 1416724)
1 parent 768b96f commit 385fb34

28 files changed

+247
-342
lines changed

‎dom/file/MutableBlobStorage.cpp

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ MutableBlobStorage::~MutableBlobStorage()
364364

365365
if (mFD) {
366366
RefPtr<Runnable> runnable = new CloseFileRunnable(mFD);
367-
Unused << DispatchToIOThread(runnable.forget());
367+
DispatchToIOThread(runnable.forget());
368368
}
369369

370370
if (mTaskQueue) {
@@ -408,10 +408,7 @@ MutableBlobStorage::GetBlobWhenReady(nsISupports* aParent,
408408
// This Runnable will also close the FD on the I/O thread.
409409
RefPtr<Runnable> runnable =
410410
new LastRunnable(this, aParent, aContentType, aCallback);
411-
412-
// If the dispatching fails, we are shutting down and it's fine to do not
413-
// run the callback.
414-
Unused << DispatchToIOThread(runnable.forget());
411+
DispatchToIOThread(runnable.forget());
415412
return;
416413
}
417414

@@ -478,10 +475,7 @@ MutableBlobStorage::Append(const void* aData, uint32_t aLength)
478475
return NS_ERROR_OUT_OF_MEMORY;
479476
}
480477

481-
nsresult rv = DispatchToIOThread(runnable.forget());
482-
if (NS_WARN_IF(NS_FAILED(rv))) {
483-
return rv;
484-
}
478+
DispatchToIOThread(runnable.forget());
485479

486480
mDataLen += aLength;
487481
return NS_OK;
@@ -587,10 +581,7 @@ MutableBlobStorage::TemporaryFileCreated(PRFileDesc* aFD)
587581
// callback, we need just to close the file descriptor in the correct thread.
588582
if (mStorageState == eClosed && !mPendingCallback) {
589583
RefPtr<Runnable> runnable = new CloseFileRunnable(aFD);
590-
591-
// If this dispatching fails, CloseFileRunnable will close the FD in the
592-
// DTOR on the current thread.
593-
Unused << DispatchToIOThread(runnable.forget());
584+
DispatchToIOThread(runnable.forget());
594585

595586
// Let's inform the parent that we have nothing else to do.
596587
mActor->SendOperationDone(false, EmptyCString());
@@ -614,11 +605,7 @@ MutableBlobStorage::TemporaryFileCreated(PRFileDesc* aFD)
614605

615606
mData = nullptr;
616607

617-
nsresult rv = DispatchToIOThread(runnable.forget());
618-
if (NS_WARN_IF(NS_FAILED(rv))) {
619-
// Shutting down, we cannot continue.
620-
return;
621-
}
608+
DispatchToIOThread(runnable.forget());
622609

623610
// If we are closed, it means that GetBlobWhenReady() has been called when we
624611
// were already waiting for a temporary file-descriptor. Finally we are here,
@@ -631,7 +618,7 @@ MutableBlobStorage::TemporaryFileCreated(PRFileDesc* aFD)
631618
RefPtr<Runnable> runnable =
632619
new LastRunnable(this, mPendingParent, mPendingContentType,
633620
mPendingCallback);
634-
Unused << DispatchToIOThread(runnable.forget());
621+
DispatchToIOThread(runnable.forget());
635622

636623
mPendingParent = nullptr;
637624
mPendingCallback = nullptr;
@@ -664,7 +651,7 @@ MutableBlobStorage::ErrorPropagated(nsresult aRv)
664651
}
665652
}
666653

667-
nsresult
654+
void
668655
MutableBlobStorage::DispatchToIOThread(already_AddRefed<nsIRunnable> aRunnable)
669656
{
670657
if (!mTaskQueue) {
@@ -676,12 +663,7 @@ MutableBlobStorage::DispatchToIOThread(already_AddRefed<nsIRunnable> aRunnable)
676663
}
677664

678665
nsCOMPtr<nsIRunnable> runnable(aRunnable);
679-
nsresult rv = mTaskQueue->Dispatch(runnable.forget());
680-
if (NS_WARN_IF(NS_FAILED(rv))) {
681-
return rv;
682-
}
683-
684-
return NS_OK;
666+
mTaskQueue->Dispatch(runnable.forget());
685667
}
686668

687669
size_t

‎dom/file/MutableBlobStorage.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ class MutableBlobStorage final
8989

9090
bool MaybeCreateTemporaryFile();
9191

92-
MOZ_MUST_USE nsresult
93-
DispatchToIOThread(already_AddRefed<nsIRunnable> aRunnable);
92+
void DispatchToIOThread(already_AddRefed<nsIRunnable> aRunnable);
9493

9594
// All these variables are touched on the main thread only.
9695

‎dom/media/MediaDecoder.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "mozilla/dom/VideoTrack.h"
2626
#include "mozilla/dom/VideoTrackList.h"
2727
#include "mozilla/layers/ShadowLayers.h"
28-
#include "mozilla/Unused.h"
2928
#include "nsComponentManagerUtils.h"
3029
#include "nsContentUtils.h"
3130
#include "nsError.h"
@@ -1100,7 +1099,8 @@ MediaDecoder::NotifyCompositor()
11001099
mReader,
11011100
&MediaFormatReader::UpdateCompositor,
11021101
knowsCompositor.forget());
1103-
Unused << mReader->OwnerThread()->Dispatch(r.forget());
1102+
mReader->OwnerThread()->Dispatch(r.forget(),
1103+
AbstractThread::DontAssertDispatchSuccess);
11041104
}
11051105
}
11061106

@@ -1380,13 +1380,10 @@ MediaDecoder::NotifyDataArrivedInternal()
13801380
{
13811381
MOZ_ASSERT(NS_IsMainThread());
13821382
MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
1383-
1384-
nsresult rv =
1385-
mReader->OwnerThread()->Dispatch(
1386-
NewRunnableMethod("MediaFormatReader::NotifyDataArrived",
1387-
mReader.get(),
1388-
&MediaFormatReader::NotifyDataArrived));
1389-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
1383+
mReader->OwnerThread()->Dispatch(
1384+
NewRunnableMethod("MediaFormatReader::NotifyDataArrived",
1385+
mReader.get(),
1386+
&MediaFormatReader::NotifyDataArrived));
13901387
}
13911388

13921389
void

‎dom/media/MediaDecoderStateMachine.cpp

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,8 +1500,7 @@ class MediaDecoderStateMachine::NextFrameSeekingState
15001500
// seek is actually performed, the ThenValue of SeekPromise has already
15011501
// been set so that it won't be postponed.
15021502
RefPtr<Runnable> r = mAsyncSeekTask = new AysncNextFrameSeekTask(this);
1503-
nsresult rv = OwnerThread()->Dispatch(r.forget());
1504-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
1503+
OwnerThread()->Dispatch(r.forget());
15051504
}
15061505

15071506
private:
@@ -3498,12 +3497,10 @@ MediaDecoderStateMachine::ScheduleStateMachine()
34983497
}
34993498
mDispatchedStateMachine = true;
35003499

3501-
nsresult rv =
3502-
OwnerThread()->Dispatch(
3503-
NewRunnableMethod("MediaDecoderStateMachine::RunStateMachine",
3504-
this,
3505-
&MediaDecoderStateMachine::RunStateMachine));
3506-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
3500+
OwnerThread()->Dispatch(
3501+
NewRunnableMethod("MediaDecoderStateMachine::RunStateMachine",
3502+
this,
3503+
&MediaDecoderStateMachine::RunStateMachine));
35073504
}
35083505

35093506
void
@@ -3733,12 +3730,12 @@ MediaDecoderStateMachine::RequestDebugInfo()
37333730
using PromiseType = MediaDecoder::DebugInfoPromise;
37343731
RefPtr<PromiseType::Private> p = new PromiseType::Private(__func__);
37353732
RefPtr<MediaDecoderStateMachine> self = this;
3736-
nsresult rv = OwnerThread()->Dispatch(
3733+
OwnerThread()->Dispatch(
37373734
NS_NewRunnableFunction(
37383735
"MediaDecoderStateMachine::RequestDebugInfo",
37393736
[self, p]() { p->Resolve(self->GetDebugInfo(), __func__); }),
3737+
AbstractThread::AssertDispatchSuccess,
37403738
AbstractThread::TailDispatch);
3741-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
37423739
return p.forget();
37433740
}
37443741

@@ -3753,8 +3750,7 @@ void MediaDecoderStateMachine::AddOutputStream(ProcessedMediaStream* aStream,
37533750
this,
37543751
&MediaDecoderStateMachine::SetAudioCaptured,
37553752
true);
3756-
nsresult rv = OwnerThread()->Dispatch(r.forget());
3757-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
3753+
OwnerThread()->Dispatch(r.forget());
37583754
}
37593755

37603756
void MediaDecoderStateMachine::RemoveOutputStream(MediaStream* aStream)
@@ -3768,8 +3764,7 @@ void MediaDecoderStateMachine::RemoveOutputStream(MediaStream* aStream)
37683764
this,
37693765
&MediaDecoderStateMachine::SetAudioCaptured,
37703766
false);
3771-
nsresult rv = OwnerThread()->Dispatch(r.forget());
3772-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
3767+
OwnerThread()->Dispatch(r.forget());
37733768
}
37743769
}
37753770

‎dom/media/MediaDecoderStateMachine.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,7 @@ class MediaDecoderStateMachine
204204
? aEndTime
205205
: media::TimeUnit::Invalid();
206206
});
207-
nsresult rv = OwnerThread()->Dispatch(r.forget());
208-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
207+
OwnerThread()->Dispatch(r.forget());
209208
}
210209

211210
void DispatchCanPlayThrough(bool aCanPlayThrough)

‎dom/media/MediaEventSource.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "mozilla/Mutex.h"
1414
#include "mozilla/Tuple.h"
1515
#include "mozilla/TypeTraits.h"
16-
#include "mozilla/Unused.h"
1716

1817
#include "nsISupportsImpl.h"
1918
#include "nsTArray.h"
@@ -110,7 +109,7 @@ template <>
110109
struct EventTarget<AbstractThread> {
111110
static void
112111
Dispatch(AbstractThread* aTarget, already_AddRefed<nsIRunnable> aTask) {
113-
Unused << aTarget->Dispatch(Move(aTask));
112+
aTarget->Dispatch(Move(aTask), AbstractThread::DontAssertDispatchSuccess);
114113
}
115114
};
116115

‎dom/media/MediaFormatReader.cpp

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,11 +1025,9 @@ class MediaFormatReader::DemuxerProxy::Wrapper : public MediaTrackDemuxer
10251025
void Reset() override
10261026
{
10271027
RefPtr<Wrapper> self = this;
1028-
nsresult rv =
1029-
mTaskQueue->Dispatch(
1030-
NS_NewRunnableFunction("MediaFormatReader::DemuxerProxy::Wrapper::Reset",
1031-
[self]() { self->mTrackDemuxer->Reset(); }));
1032-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
1028+
mTaskQueue->Dispatch(
1029+
NS_NewRunnableFunction("MediaFormatReader::DemuxerProxy::Wrapper::Reset",
1030+
[self]() { self->mTrackDemuxer->Reset(); }));
10331031
}
10341032

10351033
nsresult GetNextRandomAccessPoint(TimeUnit* aTime) override
@@ -1086,11 +1084,9 @@ class MediaFormatReader::DemuxerProxy::Wrapper : public MediaTrackDemuxer
10861084
~Wrapper()
10871085
{
10881086
RefPtr<MediaTrackDemuxer> trackDemuxer = mTrackDemuxer.forget();
1089-
nsresult rv =
1090-
mTaskQueue->Dispatch(NS_NewRunnableFunction(
1091-
"MediaFormatReader::DemuxerProxy::Wrapper::~Wrapper",
1092-
[trackDemuxer]() { trackDemuxer->BreakCycles(); }));
1093-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
1087+
mTaskQueue->Dispatch(NS_NewRunnableFunction(
1088+
"MediaFormatReader::DemuxerProxy::Wrapper::~Wrapper",
1089+
[trackDemuxer]() { trackDemuxer->BreakCycles(); }));
10941090
}
10951091

10961092
void UpdateRandomAccessPoint()
@@ -1998,8 +1994,7 @@ MediaFormatReader::ScheduleUpdate(TrackType aTrack)
19981994
decoder.mUpdateScheduled = true;
19991995
RefPtr<nsIRunnable> task(NewRunnableMethod<TrackType>(
20001996
"MediaFormatReader::Update", this, &MediaFormatReader::Update, aTrack));
2001-
nsresult rv = OwnerThread()->Dispatch(task.forget());
2002-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
1997+
OwnerThread()->Dispatch(task.forget());
20031998
}
20041999

20052000
bool
@@ -2897,10 +2892,8 @@ MediaFormatReader::ScheduleSeek()
28972892
return;
28982893
}
28992894
mSeekScheduled = true;
2900-
nsresult rv =
2901-
OwnerThread()->Dispatch(NewRunnableMethod(
2902-
"MediaFormatReader::AttemptSeek", this, &MediaFormatReader::AttemptSeek));
2903-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
2895+
OwnerThread()->Dispatch(NewRunnableMethod(
2896+
"MediaFormatReader::AttemptSeek", this, &MediaFormatReader::AttemptSeek));
29042897
}
29052898

29062899
void

‎dom/media/MediaRecorder.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -962,12 +962,10 @@ class MediaRecorder::Session: public PrincipalChangeObserver<MediaStreamTrack>,
962962
}
963963

964964
mEncoderListener = MakeAndAddRef<EncoderListener>(mEncoderThread, this);
965-
nsresult rv =
966-
mEncoderThread->Dispatch(
967-
NewRunnableMethod<RefPtr<EncoderListener>>(
968-
"mozilla::MediaEncoder::RegisterListener",
969-
mEncoder, &MediaEncoder::RegisterListener, mEncoderListener));
970-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
965+
mEncoderThread->Dispatch(
966+
NewRunnableMethod<RefPtr<EncoderListener>>(
967+
"mozilla::MediaEncoder::RegisterListener",
968+
mEncoder, &MediaEncoder::RegisterListener, mEncoderListener));
971969

972970
if (mRecorder->mAudioNode) {
973971
mEncoder->ConnectAudioNode(mRecorder->mAudioNode,

‎dom/media/ReaderProxy.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ ReaderProxy::ReleaseResources()
135135
NewRunnableMethod("MediaFormatReader::ReleaseResources",
136136
mReader,
137137
&MediaFormatReader::ReleaseResources);
138-
nsresult rv = mReader->OwnerThread()->Dispatch(r.forget());
139-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
138+
mReader->OwnerThread()->Dispatch(r.forget());
140139
}
141140

142141
void
@@ -148,8 +147,7 @@ ReaderProxy::ResetDecode(TrackSet aTracks)
148147
mReader,
149148
&MediaFormatReader::ResetDecode,
150149
aTracks);
151-
nsresult rv = mReader->OwnerThread()->Dispatch(r.forget());
152-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
150+
mReader->OwnerThread()->Dispatch(r.forget());
153151
}
154152

155153
RefPtr<ShutdownPromise>
@@ -195,8 +193,7 @@ ReaderProxy::SetVideoBlankDecode(bool aIsBlankDecode)
195193
mReader,
196194
&MediaFormatReader::SetVideoNullDecode,
197195
aIsBlankDecode);
198-
nsresult rv = mReader->OwnerThread()->Dispatch(r.forget());
199-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
196+
mReader->OwnerThread()->Dispatch(r.forget());
200197
}
201198

202199
void
@@ -218,8 +215,7 @@ ReaderProxy::SetCanonicalDuration(
218215
mDuration.Connect(canonical);
219216
mWatchManager.Watch(mDuration, &ReaderProxy::UpdateDuration);
220217
});
221-
nsresult rv = mReader->OwnerThread()->Dispatch(r.forget());
222-
MOZ_DIAGNOSTIC_ASSERT(NS_SUCCEEDED(rv));
218+
mReader->OwnerThread()->Dispatch(r.forget());
223219
}
224220

225221
} // namespace mozilla

0 commit comments

Comments
 (0)