summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2023-10-08 09:24:21 +0000
committerMoonchild <moonchild@palemoon.org>2023-10-08 09:24:21 +0000
commit1b2c1d8eac22fa1ab1c4fff72f2de9aa025fccff (patch)
tree2add45f769425bd2c62c8ea839e7ba32b6932d5b
parente0746ccf3174d198b356d747c9bdeae86f29a306 (diff)
parent8f6d5c5ba0ea0db56e4aba45a1da4df615c9ad49 (diff)
downloaduxp-1b2c1d8eac22fa1ab1c4fff72f2de9aa025fccff.tar.gz
Merge pull request 'Correct overzealous GMP checks' (#2336) from mrnhmath/UXP:2301fix into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2336
-rw-r--r--toolkit/xre/nsEmbedFunctions.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index bedd7c9914..8235963f05 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -451,11 +451,9 @@ XRE_InitChildProcess(int aArgc,
// Content processes need the XPCOM/chromium frankenventloop
uiLoopType = MessageLoop::TYPE_MOZILLA_CHILD;
break;
-#ifdef MOZ_GMP
case GeckoProcessType_GMPlugin:
uiLoopType = MessageLoop::TYPE_DEFAULT;
break;
-#endif
default:
uiLoopType = MessageLoop::TYPE_UI;
break;
@@ -517,11 +515,13 @@ XRE_InitChildProcess(int aArgc,
#endif
break;
-#ifdef MOZ_GMP
case GeckoProcessType_GMPlugin:
+#ifdef MOZ_GMP
process = new gmp::GMPProcessChild(parentPID);
- break;
+#else
+ NS_RUNTIMEABORT("rebuild with Gecko Media Plugins enabled");
#endif
+ break;
case GeckoProcessType_GPU:
process = new gfx::GPUProcessImpl(parentPID);