corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 650161 - Unify the finalization and moving GC callbacks into a weak pointer update callback r=terrence r=bholley

Browse Source
This commit is contained in:
Jon Coppeard
2014-09-24 12:54:11 +01:00
parent 2a9e787f41
commit 35fa24ed09
19 changed files with 159 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/ipc/JavaScriptChild.cpp
View File

@@ -21,17 +21,9 @@ using namespace mozilla::jsipc;
using mozilla::AutoSafeJSContext;
static void
FinalizeChild(JSFreeOp *fop, JSFinalizeStatus status, bool isCompartment, void *data)
UpdateChildWeakPointersAfterGC(JSRuntime *rt, void *data)
{
if (status == JSFINALIZE_GROUP_START) {
static_cast<JavaScriptChild *>(data)->finalize();
}
}
static void
FixupChildAfterMovingGC(JSRuntime *rt, void *data)
{
static_cast<JavaScriptChild *>(data)->fixupAfterMovingGC();
static_cast<JavaScriptChild *>(data)->updateWeakPointers();
}
JavaScriptChild::JavaScriptChild(JSRuntime *rt)
@@ -42,8 +34,7 @@ JavaScriptChild::JavaScriptChild(JSRuntime *rt)
JavaScriptChild::~JavaScriptChild()
{
JS_RemoveFinalizeCallback(rt_, FinalizeChild);
JS_RemoveMovingGCCallback(rt_, FixupChildAfterMovingGC);
JS_RemoveWeakPointerCallback(rt_, UpdateChildWeakPointersAfterGC);
}
bool
@@ -54,13 +45,12 @@ JavaScriptChild::init()
if (!WrapperAnswer::init())
return false;
JS_AddFinalizeCallback(rt_, FinalizeChild, this);
JS_AddMovingGCCallback(rt_, FixupChildAfterMovingGC, this);
JS_AddWeakPointerCallback(rt_, UpdateChildWeakPointersAfterGC, this);
return true;
}
void
JavaScriptChild::finalize()
JavaScriptChild::updateWeakPointers()
{
objects_.sweep();
objectIds_.sweep();