wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 871301 - Remove JS_GetGlobalObject from nsCrypto and nsDirectoryViewer. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2013-05-14 10:16:52 -07:00
parent a747313c85
commit 78feb83f6b
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/manager/ssl/src/nsCrypto.cpp
View File

@ -1916,7 +1916,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
JSAutoByteString jsCallback(cx, jsString); JSAutoByteString jsCallback(cx, jsString);
NS_ENSURE_TRUE(!!jsCallback, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(!!jsCallback, NS_ERROR_OUT_OF_MEMORY);
nrv = xpc->WrapNative(cx, ::JS_GetGlobalObject(cx), nrv = xpc->WrapNative(cx, JS_GetGlobalForScopeChain(cx),
static_cast<nsIDOMCrypto *>(this), static_cast<nsIDOMCrypto *>(this),
NS_GET_IID(nsIDOMCrypto), getter_AddRefs(holder)); NS_GET_IID(nsIDOMCrypto), getter_AddRefs(holder));
NS_ENSURE_SUCCESS(nrv, nrv); NS_ENSURE_SUCCESS(nrv, nrv);
@ -2176,15 +2176,10 @@ NS_IMETHODIMP
nsCryptoRunnable::Run() nsCryptoRunnable::Run()
{ {
nsNSSShutDownPreventionLock locker; nsNSSShutDownPreventionLock locker;
JSContext *cx = m_args->m_cx; AutoPushJSContext cx(m_args->m_cx);
JSAutoRequest ar(cx); JSAutoRequest ar(cx);
JSAutoCompartment ac(cx, m_args->m_scope); JSAutoCompartment ac(cx, m_args->m_scope);
// make sure the right context is on the stack. must not return w/out popping
nsCxPusher pusher;
pusher.Push(cx);
JSBool ok = JSBool ok =
JS_EvaluateScriptForPrincipals(cx, m_args->m_scope, JS_EvaluateScriptForPrincipals(cx, m_args->m_scope,
nsJSPrincipals::get(m_args->m_principals), nsJSPrincipals::get(m_args->m_principals),

4
xpfe/components/directory/nsDirectoryViewer.cpp
View File

@ -160,7 +160,7 @@ nsHTTPIndex::OnFTPControlLog(bool server, const char *msg)
AutoPushJSContext cx(context->GetNativeContext()); AutoPushJSContext cx(context->GetNativeContext());
NS_ENSURE_TRUE(cx, NS_OK); NS_ENSURE_TRUE(cx, NS_OK);
JS::Rooted<JSObject*> global(cx, JS_GetGlobalObject(cx)); JS::Rooted<JSObject*> global(cx, JS_GetGlobalForScopeChain(cx));
NS_ENSURE_TRUE(global, NS_OK); NS_ENSURE_TRUE(global, NS_OK);
JS::Value params[2]; JS::Value params[2];
@ -236,7 +236,7 @@ nsHTTPIndex::OnStartRequest(nsIRequest *request, nsISupports* aContext)
NS_ENSURE_TRUE(context, NS_ERROR_FAILURE); NS_ENSURE_TRUE(context, NS_ERROR_FAILURE);
AutoPushJSContext cx(context->GetNativeContext()); AutoPushJSContext cx(context->GetNativeContext());
JS::Rooted<JSObject*> global(cx, JS_GetGlobalObject(cx)); JS::Rooted<JSObject*> global(cx, JS_GetGlobalForScopeChain(cx));
// Using XPConnect, wrap the HTTP index object... // Using XPConnect, wrap the HTTP index object...
static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID); static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID);