wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-08 08:48:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Issue #2301 - Make Gecko Media Plugins optional when not building EME or WebRTC"

Browse source 
This reverts commit 9e7d1492e6.
This commit is contained in:
roytam1 2023-09-18 21:32:06 +08:00
commit 119feb053c
54 changed files with 30 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

14
toolkit/xre/nsEmbedFunctions.cpp
View file

@ -66,10 +66,8 @@
#include "mozilla/ipc/XPCShellEnvironment.h"
#include "mozilla/WindowsDllBlocklist.h"
#ifdef MOZ_GMP
#include "GMPProcessChild.h"
#include "GMPLoader.h"
#endif
#include "mozilla/gfx/GPUProcessImpl.h"
#include "GeckoProfiler.h"
@ -94,11 +92,9 @@ using mozilla::dom::ContentProcess;
using mozilla::dom::ContentParent;
using mozilla::dom::ContentChild;
#ifdef MOZ_GMP
using mozilla::gmp::GMPLoader;
using mozilla::gmp::CreateGMPLoader;
using mozilla::gmp::GMPProcessChild;
#endif
using mozilla::ipc::TestShellParent;
using mozilla::ipc::TestShellCommandParent;
@ -260,23 +256,17 @@ SetTaskbarGroupId(const nsString& aId)
nsresult
XRE_InitChildProcess(int aArgc,
#ifdef MOZ_GMP
char* aArgv[],
const XREChildData* aChildData)
#else
char* aArgv[])
#endif
{
NS_ENSURE_ARG_MIN(aArgc, 2);
NS_ENSURE_ARG_POINTER(aArgv);
NS_ENSURE_ARG_POINTER(aArgv[0]);
#ifdef MOZ_GMP
MOZ_ASSERT(aChildData);
// On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
// and we must forward it through to the GMP code here.
GMPProcessChild::SetGMPLoader(aChildData->gmpLoader.get());
#endif
#if defined(XP_WIN)
// From the --attach-console support in nsNativeAppSupportWin.cpp, but
@ -471,11 +461,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;
@ -537,11 +525,9 @@ XRE_InitChildProcess(int aArgc,
#endif
break;
#ifdef MOZ_GMP
case GeckoProcessType_GMPlugin:
process = new gmp::GMPProcessChild(parentPID);
break;
#endif
case GeckoProcessType_GPU:
process = new gfx::GPUProcessImpl(parentPID);