diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-20 12:44:29 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:49:22 +0200 |
| commit | 2f23073a3a4d00f0f46849045aad41913f977b5a (patch) | |
| tree | 207ed283735ff6c5c54e7c977f172d82cd47f74a /dom/plugins/base/PluginPRLibrary.cpp | |
| parent | 496fbaf738fb00824d7e972e874bfdbe85caaee5 (diff) | |
| download | UXP-2f23073a3a4d00f0f46849045aad41913f977b5a.tar UXP-2f23073a3a4d00f0f46849045aad41913f977b5a.tar.gz UXP-2f23073a3a4d00f0f46849045aad41913f977b5a.tar.lz UXP-2f23073a3a4d00f0f46849045aad41913f977b5a.tar.xz UXP-2f23073a3a4d00f0f46849045aad41913f977b5a.zip | |
Issue #1053 - Remove android support from NPAPI
Diffstat (limited to 'dom/plugins/base/PluginPRLibrary.cpp')
| -rw-r--r-- | dom/plugins/base/PluginPRLibrary.cpp | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/dom/plugins/base/PluginPRLibrary.cpp b/dom/plugins/base/PluginPRLibrary.cpp index ecc55d455..57c6c57ab 100644 --- a/dom/plugins/base/PluginPRLibrary.cpp +++ b/dom/plugins/base/PluginPRLibrary.cpp @@ -21,43 +21,10 @@ static int gNotOptimized; #define CALLING_CONVENTION_HACK #endif -#ifdef MOZ_WIDGET_ANDROID -#include "AndroidBridge.h" -#include "android_npapi.h" -#include <android/log.h> -#undef ALOG -#define ALOG(args...) __android_log_print(ANDROID_LOG_INFO, "GeckoJavaEnv", ## args) -#endif - using namespace mozilla::layers; namespace mozilla { -#ifdef MOZ_WIDGET_ANDROID -nsresult -PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, - NPPluginFuncs* pFuncs, NPError* error) -{ - JNIEnv* env = jni::GetEnvForThread(); - - mozilla::AutoLocalJNIFrame jniFrame(env); - - if (mNP_Initialize) { - *error = mNP_Initialize(bFuncs, pFuncs, env); - } else { - NP_InitializeFunc pfNP_Initialize = (NP_InitializeFunc) - PR_FindFunctionSymbol(mLibrary, "NP_Initialize"); - if (!pfNP_Initialize) - return NS_ERROR_FAILURE; - *error = pfNP_Initialize(bFuncs, pFuncs, env); - } - - // Save pointers to functions that get called through PluginLibrary itself. - mNPP_New = pFuncs->newp; - mNPP_ClearSiteData = pFuncs->clearsitedata; - mNPP_GetSitesWithData = pFuncs->getsiteswithdata; - return NS_OK; -} -#elif defined(XP_UNIX) && !defined(XP_MACOSX) +#if defined(XP_UNIX) && !defined(XP_MACOSX) nsresult PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs, NPError* error) |