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

Bug 912581 - Make JS_Add*Root APIs take Heap<T> r=terrence r=bz r=bholley

Browse Source
This commit is contained in:
Jon Coppeard
2014-04-16 09:47:57 +01:00
parent 3af10bff29
commit e22060b314
16 changed files with 140 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/src/jsapi-tests/testChromeBuffer.cpp
View File

@@ -25,8 +25,8 @@ static const JSClass global_class = {
JS_GlobalObjectTraceHook
};
static JSObject *trusted_glob = nullptr;
static JSObject *trusted_fun = nullptr;
static JS::Heap<JSObject *> trusted_glob;
static JS::Heap<JSObject *> trusted_fun;
static bool
CallTrusted(JSContext *cx, unsigned argc, jsval *vp)
@@ -53,7 +53,7 @@ BEGIN_TEST(testChromeBuffer)
trusted_glob = JS_NewGlobalObject(cx, &global_class, &system_principals, JS::FireOnNewGlobalHook);
CHECK(trusted_glob);
if (!JS_AddNamedObjectRoot(cx, &trusted_glob, "trusted-global"))
if (!JS::AddNamedObjectRoot(cx, &trusted_glob, "trusted-global"))
return false;
JS::RootedFunction fun(cx);
@@ -68,13 +68,13 @@ BEGIN_TEST(testChromeBuffer)
JSAutoCompartment ac(cx, trusted_glob);
const char *paramName = "x";
const char *bytes = "return x ? 1 + trusted(x-1) : 0";
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(&trusted_glob);
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(trusted_glob.unsafeGet());
JS::CompileOptions options(cx);
options.setFileAndLine("", 0);
CHECK(fun = JS_CompileFunction(cx, global, "trusted", 1, &paramName,
bytes, strlen(bytes), options));
trusted_fun = JS_GetFunctionObject(fun);
if (!JS_AddNamedObjectRoot(cx, &trusted_fun, "trusted-function"))
if (!JS::AddNamedObjectRoot(cx, &trusted_fun, "trusted-function"))
return false;
}
@@ -114,7 +114,7 @@ BEGIN_TEST(testChromeBuffer)
"} catch (e) { "
" return 'From trusted: ' + e; "
"} ";
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(&trusted_glob);
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(trusted_glob.unsafeGet());
JS::CompileOptions options(cx);
options.setFileAndLine("", 0);
CHECK(fun = JS_CompileFunction(cx, global, "trusted", 1, &paramName,
@@ -151,7 +151,7 @@ BEGIN_TEST(testChromeBuffer)
{
JSAutoCompartment ac(cx, trusted_glob);
const char *bytes = "return 42";
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(&trusted_glob);
JS::HandleObject global = JS::HandleObject::fromMarkedLocation(trusted_glob.unsafeGet());
JS::CompileOptions options(cx);
options.setFileAndLine("", 0);
CHECK(fun = JS_CompileFunction(cx, global, "trusted", 0, nullptr,
@@ -182,8 +182,10 @@ BEGIN_TEST(testChromeBuffer)
return true;
}
virtual void uninit() {
JS_RemoveObjectRoot(cx, &trusted_glob);
JS_RemoveObjectRoot(cx, &trusted_fun);
trusted_glob = nullptr;
trusted_fun = nullptr;
JS::RemoveObjectRoot(cx, &trusted_glob);
JS::RemoveObjectRoot(cx, &trusted_fun);
JSAPITest::uninit();
}
END_TEST(testChromeBuffer)