corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge mozilla-central and tracemonkey.

Browse Source
This commit is contained in:
Chris Leary
2011-05-20 14:29:36 -07:00
parent 8223ebdb06 f49eff0ab8
commit 3403bcf399
1381 changed files with 21938 additions and 77845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dom/plugins/base/nsNPAPIPlugin.cpp
View File

@@ -535,7 +535,7 @@ nsNPAPIPlugin::PluginFuncs()
}
nsresult
nsNPAPIPlugin::CreatePluginInstance(nsIPluginInstance **aResult)
nsNPAPIPlugin::CreatePluginInstance(nsNPAPIPluginInstance **aResult)
{
if (!aResult)
return NS_ERROR_NULL_POINTER;
@@ -547,7 +547,7 @@ nsNPAPIPlugin::CreatePluginInstance(nsIPluginInstance **aResult)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(inst);
*aResult = static_cast<nsIPluginInstance*>(inst);
*aResult = inst;
return NS_OK;
}
@@ -1048,7 +1048,7 @@ _newstream(NPP npp, NPMIMEType type, const char* target, NPStream* *result)
NPError err = NPERR_INVALID_INSTANCE_ERROR;
if (npp && npp->ndata) {
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
PluginDestructionGuard guard(inst);
@@ -1168,7 +1168,7 @@ _status(NPP npp, const char *message)
return;
}
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
PluginDestructionGuard guard(inst);
@@ -1233,7 +1233,7 @@ _invalidaterect(NPP npp, NPRect *invalidRect)
return;
}
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
PluginDestructionGuard guard(inst);
@@ -1256,7 +1256,7 @@ _invalidateregion(NPP npp, NPRegion invalidRegion)
return;
}
nsIPluginInstance *inst = (nsIPluginInstance *)npp->ndata;
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
PluginDestructionGuard guard(inst);
@@ -1277,7 +1277,7 @@ _forceredraw(NPP npp)
return;
}
nsIPluginInstance *inst = (nsIPluginInstance *) npp->ndata;
nsNPAPIPluginInstance *inst = (nsNPAPIPluginInstance*)npp->ndata;
PluginDestructionGuard guard(inst);