Import of pkgsrc-2015Q1

www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp

@@ -1,8 +1,8 @@
-$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2014/02/20 13:19:03 ryoon Exp $
+$NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.6 2015/02/28 04:30:55 ryoon Exp $
 
---- dom/plugins/ipc/PluginModuleChild.cpp.orig	2013-05-11 19:19:27.000000000 +0000
+--- dom/plugins/ipc/PluginModuleChild.cpp.orig	2015-02-17 21:40:45.000000000 +0000
 +++ dom/plugins/ipc/PluginModuleChild.cpp
-@@ -201,7 +201,7 @@ PluginModuleChild::Init(const std::strin
+@@ -307,7 +307,7 @@ PluginModuleChild::InitForChrome(const s
  
      // TODO: use PluginPRLibrary here
  
@@ -11,16 +11,16 @@ $NetBSD: patch-dom_plugins_ipc_PluginModuleChild.cpp,v 1.3 2014/02/20 13:19:03 r
      mShutdownFunc =
          (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
  
-@@ -1836,7 +1836,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
-     PLUGIN_LOG_DEBUG_METHOD;
+@@ -1869,7 +1869,7 @@ PluginModuleChild::AnswerNP_GetEntryPoin
      AssertPluginThread();
+     MOZ_ASSERT(mIsChrome);
  
 -#if defined(OS_LINUX) || defined(OS_BSD)
 +#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
      return true;
  #elif defined(OS_WIN) || defined(OS_MACOSX)
      *_retval = mGetEntryPointsFunc(&mFunctions);
-@@ -1865,7 +1865,7 @@ PluginModuleChild::AnswerNP_Initialize(c
+@@ -1899,7 +1899,7 @@ PluginModuleChild::AnswerNP_Initialize(c
      SendBackUpXResources(FileDescriptor(xSocketFd));
  #endif