109973 -- passing plugin creation parameters to the plugin instance, not part of the build
git-svn-id: svn://10.0.0.236/trunk@107999 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -57,9 +57,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
@@ -62,9 +62,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
@@ -58,9 +58,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,17 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ch
|
||||
|
||||
// create a new plugin instance object
|
||||
// initialization will be done when the associated window is ready
|
||||
nsPluginInstanceBase * plugin = NS_NewPluginInstance(instance);
|
||||
nsPluginCreateData ds;
|
||||
|
||||
ds.instance = instance;
|
||||
ds.type = pluginType;
|
||||
ds.mode = mode;
|
||||
ds.argc = argc;
|
||||
ds.argn = argn;
|
||||
ds.argv = argv;
|
||||
ds.saved = saved;
|
||||
|
||||
nsPluginInstanceBase * plugin = NS_NewPluginInstance(&ds);
|
||||
if(plugin == NULL)
|
||||
return NPERR_OUT_OF_MEMORY_ERROR;
|
||||
|
||||
|
||||
@@ -69,9 +69,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
@@ -58,9 +58,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
@@ -89,9 +89,12 @@ void NS_PluginShutdown()
|
||||
//
|
||||
// construction and destruction of our plugin instance object
|
||||
//
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance)
|
||||
nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct)
|
||||
{
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aInstance);
|
||||
if(!aCreateDataStruct)
|
||||
return NULL;
|
||||
|
||||
nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance);
|
||||
return plugin;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user