Bug 1937908 - Revert changeset d75ea9fa6cda. r=aosmond,media-playback-reviewers

It only partially wallpapered over a problem.
Subsequent commits will fix it better.

Differential Revision: https://phabricator.services.mozilla.com/D234852

Author: Pehrsons

dom/media/gmp/GMPParent.cpp

@@ -81,7 +81,7 @@ GMPParent::GMPParent()
       mChildLaunchArch(base::PROCESS_ARCH_INVALID),
 #endif
       mMainThread(GetMainThreadSerialEventTarget()) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("GMPParent ctor id=%u", mPluginId);
 }
 
@@ -92,7 +92,7 @@ GMPParent::~GMPParent() {
 }
 
 void GMPParent::CloneFrom(const GMPParent* aOther) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   MOZ_ASSERT(aOther->mDirectory && aOther->mService, "null plugin directory");
 
   mService = aOther->mService;
@@ -169,7 +169,7 @@ RefPtr<GenericPromise> GMPParent::Init(GeckoMediaPluginServiceParent* aService,
                                        nsIFile* aPluginDir) {
   MOZ_ASSERT(aPluginDir);
   MOZ_ASSERT(aService);
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
 
   mService = aService;
   mDirectory = aPluginDir;
@@ -343,7 +343,7 @@ class NotifyGMPProcessLoadedTask : public Runnable {
 
 nsresult GMPParent::LoadProcess() {
   MOZ_ASSERT(mDirectory, "Plugin directory cannot be NULL!");
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   MOZ_ASSERT(mState == GMPState::NotLoaded);
 
   if (NS_WARN_IF(mPluginType == GMPPluginType::WidevineL1)) {
@@ -433,7 +433,7 @@ nsresult GMPParent::LoadProcess() {
 }
 
 void GMPParent::OnPreferenceChange(const mozilla::dom::Pref& aPref) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s", __FUNCTION__);
 
   if (!mProcess || !mProcess->UseXPCOM()) {
@@ -501,7 +501,7 @@ mozilla::ipc::IPCResult GMPParent::RecvGetModulesTrust(
 #endif  // defined(XP_WIN)
 
 void GMPParent::CloseIfUnused() {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s", __FUNCTION__);
 
   if ((mDeleteProcessOnlyOnUnload || mState == GMPState::Loaded ||
@@ -524,7 +524,7 @@ void GMPParent::CloseIfUnused() {
 }
 
 void GMPParent::CloseActive(bool aDieWhenUnloaded) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s: state %u", __FUNCTION__,
                        uint32_t(GMPState(mState)));
 
@@ -548,7 +548,7 @@ void GMPParent::MarkForDeletion() {
 bool GMPParent::IsMarkedForDeletion() { return mIsBlockingDeletion; }
 
 void GMPParent::Shutdown() {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s", __FUNCTION__);
 
   if (mAbnormalShutdownInProgress) {
@@ -615,7 +615,7 @@ void GMPParent::ChildTerminated() {
 }
 
 void GMPParent::DeleteProcess() {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
 
   switch (mState) {
     case GMPState::Closed:
@@ -701,17 +701,7 @@ void GMPParent::DeleteProcess() {
 
 GMPState GMPParent::State() const { return mState; }
 
-bool GMPParent::IsOnGMPEventTarget() const {
-  auto target = GMPEventTarget();
-  if (!target) {
-    // We can't get the GMP event target if it has started shutting down, but it
-    // may still run tasks.
-    return AppShutdown::IsInOrBeyond(ShutdownPhase::XPCOMShutdownThreads);
-  }
-  return target->IsOnCurrentThread();
-}
-
-nsCOMPtr<nsISerialEventTarget> GMPParent::GMPEventTarget() const {
+nsCOMPtr<nsISerialEventTarget> GMPParent::GMPEventTarget() {
   nsCOMPtr<mozIGeckoMediaPluginService> mps =
       do_GetService("@mozilla.org/gecko-media-plugin-service;1");
   MOZ_ASSERT(mps);
@@ -823,7 +813,7 @@ static void GMPNotifyObservers(const uint32_t aPluginID,
 }
 
 void GMPParent::ActorDestroy(ActorDestroyReason aWhy) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s: (%d)", __FUNCTION__, (int)aWhy);
 
   if (AbnormalShutdown == aWhy) {
@@ -916,7 +906,7 @@ bool ReadInfoField(GMPInfoFileParser& aParser, const nsCString& aKey,
 }
 
 RefPtr<GenericPromise> GMPParent::ReadGMPMetaData() {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   MOZ_ASSERT(mDirectory, "Plugin directory cannot be NULL!");
   MOZ_ASSERT(!mName.IsEmpty(), "Plugin mName cannot be empty!");
 
@@ -1005,7 +995,7 @@ static nsresult ParseVersion(const nsACString& aVersion,
 }
 
 RefPtr<GenericPromise> GMPParent::ReadGMPInfoFile(nsIFile* aFile) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMPInfoFileParser parser;
   if (!parser.Init(aFile)) {
     return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
@@ -1113,7 +1103,7 @@ RefPtr<GenericPromise> GMPParent::ReadGMPInfoFile(nsIFile* aFile) {
 }
 
 RefPtr<GenericPromise> GMPParent::ReadChromiumManifestFile(nsIFile* aFile) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   nsAutoCString json;
   if (!ReadIntoString(aFile, json, 5 * 1024)) {
     return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__);
@@ -1343,7 +1333,7 @@ void GMPParent::ResolveGetContentParentPromises() {
 }
 
 bool GMPParent::OpenPGMPContent() {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   MOZ_ASSERT(!mGMPContentParent);
 
   Endpoint<PGMPContentParent> parent;
@@ -1380,7 +1370,7 @@ void GMPParent::RejectGetContentParentPromises() {
 
 void GMPParent::GetGMPContentParent(
     UniquePtr<MozPromiseHolder<GetGMPContentParentPromise>>&& aPromiseHolder) {
-  MOZ_ASSERT(IsOnGMPEventTarget());
+  MOZ_ASSERT(GMPEventTarget()->IsOnCurrentThread());
   GMP_PARENT_LOG_DEBUG("%s %p", __FUNCTION__, this);
 
   if (mGMPContentParent) {

dom/media/gmp/GMPParent.h

@@ -91,8 +91,7 @@ class GMPParent final
   void DeleteProcess();
 
   GMPState State() const;
-  bool IsOnGMPEventTarget() const;
-  nsCOMPtr<nsISerialEventTarget> GMPEventTarget() const;
+  nsCOMPtr<nsISerialEventTarget> GMPEventTarget();
 
   void OnPreferenceChange(const mozilla::dom::Pref& aPref);