wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-07 00:08: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

10
ipc/contentproc/plugin-container.cpp
View file

@ -19,7 +19,6 @@
#include <unistd.h>
#endif
#ifdef MOZ_GMP
#include "GMPLoader.h"
mozilla::gmp::SandboxStarter*
@ -27,7 +26,6 @@ MakeSandboxStarter()
{
return nullptr;
}
#endif
int
content_process_main(int argc, char* argv[])
@ -38,9 +36,7 @@ content_process_main(int argc, char* argv[])
return 3;
}
#ifdef MOZ_GMP
XREChildData childData;
#endif
XRE_SetProcessType(argv[--argc]);
@ -54,19 +50,15 @@ content_process_main(int argc, char* argv[])
}
#endif
#ifdef MOZ_PLUGIN_CONTAINER
#ifdef MOZ_GMP
// On desktop, the GMPLoader lives in plugin-container, so that its
// code can be covered by an EME/GMP vendor's voucher.
nsAutoPtr<mozilla::gmp::SandboxStarter> starter(MakeSandboxStarter());
if (XRE_GetProcessType() == GeckoProcessType_GMPlugin) {
childData.gmpLoader = mozilla::gmp::CreateGMPLoader(starter);
}
#endif
nsresult rv = XRE_InitChildProcess(argc, argv, &childData);
#else
nsresult rv = XRE_InitChildProcess(argc, argv);
#endif
NS_ENSURE_SUCCESS(rv, 1);
#endif
return 0;
}