Bug 1333289. Part 2 - retrieve debugging data from MediaDecoder/MDSM. r=jya

MozReview-Commit-ID: F4AxZFBPVPB
2017-01-24 10:49:37 +08:00
parent b094aaadf4
commit bde43eaa67
1 changed files with 14 additions and 2 deletions
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -1479,10 +1479,22 @@ HTMLMediaElement::MozRequestDebugInfo(ErrorResult& aRv)
    return nullptr;
  }

-  // TODO: collect data from MDSM which must be done off the main thread.
  nsAutoString result;
  GetMozDebugReaderData(result);
-  promise->MaybeResolve(result);
+
+  if (mDecoder) {
+    mDecoder->RequestDebugInfo()->Then(
+      AbstractThread::MainThread(), __func__,
+      [promise, result] (const nsACString& aString) {
+        promise->MaybeResolve(result + NS_ConvertUTF8toUTF16(aString));
+      },
+      [promise, result] () {
+        promise->MaybeResolve(result);
+      });
+  } else {
+    promise->MaybeResolve(result);
+  }
+
  return promise.forget();
 }