Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eliminating uses of deprecated nsComponentManager:: methods (bug 267040), r=bsmedberg

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@164735 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%meer.net
2004-11-01 18:50:36 +00:00
parent c30f27891f
commit ed9e4d3d7a
149 changed files with 638 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -4487,22 +4487,16 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
if(plugin == NULL)
{
// nsIPlugin* of xpcom plugins can be found thru a call to
// nsComponentManager::GetClassObject()
nsCID clsid;
// nsIComponentManager::GetClassObjectByContractID()
nsCAutoString contractID(
NS_LITERAL_CSTRING(NS_INLINE_PLUGIN_CONTRACTID_PREFIX) +
nsDependentCString(aMimeType));
nsresult rv =
nsComponentManager::ContractIDToClassID(contractID.get(), &clsid);
if (NS_SUCCEEDED(rv))
nsresult rv = CallGetClassObject(contractID.get(), &plugin);
if (NS_SUCCEEDED(rv) && plugin)
{
rv = nsComponentManager::GetClassObject(clsid, nsIPlugin::GetIID(), (void**)&plugin);
if (NS_SUCCEEDED(rv) && plugin)
{
// plugin was addref'd by nsComponentManager::GetClassObject
pluginTag->mEntryPoint = plugin;
plugin->Initialize();
}
// plugin is already addref'd
pluginTag->mEntryPoint = plugin;
plugin->Initialize();
}
}

5
mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
View File

@@ -94,7 +94,6 @@ static unsigned char * scale_image(unsigned char *rgb_data, int rgb_width,
static PRInt32 gPluginObjectCount = 0;
static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID );
static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID );
static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID );
@@ -137,9 +136,7 @@ nsSanePluginInstance::nsSanePluginInstance( void )
mEvent_box = nsnull;
mDrawing_area = nsnull;
if(nsComponentManager::CreateInstance(kCPluginManagerCID,
NULL, kIPluginManagerIID,
(void**)&mPluginManager) != NS_OK) {
if (NS_FAILED(CallCreateInstance(kCPluginManagerCID, &mPluginManager))) {
NS_ERROR("Error trying to create plugin manager!");
return;
}