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

16
js/ipc/JavaScriptChild.cpp
View File

@@ -26,16 +26,15 @@ UpdateChildWeakPointersBeforeSweepingZoneGroup(JSContext* cx, void* data)
static_cast<JavaScriptChild*>(data)->updateWeakPointers();
}
JavaScriptChild::JavaScriptChild(JSRuntime* rt)
: JavaScriptShared(rt),
JavaScriptBase<PJavaScriptChild>(rt)
JavaScriptChild::JavaScriptChild(JSContext* cx)
: JavaScriptShared(cx),
JavaScriptBase<PJavaScriptChild>(cx)
{
}
JavaScriptChild::~JavaScriptChild()
{
JSContext* cx = JS_GetContext(rt_);
JS_RemoveWeakPointerZoneGroupCallback(cx, UpdateChildWeakPointersBeforeSweepingZoneGroup);
JS_RemoveWeakPointerZoneGroupCallback(cx_, UpdateChildWeakPointersBeforeSweepingZoneGroup);
}
bool
@@ -46,8 +45,7 @@ JavaScriptChild::init()
if (!WrapperAnswer::init())
return false;
JSContext* cx = JS_GetContext(rt_);
JS_AddWeakPointerZoneGroupCallback(cx, UpdateChildWeakPointersBeforeSweepingZoneGroup, this);
JS_AddWeakPointerZoneGroupCallback(cx_, UpdateChildWeakPointersBeforeSweepingZoneGroup, this);
return true;
}
@@ -68,9 +66,9 @@ JavaScriptChild::scopeForTargetObjects()
}
PJavaScriptChild*
mozilla::jsipc::NewJavaScriptChild(JSRuntime* rt)
mozilla::jsipc::NewJavaScriptChild(JSContext* cx)
{
JavaScriptChild* child = new JavaScriptChild(rt);
JavaScriptChild* child = new JavaScriptChild(cx);
if (!child->init()) {
delete child;
return nullptr;