mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Eliminating leak of factory when getting it from hashtable. 

Using NS_IMPL_ISUPPORTS1
Removing NS_DEFINE_IID
r=warren@netscape.com
This commit is contained in:
dp%netscape.com 1999-11-20 07:21:53 +00:00
Родитель c5d0fa6f07
Коммит f7a9bde3c4
2 изменённых файлов: 4 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
xpcom/components/nsGenericFactory.cpp
Просмотреть файл

@ -98,8 +98,6 @@ NS_NewGenericFactory(nsIGenericFactory* *result,
////////////////////////////////////////////////////////////////////////////////
static NS_DEFINE_IID(kIModuleIID, NS_IMODULE_IID);
nsGenericModule::nsGenericModule(const char* moduleName, PRUint32 componentCount,
nsModuleComponentInfo* components)
: mInitialized(PR_FALSE),
@ -116,7 +114,7 @@ nsGenericModule::~nsGenericModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsGenericModule, kIModuleIID)
NS_IMPL_ISUPPORTS1(nsGenericModule, nsIModule)
// Perform our one-time intialization for this module
nsresult
@ -164,7 +162,7 @@ nsGenericModule::GetClassObject(nsIComponentManager *aCompMgr,
// Choose the appropriate factory, based on the desired instance
// class type (aClass).
nsIDKey key(aClass);
nsCOMPtr<nsIGenericFactory> fact = (nsIGenericFactory*)mFactories.Get(&key);
nsCOMPtr<nsIGenericFactory> fact = getter_AddRefs(NS_REINTERPRET_CAST(nsIGenericFactory *, mFactories.Get(&key)));
if (fact == nsnull) {
nsModuleComponentInfo* desc = mComponents;
for (PRUint32 i = 0; i < mComponentCount; i++) {
@ -191,8 +189,6 @@ nsGenericModule::GetClassObject(nsIComponentManager *aCompMgr,
return rv;
}
#define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0]))
NS_IMETHODIMP
nsGenericModule::RegisterSelf(nsIComponentManager *aCompMgr,
nsIFileSpec* aPath,

8
xpcom/glue/nsGenericFactory.cpp
Просмотреть файл

@ -98,8 +98,6 @@ NS_NewGenericFactory(nsIGenericFactory* *result,
////////////////////////////////////////////////////////////////////////////////
static NS_DEFINE_IID(kIModuleIID, NS_IMODULE_IID);
nsGenericModule::nsGenericModule(const char* moduleName, PRUint32 componentCount,
nsModuleComponentInfo* components)
: mInitialized(PR_FALSE),
@ -116,7 +114,7 @@ nsGenericModule::~nsGenericModule()
Shutdown();
}
NS_IMPL_ISUPPORTS(nsGenericModule, kIModuleIID)
NS_IMPL_ISUPPORTS1(nsGenericModule, nsIModule)
// Perform our one-time intialization for this module
nsresult
@ -164,7 +162,7 @@ nsGenericModule::GetClassObject(nsIComponentManager *aCompMgr,
// Choose the appropriate factory, based on the desired instance
// class type (aClass).
nsIDKey key(aClass);
nsCOMPtr<nsIGenericFactory> fact = (nsIGenericFactory*)mFactories.Get(&key);
nsCOMPtr<nsIGenericFactory> fact = getter_AddRefs(NS_REINTERPRET_CAST(nsIGenericFactory *, mFactories.Get(&key)));
if (fact == nsnull) {
nsModuleComponentInfo* desc = mComponents;
for (PRUint32 i = 0; i < mComponentCount; i++) {
@ -191,8 +189,6 @@ nsGenericModule::GetClassObject(nsIComponentManager *aCompMgr,
return rv;
}
#define NUM_COMPONENTS (sizeof(gComponents) / sizeof(gComponents[0]))
NS_IMETHODIMP
nsGenericModule::RegisterSelf(nsIComponentManager *aCompMgr,
nsIFileSpec* aPath,