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 997440 - Push some more cxes in jsd. r=bz

Browse Source
This commit is contained in:
Bobby Holley 2014-05-20 22:52:18 -07:00
parent 0fa2605918
commit 36e441912e
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/jsd/jsd_stak.cpp
View File

@ -270,7 +270,8 @@ jsd_GetCallObjectForStackFrame(JSDContext* jsdc,
if( jsd_IsValidFrameInThreadState(jsdc, jsdthreadstate, jsdframe) )
{
obj = jsdframe->frame.callObject(jsdthreadstate->context);
AutoPushJSContext cx(jsdthreadstate->context);
obj = jsdframe->frame.callObject(cx);
if(obj)
jsdval = JSD_NewValue(jsdc, OBJECT_TO_JSVAL(obj));
}
@ -292,9 +293,8 @@ jsd_GetScopeChainForStackFrame(JSDContext* jsdc,
if( jsd_IsValidFrameInThreadState(jsdc, jsdthreadstate, jsdframe) )
{
JS_BeginRequest(jsdthreadstate->context);
obj = jsdframe->frame.scopeChain(jsdthreadstate->context);
JS_EndRequest(jsdthreadstate->context);
AutoPushJSContext cx(jsdthreadstate->context);
obj = jsdframe->frame.scopeChain(cx);
if(obj)
jsdval = JSD_NewValue(jsdc, OBJECT_TO_JSVAL(obj));
}
@ -316,9 +316,8 @@ jsd_GetThisForStackFrame(JSDContext* jsdc,
{
bool ok;
JS::RootedValue thisval(jsdthreadstate->context);
JS_BeginRequest(jsdthreadstate->context);
ok = jsdframe->frame.getThisValue(jsdthreadstate->context, &thisval);
JS_EndRequest(jsdthreadstate->context);
AutoPushJSContext cx(jsdthreadstate->context);
ok = jsdframe->frame.getThisValue(cx, &thisval);
if(ok)
jsdval = JSD_NewValue(jsdc, thisval);
}
@ -473,7 +472,6 @@ jsd_ValToStringInStackFrame(JSDContext* jsdc,
bool valid;
JSString* retval;
JSExceptionState* exceptionState;
JSContext* cx;
JSD_LOCK_THREADSTATES(jsdc);
valid = jsd_IsValidFrameInThreadState(jsdc, jsdthreadstate, jsdframe);
@ -482,8 +480,7 @@ jsd_ValToStringInStackFrame(JSDContext* jsdc,
if( ! valid )
return nullptr;
cx = jsdthreadstate->context;
MOZ_ASSERT(cx);
AutoPushJSContext cx(jsdthreadstate->context);
JS::RootedValue v(cx, val);
exceptionState = JS_SaveExceptionState(cx);