wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 735550 - unmark gray objects held by live nsXBLDocGlobalObjects. r=smaug

Browse Source
This commit is contained in:
Andrew McCreight 2012-03-18 07:17:05 -07:00
parent a8485fd9e9
commit a7c876f89d
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/xbl/src/nsXBLDocumentInfo.cpp
View File

@ -97,6 +97,8 @@ public:
void ClearGlobalObjectOwner();
void UnmarkScriptContext();
protected:
virtual ~nsXBLDocGlobalObject();
@ -360,6 +362,14 @@ nsXBLDocGlobalObject::ClearGlobalObjectOwner()
mGlobalObjectOwner = nsnull;
}
void
nsXBLDocGlobalObject::UnmarkScriptContext()
{
if (mScriptContext) {
xpc_UnmarkGrayObject(mScriptContext->GetNativeGlobal());
}
}
JSObject *
nsXBLDocGlobalObject::GetGlobalJSObject()
{
@ -509,9 +519,13 @@ nsXBLDocumentInfo::MarkInCCGeneration(PRUint32 aGeneration)
if (mDocument) {
mDocument->MarkUncollectableForCCGeneration(aGeneration);
}
// Unmark any JS we hold
if (mBindingTable) {
mBindingTable->Enumerate(UnmarkProtos, nsnull);
}
if (mGlobalObject) {
mGlobalObject->UnmarkScriptContext();
}
}
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsXBLDocumentInfo)