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/base/PluginPRLibrary.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/base/PluginPRLibrary.cpp')
| -rw-r--r-- | dom/plugins/base/PluginPRLibrary.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/dom/plugins/base/PluginPRLibrary.cpp b/dom/plugins/base/PluginPRLibrary.cpp index e6a202c244..57c6c57ab3 100644 --- a/dom/plugins/base/PluginPRLibrary.cpp +++ b/dom/plugins/base/PluginPRLibrary.cpp @@ -24,7 +24,7 @@ static int gNotOptimized; using namespace mozilla::layers; namespace mozilla { -#if defined(XP_UNIX) +#if defined(XP_UNIX) && !defined(XP_MACOSX) nsresult PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error) @@ -110,7 +110,7 @@ nsresult PluginPRLibrary::NP_GetValue(void *future, NPPVariable aVariable, void *aValue, NPError* error) { -#if defined(XP_UNIX) +#if defined(XP_UNIX) && !defined(XP_MACOSX) if (mNP_GetValue) { *error = mNP_GetValue(future, aVariable, aValue); } else { @@ -125,7 +125,7 @@ PluginPRLibrary::NP_GetValue(void *future, NPPVariable aVariable, #endif } -#if defined(XP_WIN) +#if defined(XP_WIN) || defined(XP_MACOSX) nsresult PluginPRLibrary::NP_GetEntryPoints(NPPluginFuncs* pFuncs, NPError* error) { @@ -231,7 +231,17 @@ PluginPRLibrary::GetImageContainer(NPP instance, ImageContainer** aContainer) return NS_ERROR_NOT_IMPLEMENTED; } -#if defined(XP_WIN) +#if defined(XP_MACOSX) +nsresult +PluginPRLibrary::IsRemoteDrawingCoreAnimation(NPP instance, bool *aDrawing) +{ + nsNPAPIPluginInstance* inst = (nsNPAPIPluginInstance*)instance->ndata; + NS_ENSURE_TRUE(inst, NS_ERROR_NULL_POINTER); + *aDrawing = false; + return NS_OK; +} +#endif +#if defined(XP_MACOSX) || defined(XP_WIN) nsresult PluginPRLibrary::ContentsScaleFactorChanged(NPP instance, double aContentsScaleFactor) { |