I have patches for this. I was going to do it as part of bug 1142336 but it involves some slight behavior changes, so I'm going to land the pieces separately. Note to self - local branch is streamline_media_assertions. Need to fix assertions that end up firing in test_BufferedSeek.html.

Comment on attachment 8584202 [details] [diff] [review] Part 1 - Rename OnStateMachineThread-like functions to reflect the fact that it's a task queue. v1 Review of attachment 8584202 [details] [diff] [review]: ----------------------------------------------------------------- ::: dom/media/MediaDecoder.cpp @@ +1092,5 @@ > > double MediaDecoder::ComputePlaybackRate(bool* aReliable) > { > GetReentrantMonitor().AssertCurrentThreadIn(); > + MOZ_ASSERT(NS_IsMainThread() || OnStateMachineTaskQueue() || OnDecodeThread()); Would be a good time to change all NS_IsMainThread() into IsMainTaskQueue or something. Seeing the main thread is really just a task queue-like. ::: dom/media/MediaDecoderStateMachine.h @@ +202,5 @@ > > // Functions used by assertions to ensure we're calling things > // on the appropriate threads. > bool OnDecodeThread() const; > + bool OnTaskQueue() const; I would have liked OnStateMachineTaskQueue better. it's more object that it's not the decode task queue. so many task queues. As seeing that's what MediaDecoder calls it

Comment on attachment 8584204 [details] [diff] [review] Part 3 - Rename MediaDecoderReader::OnDecodeThread to MediaDecoderReader::OnTaskQueue. v1 Review of attachment 8584204 [details] [diff] [review]: ----------------------------------------------------------------- ::: dom/media/MediaDecoderReader.h @@ +111,5 @@ > virtual nsRefPtr<ShutdownPromise> Shutdown(); > > MediaTaskQueue* EnsureTaskQueue(); > > + virtual bool OnTaskQueue() In the same vein as my suggestion (and it's just that) of the first patch OnDecodeTaskQueue would seem more appropriate ; it makes it obvious looking at the code in a glance. So we have OnDecode* and OnStateMachine* irrespective on where we are. Giving consistency across all files.

(In reply to Jean-Yves Avenard [:jya] from comment #8) > ::: dom/media/MediaDecoder.cpp > @@ +1092,5 @@ > > > > double MediaDecoder::ComputePlaybackRate(bool* aReliable) > > { > > GetReentrantMonitor().AssertCurrentThreadIn(); > > + MOZ_ASSERT(NS_IsMainThread() || OnStateMachineTaskQueue() || OnDecodeThread()); > > Would be a good time to change all NS_IsMainThread() into IsMainTaskQueue or > something. Seeing the main thread is really just a task queue-like. I think that would be super confusing, especially for people coming from other parts of Gecko - the main thread totally isn't a task queue, and there's lots of ways that nsIThread behaves differently from nsITaskQueue. > I would have liked OnStateMachineTaskQueue better. it's more object that > it's not the decode task queue. so many task queues. > As seeing that's what MediaDecoder calls it The idea here is that, long-term, this whole business about asserting that we're on thread X for method Foo::Bar and thread Y for method Foo::Baz is going to mostly go away. A given class will primarily run on a single thread (MediaDecoder on main thread, MDSM on state machine thread, Reader on decode thread, etc). OnTaskQueue/GetTaskQueue will return the task queue that the object is supposed to be operating on, and so it actually makes things _more_ consistent across files, because every method just begins with MOZ_ASSERT(OnTaskQueue()) regardless of whether it's a reader or a state machine.

remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/aab8f3243cd0 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/feff06d7fc06 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/5423b7356fac remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/cd788ba50fb0 remote: https://hg.mozilla.org/integration/mozilla-inbound/rev/1d0ffffbcc3b

https://hg.mozilla.org/mozilla-central/rev/aab8f3243cd0 https://hg.mozilla.org/mozilla-central/rev/feff06d7fc06 https://hg.mozilla.org/mozilla-central/rev/5423b7356fac https://hg.mozilla.org/mozilla-central/rev/cd788ba50fb0 https://hg.mozilla.org/mozilla-central/rev/1d0ffffbcc3b