mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 12:15:33 +00:00
backing out dbarons change to the nsIPluginClassicModule interface. Attempting to fix the fizilla bustage. r=beard, b=105072
This commit is contained in:
parent
a781011df7
commit
b49f90328c
@ -63,7 +63,7 @@ public:
|
||||
* and initializes an ns4xPlugin object, and returns it in
|
||||
* <b>result</b>.
|
||||
*/
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult) = 0;
|
||||
};
|
||||
|
||||
|
@ -48,7 +48,7 @@ public:
|
||||
|
||||
static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
|
||||
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult);
|
||||
};
|
||||
|
||||
@ -72,7 +72,7 @@ nsresult nsClassicPluginFactory::Create(nsISupports* aOuter, REFNSIID aIID, void
|
||||
return factory->QueryInterface(aIID, aResult);
|
||||
}
|
||||
|
||||
NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
|
||||
NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName,
|
||||
PRLibrary* aLibrary, nsIPlugin** aResult)
|
||||
{
|
||||
return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aLibrary, aResult);
|
||||
|
@ -4220,7 +4220,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
|
||||
nsCOMPtr<nsIClassicPluginFactory> factory =
|
||||
do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
rv = factory->CreatePlugin(serviceManager,
|
||||
rv = factory->CreatePlugin((nsIServiceManager*)serviceManager,
|
||||
pluginTag->mFileName,
|
||||
pluginTag->mLibrary,
|
||||
&pluginTag->mEntryPoint);
|
||||
|
Loading…
Reference in New Issue
Block a user