Bug 959787 - Handlify JS_DefineProperty; r=Waldo, r=bz

2014-01-21 18:11:17 -08:00
parent 59f043e1ea
commit ccf4d8dd9b
43 changed files with 323 additions and 325 deletions
--- a/ipc/testshell/XPCShellEnvironment.cpp
+++ b/ipc/testshell/XPCShellEnvironment.cpp
@@ -546,10 +546,10 @@ XPCShellEnvironment::Init()

    backstagePass->SetGlobalObject(globalObj);

+    JS::Rooted<Value> privateVal(cx, PrivateValue(this));
    if (!JS_DefineProperty(cx, globalObj, "__XPCShellEnvironment",
-                           PRIVATE_TO_JSVAL(this), JS_PropertyStub,
-                           JS_StrictPropertyStub,
-                           JSPROP_READONLY | JSPROP_PERMANENT) ||
+                           privateVal, JSPROP_READONLY | JSPROP_PERMANENT,
+                           JS_PropertyStub, JS_StrictPropertyStub) ||
        !JS_DefineFunctions(cx, globalObj, gGlobalFunctions) ||
        !JS_DefineProfilingFunctions(cx, globalObj))
    {