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

12
js/ipc/JavaScriptParent.cpp
View File

@@ -27,12 +27,6 @@ TraceParent(JSTracer *trc, void *data)
static_cast<JavaScriptParent *>(data)->trace(trc);
}
static void
FixupParentAfterMovingGC(JSRuntime *rt, void *data)
{
static_cast<JavaScriptParent *>(data)->fixupAfterMovingGC();
}
JavaScriptParent::JavaScriptParent(JSRuntime *rt)
: JavaScriptShared(rt),
JavaScriptBase<PJavaScriptParent>(rt)
@@ -42,7 +36,6 @@ JavaScriptParent::JavaScriptParent(JSRuntime *rt)
JavaScriptParent::~JavaScriptParent()
{
JS_RemoveExtraGCRootsTracer(rt_, TraceParent, this);
JS_RemoveMovingGCCallback(rt_, FixupParentAfterMovingGC);
}
bool
@@ -52,15 +45,16 @@ JavaScriptParent::init()
return false;
JS_AddExtraGCRootsTracer(rt_, TraceParent, this);
JS_AddMovingGCCallback(rt_, FixupParentAfterMovingGC, this);
return true;
}
void
JavaScriptParent::trace(JSTracer *trc)
{
if (active())
if (active()) {
objects_.trace(trc);
objectIds_.trace(trc);
}
}
JSObject *