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

Added class ID to OnShutdown.

This commit is contained in:
warren%netscape.com 1998-08-28 21:47:44 +00:00
Родитель 99da657d8a
Коммит 9b1d14ae7e
3 изменённых файлов: 13 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -46,20 +46,21 @@ public:
class nsServiceEntry {
public:
nsServiceEntry(nsISupports* service);
nsServiceEntry(const nsCID& cid, nsISupports* service);
~nsServiceEntry();
nsresult AddListener(nsIShutdownListener* listener);
nsresult RemoveListener(nsIShutdownListener* listener);
nsresult NotifyListeners(void);
const nsCID& mClassID;
nsISupports* mService;
nsVector* mListeners; // nsVector<nsIShutdownListener>
};
nsServiceEntry::nsServiceEntry(nsISupports* service)
: mService(service), mListeners(NULL)
nsServiceEntry::nsServiceEntry(const nsCID& cid, nsISupports* service)
: mClassID(cid), mService(service), mListeners(NULL)
{
}
@ -118,7 +119,7 @@ nsServiceEntry::NotifyListeners(void)
PRUint32 size = mListeners->GetSize();
for (PRUint32 i = 0; i < size; i++) {
nsIShutdownListener* listener = (nsIShutdownListener*)(*mListeners)[0];
nsresult err = listener->OnShutdown(mService);
nsresult err = listener->OnShutdown(mClassID, mService);
if (err) return err;
listener->Release();
mListeners->Remove(0);
@ -227,7 +228,7 @@ nsServiceManager::GetService(const nsCID& aClass, const nsIID& aIID,
nsISupports* service;
err = NSRepository::CreateInstance(aClass, NULL, aIID, (void**)&service);
if (err == NS_OK) {
entry = new nsServiceEntry(service);
entry = new nsServiceEntry(aClass, service);
if (entry == NULL) {
service->Release();
err = NS_ERROR_OUT_OF_MEMORY;

2
xpcom/src/nsIServiceManager.h
Просмотреть файл

@ -108,7 +108,7 @@ class nsIShutdownListener : public nsISupports {
public:
NS_IMETHOD
OnShutdown(nsISupports* service) = 0;
OnShutdown(const nsCID& aClass, nsISupports* service) = 0;
};

11
xpcom/src/nsServiceManager.cpp
Просмотреть файл

@ -46,20 +46,21 @@ public:
class nsServiceEntry {
public:
nsServiceEntry(nsISupports* service);
nsServiceEntry(const nsCID& cid, nsISupports* service);
~nsServiceEntry();
nsresult AddListener(nsIShutdownListener* listener);
nsresult RemoveListener(nsIShutdownListener* listener);
nsresult NotifyListeners(void);
const nsCID& mClassID;
nsISupports* mService;
nsVector* mListeners; // nsVector<nsIShutdownListener>
};
nsServiceEntry::nsServiceEntry(nsISupports* service)
: mService(service), mListeners(NULL)
nsServiceEntry::nsServiceEntry(const nsCID& cid, nsISupports* service)
: mClassID(cid), mService(service), mListeners(NULL)
{
}
@ -118,7 +119,7 @@ nsServiceEntry::NotifyListeners(void)
PRUint32 size = mListeners->GetSize();
for (PRUint32 i = 0; i < size; i++) {
nsIShutdownListener* listener = (nsIShutdownListener*)(*mListeners)[0];
nsresult err = listener->OnShutdown(mService);
nsresult err = listener->OnShutdown(mClassID, mService);
if (err) return err;
listener->Release();
mListeners->Remove(0);
@ -227,7 +228,7 @@ nsServiceManager::GetService(const nsCID& aClass, const nsIID& aIID,
nsISupports* service;
err = NSRepository::CreateInstance(aClass, NULL, aIID, (void**)&service);
if (err == NS_OK) {
entry = new nsServiceEntry(service);
entry = new nsServiceEntry(aClass, service);
if (entry == NULL) {
service->Release();
err = NS_ERROR_OUT_OF_MEMORY;