Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 11:01:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a memory leak in the broadcasters.

Browse Source
This commit is contained in:
hyatt%netscape.com 1999-03-05 23:08:34 +00:00
parent f93bab436a
commit 2db952a359
3 changed files with 57 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/xul/content/src/nsXULElement.cpp
View File

@ -291,6 +291,7 @@ private:
nsXULAttributes* mAttributes;
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners;
nsIDOMXULElement* mBroadcaster;
};
@ -318,7 +319,8 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull)
mBroadcastListeners(nsnull),
mBroadcaster(nsnull)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -370,6 +372,20 @@ RDFElementImpl::~RDFElementImpl()
}
}
// We might be an observes element. We need to remove our parent from
// the broadcaster's array
if (mBroadcaster != nsnull)
{
nsCOMPtr<nsIContent> parentContent;
GetParent(*getter_AddRefs(parentContent));
nsCOMPtr<nsIDOMElement> parentElement;
parentElement = do_QueryInterface(parentContent);
mBroadcaster->RemoveBroadcastListener("*", parentElement);
NS_RELEASE(mBroadcaster);
}
if (--gRefCnt == 0) {
if (gRDFService) {
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
@ -2148,8 +2164,7 @@ NS_IMETHODIMP
RDFElementImpl::AddBroadcastListener(const nsString& attr, nsIDOMElement* anElement)
{
// Add ourselves to the array.
NS_ADDREF(anElement);
if (mBroadcastListeners == nsnull)
if (mBroadcastListeners == nsnull)
{
mBroadcastListeners = new nsVoidArray();
}
@ -2199,7 +2214,7 @@ RDFElementImpl::RemoveBroadcastListener(const nsString& attr, nsIDOMElement* anE
{
XULBroadcastListener* xulListener = (XULBroadcastListener*)mBroadcastListeners->ElementAt(i);
if (xulListener->mAttribute == attr &&
if ((xulListener->mAttribute == attr || xulListener->mAttribute == "*") &&
xulListener->mListener == nsCOMPtr<nsIDOMElement>( dont_QueryInterface(anElement) ))
{
// Do the removal.

23
rdf/content/src/nsRDFElement.cpp
View File

@ -291,6 +291,7 @@ private:
nsXULAttributes* mAttributes;
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners;
nsIDOMXULElement* mBroadcaster;
};
@ -318,7 +319,8 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull)
mBroadcastListeners(nsnull),
mBroadcaster(nsnull)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -370,6 +372,20 @@ RDFElementImpl::~RDFElementImpl()
}
}
// We might be an observes element. We need to remove our parent from
// the broadcaster's array
if (mBroadcaster != nsnull)
{
nsCOMPtr<nsIContent> parentContent;
GetParent(*getter_AddRefs(parentContent));
nsCOMPtr<nsIDOMElement> parentElement;
parentElement = do_QueryInterface(parentContent);
mBroadcaster->RemoveBroadcastListener("*", parentElement);
NS_RELEASE(mBroadcaster);
}
if (--gRefCnt == 0) {
if (gRDFService) {
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
@ -2148,8 +2164,7 @@ NS_IMETHODIMP
RDFElementImpl::AddBroadcastListener(const nsString& attr, nsIDOMElement* anElement)
{
// Add ourselves to the array.
NS_ADDREF(anElement);
if (mBroadcastListeners == nsnull)
if (mBroadcastListeners == nsnull)
{
mBroadcastListeners = new nsVoidArray();
}
@ -2199,7 +2214,7 @@ RDFElementImpl::RemoveBroadcastListener(const nsString& attr, nsIDOMElement* anE
{
XULBroadcastListener* xulListener = (XULBroadcastListener*)mBroadcastListeners->ElementAt(i);
if (xulListener->mAttribute == attr &&
if ((xulListener->mAttribute == attr || xulListener->mAttribute == "*") &&
xulListener->mListener == nsCOMPtr<nsIDOMElement>( dont_QueryInterface(anElement) ))
{
// Do the removal.

23
rdf/content/src/nsXULElement.cpp
View File

@ -291,6 +291,7 @@ private:
nsXULAttributes* mAttributes;
PRBool mContentsMustBeGenerated;
nsVoidArray* mBroadcastListeners;
nsIDOMXULElement* mBroadcaster;
};
@ -318,7 +319,8 @@ RDFElementImpl::RDFElementImpl(PRInt32 aNameSpaceID, nsIAtom* aTag)
mListenerManager(nsnull),
mAttributes(nsnull),
mContentsMustBeGenerated(PR_FALSE),
mBroadcastListeners(nsnull)
mBroadcastListeners(nsnull),
mBroadcaster(nsnull)
{
NS_INIT_REFCNT();
NS_ADDREF(aTag);
@ -370,6 +372,20 @@ RDFElementImpl::~RDFElementImpl()
}
}
// We might be an observes element. We need to remove our parent from
// the broadcaster's array
if (mBroadcaster != nsnull)
{
nsCOMPtr<nsIContent> parentContent;
GetParent(*getter_AddRefs(parentContent));
nsCOMPtr<nsIDOMElement> parentElement;
parentElement = do_QueryInterface(parentContent);
mBroadcaster->RemoveBroadcastListener("*", parentElement);
NS_RELEASE(mBroadcaster);
}
if (--gRefCnt == 0) {
if (gRDFService) {
nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
@ -2148,8 +2164,7 @@ NS_IMETHODIMP
RDFElementImpl::AddBroadcastListener(const nsString& attr, nsIDOMElement* anElement)
{
// Add ourselves to the array.
NS_ADDREF(anElement);
if (mBroadcastListeners == nsnull)
if (mBroadcastListeners == nsnull)
{
mBroadcastListeners = new nsVoidArray();
}
@ -2199,7 +2214,7 @@ RDFElementImpl::RemoveBroadcastListener(const nsString& attr, nsIDOMElement* anE
{
XULBroadcastListener* xulListener = (XULBroadcastListener*)mBroadcastListeners->ElementAt(i);
if (xulListener->mAttribute == attr &&
if ((xulListener->mAttribute == attr || xulListener->mAttribute == "*") &&
xulListener->mListener == nsCOMPtr<nsIDOMElement>( dont_QueryInterface(anElement) ))
{
// Do the removal.