Skip to content

Commit 052cba0

Browse files
committed
Bug 1738106 - Part 3: Switch to TaskQueue::Create, r=xpcom-reviewers,necko-reviewers,media-playback-reviewers,dragana,alwu,barret
In future parts, TaskQueue will require extra initialization to be performed which cannot happen in a constructor, as it takes references to the TaskQueue object itself, which will require the introduction of a helper method. This patch switches all callers of the TaskQueue constructor to use the new method. Differential Revision: https://phabricator.services.mozilla.com/D142604
1 parent 18f7866 commit 052cba0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+179
-170
lines changed

dom/file/MutableBlobStorage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ nsresult MutableBlobStorage::DispatchToIOThread(
631631
do_GetService(NS_STREAMTRANSPORTSERVICE_CONTRACTID);
632632
MOZ_ASSERT(target);
633633

634-
mTaskQueue = new TaskQueue(target.forget(), "BlobStorage");
634+
mTaskQueue = TaskQueue::Create(target.forget(), "BlobStorage");
635635
}
636636

637637
nsCOMPtr<nsIRunnable> runnable(aRunnable);

dom/indexedDB/ActorsChild.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2662,7 +2662,7 @@ nsresult BackgroundRequestChild::PreprocessHelper::Init(
26622662
// We use a TaskQueue here in order to be sure that the events are dispatched
26632663
// in the correct order. This is not guaranteed in case we use the I/O thread
26642664
// directly.
2665-
mTaskQueue = MakeRefPtr<TaskQueue>(target.forget(), "BackgroundRequestChild");
2665+
mTaskQueue = TaskQueue::Create(target.forget(), "BackgroundRequestChild");
26662666

26672667
ErrorResult errorResult;
26682668

dom/media/Benchmark.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ bool VP9Benchmark::IsVP9DecodeFast(bool aDefault) {
126126
}
127127

128128
Benchmark::Benchmark(MediaDataDemuxer* aDemuxer, const Parameters& aParameters)
129-
: QueueObject(new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
130-
"Benchmark::QueueObject")),
129+
: QueueObject(
130+
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
131+
"Benchmark::QueueObject")),
131132
mParameters(aParameters),
132133
mKeepAliveUntilComplete(this),
133134
mPlaybackState(this, aDemuxer) {
@@ -171,12 +172,13 @@ void Benchmark::Init() {
171172

172173
BenchmarkPlayback::BenchmarkPlayback(Benchmark* aGlobalState,
173174
MediaDataDemuxer* aDemuxer)
174-
: QueueObject(new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
175-
"BenchmarkPlayback::QueueObject")),
175+
: QueueObject(
176+
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
177+
"BenchmarkPlayback::QueueObject")),
176178
mGlobalState(aGlobalState),
177-
mDecoderTaskQueue(
178-
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
179-
"BenchmarkPlayback::mDecoderTaskQueue")),
179+
mDecoderTaskQueue(TaskQueue::Create(
180+
GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
181+
"BenchmarkPlayback::mDecoderTaskQueue")),
180182
mDemuxer(aDemuxer),
181183
mSampleIndex(0),
182184
mFrameCount(0),

dom/media/MediaDecoderStateMachine.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2761,9 +2761,9 @@ MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
27612761
mAbstractMainThread(aDecoder->AbstractMainThread()),
27622762
mFrameStats(&aDecoder->GetFrameStatistics()),
27632763
mVideoFrameContainer(aDecoder->GetVideoFrameContainer()),
2764-
mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::MDSM),
2765-
"MDSM::mTaskQueue",
2766-
/* aSupportsTailDispatch = */ true)),
2764+
mTaskQueue(TaskQueue::Create(GetMediaThreadPool(MediaThreadType::MDSM),
2765+
"MDSM::mTaskQueue",
2766+
/* aSupportsTailDispatch = */ true)),
27672767
mWatchManager(this, mTaskQueue),
27682768
mDispatchedStateMachine(false),
27692769
mDelayedScheduler(mTaskQueue, true /*aFuzzy*/),

dom/media/MediaFormatReader.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,9 @@ class MediaFormatReader::DemuxerProxy {
501501

502502
public:
503503
explicit DemuxerProxy(MediaDataDemuxer* aDemuxer)
504-
: mTaskQueue(
505-
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
506-
"DemuxerProxy::mTaskQueue")),
504+
: mTaskQueue(TaskQueue::Create(
505+
GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
506+
"DemuxerProxy::mTaskQueue")),
507507
mData(new Data(aDemuxer)) {
508508
MOZ_COUNT_CTOR(DemuxerProxy);
509509
}
@@ -853,9 +853,10 @@ MediaFormatReader::DemuxerProxy::NotifyDataArrived() {
853853

854854
MediaFormatReader::MediaFormatReader(MediaFormatReaderInit& aInit,
855855
MediaDataDemuxer* aDemuxer)
856-
: mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
857-
"MediaFormatReader::mTaskQueue",
858-
/* aSupportsTailDispatch = */ true)),
856+
: mTaskQueue(
857+
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::SUPERVISOR),
858+
"MediaFormatReader::mTaskQueue",
859+
/* aSupportsTailDispatch = */ true)),
859860
mAudio(this, MediaData::Type::AUDIO_DATA,
860861
StaticPrefs::media_audio_max_decode_error()),
861862
mVideo(this, MediaData::Type::VIDEO_DATA,
@@ -998,12 +999,12 @@ nsresult MediaFormatReader::Init() {
998999
MOZ_ASSERT(NS_IsMainThread(), "Must be on main thread.");
9991000

10001001
mAudio.mTaskQueue =
1001-
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
1002-
"MFR::mAudio::mTaskQueue");
1002+
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
1003+
"MFR::mAudio::mTaskQueue");
10031004

10041005
mVideo.mTaskQueue =
1005-
new TaskQueue(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
1006-
"MFR::mVideo::mTaskQueue");
1006+
TaskQueue::Create(GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER),
1007+
"MFR::mVideo::mTaskQueue");
10071008

10081009
return NS_OK;
10091010
}

dom/media/MediaManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2060,7 +2060,7 @@ MediaManager* MediaManager::Get() {
20602060
timesCreated++;
20612061
MOZ_RELEASE_ASSERT(timesCreated == 1);
20622062

2063-
RefPtr<TaskQueue> mediaThread = new TaskQueue(
2063+
RefPtr<TaskQueue> mediaThread = TaskQueue::Create(
20642064
GetMediaThreadPool(MediaThreadType::SUPERVISOR), "MediaManager");
20652065
LOG("New Media thread for gum");
20662066

dom/media/MediaRecorder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ class MediaRecorder::Session : public PrincipalChangeObserver<MediaStreamTrack>,
822822
}
823823

824824
mEncoderThread =
825-
MakeAndAddRef<TaskQueue>(pool.forget(), "MediaRecorderReadThread");
825+
TaskQueue::Create(pool.forget(), "MediaRecorderReadThread");
826826

827827
MOZ_DIAGNOSTIC_ASSERT(!mShutdownBlocker);
828828
// Add a shutdown blocker so mEncoderThread can be shutdown async.

dom/media/VideoFrameConverter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class VideoFrameConverter {
4747
explicit VideoFrameConverter(
4848
const dom::RTCStatsTimestampMaker& aTimestampMaker)
4949
: mTimestampMaker(aTimestampMaker),
50-
mTaskQueue(MakeAndAddRef<TaskQueue>(
50+
mTaskQueue(TaskQueue::Create(
5151
GetMediaThreadPool(MediaThreadType::WEBRTC_WORKER),
5252
"VideoFrameConverter")),
5353
mPacer(MakeAndAddRef<Pacer<FrameToProcess>>(

dom/media/VideoUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ nsresult GenerateRandomPathName(nsCString& aOutSalt, uint32_t aLength) {
778778
}
779779

780780
already_AddRefed<TaskQueue> CreateMediaDecodeTaskQueue(const char* aName) {
781-
RefPtr<TaskQueue> queue = new TaskQueue(
781+
RefPtr<TaskQueue> queue = TaskQueue::Create(
782782
GetMediaThreadPool(MediaThreadType::PLATFORM_DECODER), aName);
783783
return queue.forget();
784784
}

dom/media/gtest/TestMP4Demuxer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class MP4DemuxerBinding {
4141
explicit MP4DemuxerBinding(const char* aFileName = "dash_dashinit.mp4")
4242
: resource(new MockMediaResource(aFileName)),
4343
mDemuxer(new MP4Demuxer(resource)),
44-
mTaskQueue(new TaskQueue(
44+
mTaskQueue(TaskQueue::Create(
4545
GetMediaThreadPool(MediaThreadType::SUPERVISOR), "TestMP4Demuxer")),
4646
mIndex(0) {
4747
EXPECT_EQ(NS_OK, resource->Open());

0 commit comments

Comments
 (0)