From c82b759d56454bcd3eac54c484569e1239f7d1cc Mon Sep 17 00:00:00 2001 From: Brian Smith Date: Tue, 26 Apr 2022 11:24:42 -0500 Subject: Issue #1829 - Revert "Issue #1751 -- Remove XP_MACOSX conditionals from /dom" This reverts commit 0dd3424f774954627d6f53df9fb47379d9b5c871. --- dom/plugins/ipc/PluginModuleChild.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'dom/plugins/ipc/PluginModuleChild.cpp') diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index bd13b8d9a4..1e65345fda 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -132,6 +132,12 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome) MOZ_ASSERT(!gChromeInstance); gChromeInstance = this; } + +#ifdef XP_MACOSX + if (aIsChrome) { + mac_plugin_interposing::child::SetUpCocoaInterposing(); + } +#endif } PluginModuleChild::~PluginModuleChild() @@ -253,9 +259,15 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename, if (StringBeginsWith(nsDependentCString(info.fDescription), flash10Head)) { AddQuirk(QUIRK_FLASH_EXPOSE_COORD_TRANSLATION); } +#endif +#if defined(XP_MACOSX) + const char* namePrefix = "Plugin Content"; + char nameBuffer[80]; + SprintfLiteral(nameBuffer, "%s (%s)", namePrefix, info.fName); + mozilla::plugins::PluginUtilsOSX::SetProcessName(nameBuffer); #endif pluginFile.FreePluginInfo(info); -#if defined(MOZ_X11) +#if defined(MOZ_X11) || defined(XP_MACOSX) if (!mLibrary) #endif { -- cgit v1.2.3