diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 11:24:42 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 11:24:42 -0500 |
| commit | c82b759d56454bcd3eac54c484569e1239f7d1cc (patch) | |
| tree | 14b786bac9fd295d1fca6bd32683652b7ac9ef7e /dom/plugins/ipc/PluginModuleChild.cpp | |
| parent | 9e2a89c71ddf67975da35eb100673f6b5546f292 (diff) | |
| download | uxp-c82b759d56454bcd3eac54c484569e1239f7d1cc.tar.gz | |
Issue #1829 - Revert "Issue #1751 -- Remove XP_MACOSX conditionals from /dom"
This reverts commit 0dd3424f774954627d6f53df9fb47379d9b5c871.
Diffstat (limited to 'dom/plugins/ipc/PluginModuleChild.cpp')
| -rw-r--r-- | dom/plugins/ipc/PluginModuleChild.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
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() @@ -254,8 +260,14 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename, 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 { |