Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 368773, Cycle collect nsXBLResourceLoader::mBoundElements, r+sr=peterv

Browse Source
This commit is contained in:
Olli.Pettay%helsinki.fi 2007-03-11 11:56:09 +00:00
parent 5e5cbf0c8d
commit 6cdd22b723
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/xbl/src/nsXBLResourceLoader.cpp
View File

@ -62,13 +62,7 @@
NS_IMPL_CYCLE_COLLECTION_CLASS(nsXBLResourceLoader)
NS_IMPL_CYCLE_COLLECTION_UNLINK_0(nsXBLResourceLoader)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsXBLResourceLoader)
if (tmp->mBoundElements) {
PRUint32 i, count;
tmp->mBoundElements->Count(&count);
for (i = 0; i < count; ++i) {
cb.NoteXPCOMChild(tmp->mBoundElements->ElementAt(i));
}
}
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMARRAY(mBoundElements)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_INTERFACE_MAP_BEGIN(nsXBLResourceLoader)
@ -222,13 +216,9 @@ nsXBLResourceLoader::AddResource(nsIAtom* aResourceType, const nsAString& aSrc)
void
nsXBLResourceLoader::AddResourceListener(nsIContent* aBoundElement)
{
if (!mBoundElements) {
NS_NewISupportsArray(getter_AddRefs(mBoundElements));
if (!mBoundElements)
return;
if (aBoundElement) {
mBoundElements.AppendObject(aBoundElement);
}
mBoundElements->AppendElement(aBoundElement);
}
void
@ -237,10 +227,9 @@ nsXBLResourceLoader::NotifyBoundElements()
nsCOMPtr<nsIXBLService> xblService(do_GetService("@mozilla.org/xbl;1"));
nsIURI* bindingURI = mBinding->BindingURI();
PRUint32 eltCount;
mBoundElements->Count(&eltCount);
PRUint32 eltCount = mBoundElements.Count();
for (PRUint32 j = 0; j < eltCount; j++) {
nsCOMPtr<nsIContent> content(do_QueryElementAt(mBoundElements, j));
nsCOMPtr<nsIContent> content = mBoundElements.ObjectAt(j);
PRBool ready = PR_FALSE;
xblService->BindingReady(content, bindingURI, &ready);
@ -285,7 +274,7 @@ nsXBLResourceLoader::NotifyBoundElements()
}
// Clear out the whole array.
mBoundElements = nsnull;
mBoundElements.Clear();
// Delete ourselves.
NS_RELEASE(mResources->mLoader);

7
content/xbl/src/nsXBLResourceLoader.h
View File

@ -38,7 +38,7 @@
#include "nsCOMPtr.h"
#include "nsICSSLoaderObserver.h"
#include "nsISupportsArray.h"
#include "nsCOMArray.h"
#include "nsCycleCollectionParticipant.h"
class nsIContent;
@ -105,7 +105,8 @@ public:
// async loads.
PRPackedBool mInLoadResourcesFunc;
PRInt16 mPendingSheets; // The number of stylesheets that have yet to load.
nsCOMPtr<nsISupportsArray> mBoundElements; // Bound elements that are waiting on the stylesheets and scripts.
// Bound elements that are waiting on the stylesheets and scripts.
nsCOMArray<nsIContent> mBoundElements;
};