Bug 1343428 - Label runnables in dom/media/MediaDecoder.cpp. r=gerald

MozReview-Commit-ID: Jv6iXO9ZxZH

--HG--
extra : rebase_source : 1bb7d9adade46dcfc982956b2bf25ddd9901ae25
extra : source : 8e66c8373a28678e500d831993bf7661c84a34ae

dom/media/MediaDecoder.cpp

@@ -63,6 +63,8 @@ LazyLogModule gMediaDecoderLog("MediaDecoder");
 #define DUMP_LOG(x, ...) \
   NS_DebugBreak(NS_DEBUG_WARNING, nsPrintfCString("Decoder=%p " x, this, ##__VA_ARGS__).get(), nullptr, nullptr, -1)
 
+#define NS_DispatchToMainThread(...) CompileError_UseAbstractMainThreadInstead
+
 static const char*
 ToPlayStateStr(MediaDecoder::PlayState aState)
 {
@@ -154,6 +156,7 @@ MediaDecoder::ResourceCallback::Connect(MediaDecoder* aDecoder)
   MOZ_ASSERT(NS_IsMainThread());
   mDecoder = aDecoder;
   mTimer = do_CreateInstance("@mozilla.org/timer;1");
+  mTimer->SetTarget(mAbstractMainThread->AsEventTarget());
 }
 
 void
@@ -1655,8 +1658,8 @@ MediaMemoryTracker::CollectReports(nsIHandleReportCallback* aHandleReport,
   nsCOMPtr<nsISupports> data = aData;
 
   resourceSizes->Promise()->Then(
-      // Non-DocGroup version of AbstractThread::MainThread is fine for memory
-      // report.
+      // Don't use SystemGroup::AbstractMainThreadFor() for
+      // handleReport->Callback() will run scripts.
       AbstractThread::MainThread(),
       __func__,
       [handleReport, data] (size_t size) {
@@ -1815,7 +1818,7 @@ MediaDecoder::DumpDebugInfo()
 
   RefPtr<MediaDecoder> self = this;
   GetStateMachine()->RequestDebugInfo()->Then(
-    AbstractThread::MainThread(), __func__,
+    SystemGroup::AbstractMainThreadFor(TaskCategory::Other), __func__,
     [this, self, str] (const nsACString& aString) {
       DUMP_LOG("%s", str.get());
       DUMP_LOG("%s", aString.Data());
@@ -1836,7 +1839,7 @@ MediaDecoder::RequestDebugInfo()
   }
 
   return GetStateMachine()->RequestDebugInfo()->Then(
-    AbstractThread::MainThread(), __func__,
+    SystemGroup::AbstractMainThreadFor(TaskCategory::Other), __func__,
     [str] (const nsACString& aString) {
       nsCString result = str + nsCString("\n") + aString;
       return DebugInfoPromise::CreateAndResolve(result, __func__);
@@ -1872,3 +1875,4 @@ MediaMemoryTracker::~MediaMemoryTracker()
 
 // avoid redefined macro in unified build
 #undef DECODER_LOG
+#undef NS_DispatchToMainThread