Bug 1342141 part B - Use NP_EMBED as the mode for all plugins, whether they are full-page or not, r=jimm
MozReview-Commit-ID: BeB24ux8TEp
This commit is contained in:
@@ -1686,7 +1686,6 @@ PluginModuleParent::NotifyPluginCrashed()
|
||||
|
||||
PPluginInstanceParent*
|
||||
PluginModuleParent::AllocPPluginInstanceParent(const nsCString& aMimeType,
|
||||
const uint16_t& aMode,
|
||||
const InfallibleTArray<nsCString>& aNames,
|
||||
const InfallibleTArray<nsCString>& aValues)
|
||||
{
|
||||
@@ -2633,7 +2632,7 @@ PluginModuleChromeParent::NP_GetEntryPoints(NPPluginFuncs* pFuncs, NPError* erro
|
||||
|
||||
nsresult
|
||||
PluginModuleParent::NPP_New(NPMIMEType pluginType, NPP instance,
|
||||
uint16_t mode, int16_t argc, char* argn[],
|
||||
int16_t argc, char* argn[],
|
||||
char* argv[], NPSavedData* saved,
|
||||
NPError* error)
|
||||
{
|
||||
@@ -2645,7 +2644,7 @@ PluginModuleParent::NPP_New(NPMIMEType pluginType, NPP instance,
|
||||
}
|
||||
|
||||
if (mIsStartingAsync) {
|
||||
if (!PluginAsyncSurrogate::Create(this, pluginType, instance, mode,
|
||||
if (!PluginAsyncSurrogate::Create(this, pluginType, instance,
|
||||
argc, argn, argv)) {
|
||||
*error = NPERR_GENERIC_ERROR;
|
||||
return NS_ERROR_FAILURE;
|
||||
@@ -2669,7 +2668,7 @@ PluginModuleParent::NPP_New(NPMIMEType pluginType, NPP instance,
|
||||
values.AppendElement(NullableString(argv[i]));
|
||||
}
|
||||
|
||||
nsresult rv = NPP_NewInternal(pluginType, instance, mode, names, values,
|
||||
nsresult rv = NPP_NewInternal(pluginType, instance, names, values,
|
||||
saved, error);
|
||||
if (NS_FAILED(rv) || !mIsStartingAsync) {
|
||||
return rv;
|
||||
@@ -2741,7 +2740,6 @@ ForceDirect(InfallibleTArray<nsCString>& names,
|
||||
|
||||
nsresult
|
||||
PluginModuleParent::NPP_NewInternal(NPMIMEType pluginType, NPP instance,
|
||||
uint16_t mode,
|
||||
InfallibleTArray<nsCString>& names,
|
||||
InfallibleTArray<nsCString>& values,
|
||||
NPSavedData* saved, NPError* error)
|
||||
@@ -2828,7 +2826,7 @@ PluginModuleParent::NPP_NewInternal(NPMIMEType pluginType, NPP instance,
|
||||
}
|
||||
|
||||
if (!SendPPluginInstanceConstructor(parentInstance,
|
||||
nsDependentCString(pluginType), mode,
|
||||
nsDependentCString(pluginType),
|
||||
names, values)) {
|
||||
// |parentInstance| is automatically deleted.
|
||||
instance->pdata = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user