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

Cleaning up addref/release pairs for plugin instance

This commit is contained in:
av%netscape.com 2000-04-26 06:19:26 +00:00
Родитель 6c4ec7544f
Коммит b60edde878
2 изменённых файлов: 24 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
modules/plugin/base/src/nsPluginHostImpl.cpp
Просмотреть файл

@ -1479,7 +1479,12 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
for(i=0; i<mNumActivePlugins; i++) for(i=0; i<mNumActivePlugins; i++)
{ {
if(mActivePluginList[i].mInstance) if(mActivePluginList[i].mInstance)
{
mActivePluginList[i].mInstance->Destroy(); mActivePluginList[i].mInstance->Destroy();
NS_RELEASE(mActivePluginList[i].mInstance);
NS_RELEASE(mActivePluginList[i].mPeer);
PL_strfree(mActivePluginList[i].mURL);
}
} }
while (nsnull != plug) while (nsnull != plug)
@ -1719,6 +1724,9 @@ void nsPluginHostImpl::AddInstanceToActiveList(nsIPluginInstance* aInstance,
if(mOldestActivePlugin == MAX_ACTIVE_PLUGINS) if(mOldestActivePlugin == MAX_ACTIVE_PLUGINS)
mOldestActivePlugin = 0; mOldestActivePlugin = 0;
} }
NS_ADDREF(aInstance);
nsCRT::free(url); nsCRT::free(url);
} }
@ -1786,6 +1794,7 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
return result; return result;
} }
// it is adreffed here
aOwner->SetInstance(instance); aOwner->SetInstance(instance);
nsPluginInstancePeerImpl *peer = new nsPluginInstancePeerImpl(); nsPluginInstancePeerImpl *peer = new nsPluginInstancePeerImpl();
@ -1807,9 +1816,11 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
NS_RELEASE(pi); NS_RELEASE(pi);
// we should addref here
AddInstanceToActiveList(instance, aURL); AddInstanceToActiveList(instance, aURL);
//NS_RELEASE(instance); //release what was addreffed in Create(Plugin)Instance
NS_RELEASE(instance);
return NS_OK; return NS_OK;
} }

13
modules/plugin/nglsrc/nsPluginHostImpl.cpp
Просмотреть файл

@ -1479,7 +1479,12 @@ NS_IMETHODIMP nsPluginHostImpl::Destroy(void)
for(i=0; i<mNumActivePlugins; i++) for(i=0; i<mNumActivePlugins; i++)
{ {
if(mActivePluginList[i].mInstance) if(mActivePluginList[i].mInstance)
{
mActivePluginList[i].mInstance->Destroy(); mActivePluginList[i].mInstance->Destroy();
NS_RELEASE(mActivePluginList[i].mInstance);
NS_RELEASE(mActivePluginList[i].mPeer);
PL_strfree(mActivePluginList[i].mURL);
}
} }
while (nsnull != plug) while (nsnull != plug)
@ -1719,6 +1724,9 @@ void nsPluginHostImpl::AddInstanceToActiveList(nsIPluginInstance* aInstance,
if(mOldestActivePlugin == MAX_ACTIVE_PLUGINS) if(mOldestActivePlugin == MAX_ACTIVE_PLUGINS)
mOldestActivePlugin = 0; mOldestActivePlugin = 0;
} }
NS_ADDREF(aInstance);
nsCRT::free(url); nsCRT::free(url);
} }
@ -1786,6 +1794,7 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
return result; return result;
} }
// it is adreffed here
aOwner->SetInstance(instance); aOwner->SetInstance(instance);
nsPluginInstancePeerImpl *peer = new nsPluginInstancePeerImpl(); nsPluginInstancePeerImpl *peer = new nsPluginInstancePeerImpl();
@ -1807,9 +1816,11 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
NS_RELEASE(pi); NS_RELEASE(pi);
// we should addref here
AddInstanceToActiveList(instance, aURL); AddInstanceToActiveList(instance, aURL);
//NS_RELEASE(instance); //release what was addreffed in Create(Plugin)Instance
NS_RELEASE(instance);
return NS_OK; return NS_OK;
} }