Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 755186 - s/JS_NewCompartmentAndGlobalObject/JS_NewGlobalObject/ (r=jorendorff)

Browse Source 
--HG--
extra : rebase_source : f1ead9226915f72473a01db0a1019cdbe50c8e92
This commit is contained in:
Luke Wagner 2012-06-20 08:57:29 -07:00
parent 162ced62d8
commit 026cc7a4de
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/indexedDB/IDBObjectStore.cpp
View File

@ -495,7 +495,7 @@ class ThreadLocalJSRuntime
JSAutoRequest ar(mContext);
mGlobal = JS_NewCompartmentAndGlobalObject(mContext, &sGlobalClass, NULL);
mGlobal = JS_NewGlobalObject(mContext, &sGlobalClass, NULL);
NS_ENSURE_TRUE(mGlobal, NS_ERROR_OUT_OF_MEMORY);
JS_SetGlobalObject(mContext, mGlobal);

4
dom/workers/WorkerScope.cpp
View File

@ -909,8 +909,8 @@ CreateDedicatedWorkerGlobalScope(JSContext* aCx)
JS_ASSERT(worker);
JSObject* global =
JS_NewCompartmentAndGlobalObject(aCx, DedicatedWorkerGlobalScope::Class(),
GetWorkerPrincipal());
JS_NewGlobalObject(aCx, DedicatedWorkerGlobalScope::Class(),
GetWorkerPrincipal());
if (!global) {
return NULL;
}

2
extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp
View File

@ -127,7 +127,7 @@ nsresult CentralizedAdminPrefManagerInit()
static_cast<nsIXPCSecurityManager*>(new AutoConfigSecMan());
xpc->SetSecurityManagerForJSContext(autoconfig_cx, secman, 0);
autoconfig_glob = JS_NewCompartmentAndGlobalObject(autoconfig_cx, &global_class, NULL);
autoconfig_glob = JS_NewGlobalObject(autoconfig_cx, &global_class, NULL);
if (autoconfig_glob) {
JSAutoEnterCompartment ac;
if(!ac.enter(autoconfig_cx, autoconfig_glob))

2
js/jsd/jsd_high.c
View File

@ -108,7 +108,7 @@ _newJSDContext(JSRuntime* jsrt,
JS_BeginRequest(jsdc->dumbContext);
JS_SetOptions(jsdc->dumbContext, JS_GetOptions(jsdc->dumbContext));
jsdc->glob = JS_NewCompartmentAndGlobalObject(jsdc->dumbContext, &global_class, NULL);
jsdc->glob = JS_NewGlobalObject(jsdc->dumbContext, &global_class, NULL);
if( ! jsdc->glob )
goto label_newJSDContext_failure;

6
js/src/jsapi-tests/testBug604087.cpp
View File

@ -63,9 +63,9 @@ BEGIN_TEST(testBug604087)
{
JSObject *outerObj = js::Wrapper::New(cx, global, global->getProto(), global,
&OuterWrapper::singleton);
JSObject *compartment2 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *compartment3 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *compartment4 = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *compartment2 = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
JSObject *compartment3 = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
JSObject *compartment4 = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
JSObject *c2wrapper = wrap(cx, outerObj, compartment2);
CHECK(c2wrapper);

4
js/src/jsapi-tests/testCallNonGenericMethodOnProxy.cpp
View File

@ -35,7 +35,7 @@ CustomMethod(JSContext *cx, unsigned argc, Value *vp)
BEGIN_TEST(test_CallNonGenericMethodOnProxy)
{
// Create the first global object and compartment
JSObject *globalA = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *globalA = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
CHECK(globalA);
JSObject *customA = JS_NewObject(cx, &CustomClass, NULL, NULL);
@ -51,7 +51,7 @@ BEGIN_TEST(test_CallNonGenericMethodOnProxy)
// Now create the second global object and compartment...
{
JSObject *globalB = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *globalB = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
CHECK(globalB);
// ...and enter it.

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

@ -49,7 +49,7 @@ BEGIN_TEST(testChromeBuffer)
JSFunction *fun;
JSObject *o;
CHECK(o = JS_NewCompartmentAndGlobalObject(cx, &global_class, &system_principals));
CHECK(o = JS_NewGlobalObject(cx, &global_class, &system_principals));
trusted_glob.set(o);
/*

4
js/src/jsapi-tests/testDebugger.cpp
View File

@ -150,7 +150,7 @@ END_TEST(testDebugger_throwHook)
BEGIN_TEST(testDebugger_debuggerObjectVsDebugMode)
{
CHECK(JS_DefineDebuggerObject(cx, global));
JSObject *debuggee = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
JSObject *debuggee = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
CHECK(debuggee);
{
@ -193,7 +193,7 @@ BEGIN_TEST(testDebugger_newScriptHook)
// Test that top-level indirect eval fires the newScript hook.
CHECK(JS_DefineDebuggerObject(cx, global));
JSObject *g;
g = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), NULL);
g = JS_NewGlobalObject(cx, getGlobalClass(), NULL);
CHECK(g);
{
JSAutoEnterCompartment ae;

2
js/src/jsapi-tests/tests.h
View File

@ -354,7 +354,7 @@ class JSAPITest
virtual JSObject * createGlobal(JSPrincipals *principals = NULL) {
/* Create the global object. */
JSObject *global = JS_NewCompartmentAndGlobalObject(cx, getGlobalClass(), principals);
JSObject *global = JS_NewGlobalObject(cx, getGlobalClass(), principals);
if (!global)
return NULL;

2
js/src/jsapi.cpp
View File

@ -3314,7 +3314,7 @@ class AutoHoldCompartment {
};
JS_PUBLIC_API(JSObject *)
JS_NewCompartmentAndGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals)
JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals)
{
AssertNoGC(cx);
CHECK_REQUEST(cx);

2
js/src/jsapi.h
View File

@ -3932,7 +3932,7 @@ extern JS_PUBLIC_API(JSBool)
JS_GetObjectId(JSContext *cx, JSObject *obj, jsid *idp);
extern JS_PUBLIC_API(JSObject *)
JS_NewCompartmentAndGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals);
JS_NewGlobalObject(JSContext *cx, JSClass *clasp, JSPrincipals *principals);
extern JS_PUBLIC_API(JSObject *)
JS_NewObject(JSContext *cx, JSClass *clasp, JSObject *proto, JSObject *parent);

4
js/src/shell/js.cpp
View File

@ -2557,7 +2557,7 @@ static JSClass sandbox_class = {
static JSObject *
NewSandbox(JSContext *cx, bool lazy)
{
RootedObject obj(cx, JS_NewCompartmentAndGlobalObject(cx, &sandbox_class, NULL));
RootedObject obj(cx, JS_NewGlobalObject(cx, &sandbox_class, NULL));
if (!obj)
return NULL;
@ -4554,7 +4554,7 @@ DestroyContext(JSContext *cx, bool withGC)
static JSObject *
NewGlobalObject(JSContext *cx)
{
RootedObject glob(cx, JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL));
RootedObject glob(cx, JS_NewGlobalObject(cx, &global_class, NULL));
if (!glob)
return NULL;

10
js/xpconnect/src/nsXPConnect.cpp
View File

@ -1031,16 +1031,16 @@ nsXPConnect::InitClasses(JSContext * aJSContext, JSObject * aGlobalJSObj)
}
static bool
CreateNewCompartment(JSContext *cx, JSClass *clasp, nsIPrincipal *principal,
xpc::CompartmentPrivate *priv, JSObject **global,
JSCompartment **compartment)
CreateNewGlobal(JSContext *cx, JSClass *clasp, nsIPrincipal *principal,
xpc::CompartmentPrivate *priv, JSObject **global,
JSCompartment **compartment)
{
// We take ownership of |priv|. Ensure that either we free it in the case
// of failure or give ownership to the compartment in case of success (in
// that case it will be free'd in CompartmentCallback during GC).
nsAutoPtr<xpc::CompartmentPrivate> priv_holder(priv);
JSObject *tempGlobal =
JS_NewCompartmentAndGlobalObject(cx, clasp, nsJSPrincipals::get(principal));
JS_NewGlobalObject(cx, clasp, nsJSPrincipals::get(principal));
if (!tempGlobal)
return false;
@ -1138,7 +1138,7 @@ xpc_CreateGlobalObject(JSContext *cx, JSClass *clasp,
NS_ABORT_IF_FALSE(NS_IsMainThread(), "using a principal off the main thread?");
xpc::CompartmentPrivate *priv = new xpc::CompartmentPrivate(wantXrays);
if (!CreateNewCompartment(cx, clasp, principal, priv, global, compartment))
if (!CreateNewGlobal(cx, clasp, principal, priv, global, compartment))
return UnexpectedFailure(NS_ERROR_FAILURE);
XPCCompartmentSet& set = nsXPConnect::GetRuntimeInstance()->GetCompartmentSet();

2
startupcache/test/TestStartupCache.cpp
View File

@ -389,7 +389,7 @@ int main(int argc, char** argv)
};
JSObject *glob = nsnull;
if (use_js)
glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
glob = JS_NewGlobalObject(cx, &global_class, NULL);
if (!glob)
use_js = false;
JSCrossCompartmentCall *compartment = nsnull;