Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 13:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 980537 - Only store FakeBackstagePass instances in mThisObjects. r=khuey

Browse Source
This commit is contained in:
Bobby Holley 2014-04-06 12:32:39 -07:00
parent 720fe1f508
commit 1383b4163b
1 changed files with 10 additions and 5 deletions

15
js/xpconnect/loader/mozJSComponentLoader.cpp

@ -566,7 +566,9 @@ mozJSComponentLoader::NoteSubScript(HandleScript aScript, HandleObject aThisObje
MOZ_CRASH();
}
mThisObjects.Put(aScript, aThisObject);
if (js::GetObjectJSClass(aThisObject) == &kFakeBackstagePassJSClass) {
mThisObjects.Put(aScript, aThisObject);
}
}
/* static */ size_t
@ -1012,10 +1014,13 @@ mozJSComponentLoader::ObjectForLocation(nsIFile *aComponentFile,
*aTableScript = tableScript;
// tableScript stays in the table until shutdown. To avoid it being
// collected and another script getting the same address, we root
// tableScript lower down in this function.
mThisObjects.Put(tableScript, obj);
if (js::GetObjectJSClass(obj) == &kFakeBackstagePassJSClass) {
MOZ_ASSERT(mReuseLoaderGlobal);
// tableScript stays in the table until shutdown. To avoid it being
// collected and another script getting the same address, we root
// tableScript lower down in this function.
mThisObjects.Put(tableScript, obj);
}
bool ok = false;
{