1 files changed, 3 insertions, 110 deletions

diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp
index da4f09914f..b2e931483f 100644
--- a/dom/plugins/base/nsNPAPIPlugin.cpp
+++ b/dom/plugins/base/nsNPAPIPlugin.cpp
@@ -269,14 +269,6 @@ nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
     return NS_ERROR_FAILURE;
   }
 
-#ifdef XP_MACOSX
-  if (!pluginLib->HasRequiredFunctions()) {
-    NS_WARNING("Not all necessary functions exposed by plugin, it will not load.");
-    delete pluginLib;
-    return NS_ERROR_FAILURE;
-  }
-#endif
-
   plugin->mLibrary = pluginLib;
   pluginLib->SetPlugin(plugin);
 
@@ -294,19 +286,6 @@ nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult)
   if (rv != NS_OK || pluginCallError != NPERR_NO_ERROR) {
     return NS_ERROR_FAILURE;
   }
-#elif defined(XP_MACOSX)
-  // NP_Initialize must be called before NP_GetEntryPoints on Mac OS X.
-  // We need to match WebKit's behavior.
-  NPError pluginCallError;
-  nsresult rv = pluginLib->NP_Initialize(&sBrowserFuncs, &pluginCallError);
-  if (rv != NS_OK || pluginCallError != NPERR_NO_ERROR) {
-    return NS_ERROR_FAILURE;
-  }
-
-  rv = pluginLib->NP_GetEntryPoints(&plugin->mPluginFuncs, &pluginCallError);
-  if (rv != NS_OK || pluginCallError != NPERR_NO_ERROR) {
-    return NS_ERROR_FAILURE;
-  }
 #else
   NPError pluginCallError;
   nsresult rv = pluginLib->NP_Initialize(&sBrowserFuncs, &plugin->mPluginFuncs, &pluginCallError);
@@ -1729,7 +1708,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
   // cases for android_npapi.h's non-standard ANPInterface values.
   switch (static_cast<int>(variable)) {
 
-#if defined(XP_UNIX) && !defined(XP_MACOSX)
+#if defined(XP_UNIX)
   case NPNVxDisplay : {
 #if defined(MOZ_X11)
     if (npp) {
@@ -1854,8 +1833,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
   }
 
   case NPNVSupportsWindowless: {
-#if defined(XP_WIN) || defined(XP_MACOSX) || \
-    (defined(MOZ_X11) && defined(MOZ_WIDGET_GTK))
+#if defined(XP_WIN) || (defined(MOZ_X11) && defined(MOZ_WIDGET_GTK))
     *(NPBool*)result = true;
 #else
     *(NPBool*)result = false;
@@ -1923,72 +1901,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
     return *(char**)result ? NPERR_NO_ERROR : NPERR_GENERIC_ERROR;
   }
 
-#ifdef XP_MACOSX
-  case NPNVpluginDrawingModel: {
-    if (npp) {
-      nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
-      if (inst) {
-        NPDrawingModel drawingModel;
-        inst->GetDrawingModel((int32_t*)&drawingModel);
-        *(NPDrawingModel*)result = drawingModel;
-        return NPERR_NO_ERROR;
-      }
-    }
-    return NPERR_GENERIC_ERROR;
-  }
-
-#ifndef NP_NO_QUICKDRAW
-  case NPNVsupportsQuickDrawBool: {
-    *(NPBool*)result = false;
-
-    return NPERR_NO_ERROR;
-  }
-#endif
-
-  case NPNVsupportsCoreGraphicsBool: {
-    *(NPBool*)result = true;
-
-    return NPERR_NO_ERROR;
-  }
-
-  case NPNVsupportsCoreAnimationBool: {
-    *(NPBool*)result = true;
-
-    return NPERR_NO_ERROR;
-  }
-
-  case NPNVsupportsInvalidatingCoreAnimationBool: {
-    *(NPBool*)result = true;
-
-    return NPERR_NO_ERROR;
-  }
-
-  case NPNVsupportsCompositingCoreAnimationPluginsBool: {
-    *(NPBool*)result = PR_TRUE;
-
-    return NPERR_NO_ERROR;
-  }
-
-#ifndef NP_NO_CARBON
-  case NPNVsupportsCarbonBool: {
-    *(NPBool*)result = false;
-
-    return NPERR_NO_ERROR;
-  }
-#endif
-  case NPNVsupportsCocoaBool: {
-    *(NPBool*)result = true;
-
-    return NPERR_NO_ERROR;
-  }
-
-  case NPNVsupportsUpdatedCocoaTextInputBool: {
-    *(NPBool*)result = true;
-    return NPERR_NO_ERROR;
-  }
-#endif
-
-#if defined(XP_MACOSX) || defined(XP_WIN)
+#if defined(XP_WIN)
   case NPNVcontentsScaleFactor: {
     nsNPAPIPluginInstance *inst =
       (nsNPAPIPluginInstance *) (npp ? npp->ndata : nullptr);
@@ -2051,16 +1964,8 @@ _setvalue(NPP npp, NPPVariable variable, void *result)
     // actual pointer value is checked rather than its content
     // when passing booleans
     case NPPVpluginWindowBool: {
-#ifdef XP_MACOSX
-      // This setting doesn't apply to OS X (only to Windows and Unix/Linux).
-      // See https://developer.mozilla.org/En/NPN_SetValue#section_5.  Return
-      // NPERR_NO_ERROR here to conform to other browsers' behavior on OS X
-      // (e.g. Safari and Opera).
-      return NPERR_NO_ERROR;
-#else
       NPBool bWindowless = (result == nullptr);
       return inst->SetWindowless(bWindowless);
-#endif
     }
     case NPPVpluginTransparentBool: {
       NPBool bTransparent = (result != nullptr);
@@ -2145,18 +2050,6 @@ _setvalue(NPP npp, NPPVariable variable, void *result)
       }
     }
 
-#ifdef XP_MACOSX
-    case NPPVpluginEventModel: {
-      if (inst) {
-        inst->SetEventModel((NPEventModel)NS_PTR_TO_INT32(result));
-        return NPERR_NO_ERROR;
-      }
-      else {
-        return NPERR_GENERIC_ERROR;
-      }
-    }
-#endif
-
     default:
       return NPERR_GENERIC_ERROR;
   }