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

Bug 1292892 part 1 - Stop using JSRuntime outside SpiderMonkey. r=bz,terrence,fitzgen,kanru

Browse Source
This commit is contained in:
Jan de Mooij
2016-08-11 14:39:22 +02:00
parent 520d096ba6
commit bd0f1c9018
83 changed files with 428 additions and 483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/ipc/JavaScriptParent.cpp
View File

@@ -30,15 +30,15 @@ TraceParent(JSTracer* trc, void* data)
static_cast<JavaScriptParent*>(data)->trace(trc);
}
JavaScriptParent::JavaScriptParent(JSRuntime* rt)
: JavaScriptShared(rt),
JavaScriptBase<PJavaScriptParent>(rt)
JavaScriptParent::JavaScriptParent(JSContext* cx)
: JavaScriptShared(cx),
JavaScriptBase<PJavaScriptParent>(cx)
{
}
JavaScriptParent::~JavaScriptParent()
{
JS_RemoveExtraGCRootsTracer(JS_GetContext(rt_), TraceParent, this);
JS_RemoveExtraGCRootsTracer(cx_, TraceParent, this);
}
bool
@@ -47,7 +47,7 @@ JavaScriptParent::init()
if (!WrapperOwner::init())
return false;
JS_AddExtraGCRootsTracer(JS_GetContext(rt_), TraceParent, this);
JS_AddExtraGCRootsTracer(cx_, TraceParent, this);
return true;
}
@@ -190,9 +190,9 @@ JavaScriptParent::CloneProtocol(Channel* aChannel, ProtocolCloneContext* aCtx)
}
PJavaScriptParent*
mozilla::jsipc::NewJavaScriptParent(JSRuntime* rt)
mozilla::jsipc::NewJavaScriptParent(JSContext* cx)
{
JavaScriptParent* parent = new JavaScriptParent(rt);
JavaScriptParent* parent = new JavaScriptParent(cx);
if (!parent->init()) {
delete parent;
return nullptr;