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

Bug 514570: Adapt XPConnect to new JS_GetFrameThis arguments. r=jorendorff

Browse Source 
It used to be:
JSObject *JS_GetFrameThis(JSContext *, JSStackFrame *);

Now it is:
JSBool JS_GetFrameThis(JSContext *, JSStackFrame *, jsval *);

(In strict mode code, |this| values that are primitives don't get wrapped.)
This commit is contained in:
Jim Blandy 2010-10-12 11:50:03 -07:00
parent e54a804e93
commit a271637595
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
js/src/xpconnect/src/xpcdebug.cpp
View File

@ -70,7 +70,8 @@ static char* FormatJSFrame(JSContext* cx, JSStackFrame* fp,
{
JSPropertyDescArray callProps = {0, nsnull};
JSPropertyDescArray thisProps = {0, nsnull};
JSObject* thisObj = nsnull;
JSBool gotThisVal;
jsval thisVal;
JSObject* callObj = nsnull;
const char* funname = nsnull;
const char* filename = nsnull;
@ -108,12 +109,14 @@ static char* FormatJSFrame(JSContext* cx, JSStackFrame* fp,
callProps.array = nsnull; // just to be sure
}
thisObj = JS_GetFrameThis(cx, fp);
if(showThisProps)
gotThisVal = JS_GetFrameThis(cx, fp, &thisVal);
if (!gotThisVal ||
!showThisProps ||
JSVAL_IS_PRIMITIVE(thisVal) ||
!JS_GetPropertyDescArray(cx, JSVAL_TO_OBJECT(thisVal),
&thisProps))
{
if(thisObj)
if(!JS_GetPropertyDescArray(cx, thisObj, &thisProps))
thisProps.array = nsnull; // just to be sure
thisProps.array = nsnull; // just to be sure
}
}
@ -219,21 +222,25 @@ static char* FormatJSFrame(JSContext* cx, JSStackFrame* fp,
// print the value of 'this'
if(showLocals && thisObj)
if(showLocals)
{
jsval thisJSVal = OBJECT_TO_JSVAL(thisObj);
JSString* thisValStr;
char* thisVal;
if(nsnull != (thisValStr = JS_ValueToString(cx, thisJSVal)) &&
nsnull != (thisVal = JS_GetStringBytes(thisValStr)))
if(gotThisVal)
{
buf = JS_sprintf_append(buf, TAB "this = %s\n", thisVal);
if(!buf) goto out;
JSString* thisValStr;
char* thisValChars;
if(nsnull != (thisValStr = JS_ValueToString(cx, thisVal)) &&
nsnull != (thisValChars = JS_GetStringBytes(thisValStr)))
{
buf = JS_sprintf_append(buf, TAB "this = %s\n", thisValChars);
if(!buf) goto out;
}
}
else
buf = JS_sprintf_append(buf, TAB "<failed to get 'this' value>\n");
}
// print the properties of 'this'
// print the properties of 'this', if it is an object
if(showThisProps && thisProps.array)
{