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

Bug 583839. Also skip the string buffer refcounting for traceable native quickstubs, not just fastnative ones. r=jst

Browse Source
This commit is contained in:
Boris Zbarsky 2010-08-04 22:40:18 -04:00
parent 170437618c
commit 7f4f3b1566
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/xpconnect/src/xpcquickstubs.cpp
View File

@ -1087,7 +1087,7 @@ xpc_qsStringToJsval(JSContext *cx, nsString &str, jsval *rval)
}
JSBool
xpc_qsStringToJsstring(JSContext *cx, const nsAString &str, JSString **rval)
xpc_qsStringToJsstring(JSContext *cx, nsString &str, JSString **rval)
{
// From the T_DOMSTRING case in XPCConvert::NativeData2JS.
if(str.IsVoid())
@ -1096,10 +1096,18 @@ xpc_qsStringToJsstring(JSContext *cx, const nsAString &str, JSString **rval)
return JS_TRUE;
}
jsval jsstr = XPCStringConvert::ReadableToJSVal(cx, str);
PRBool isShared = PR_FALSE;
jsval jsstr =
XPCStringConvert::ReadableToJSVal(cx, str, PR_TRUE, &isShared);
if(JSVAL_IS_NULL(jsstr))
return JS_FALSE;
*rval = JSVAL_TO_STRING(jsstr);
if (isShared)
{
// The string was shared but ReadableToJSVal didn't addref it.
// Move the ownership from str to jsstr.
str.ForgetSharedBuffer();
}
return JS_TRUE;
}

4
js/src/xpconnect/src/xpcquickstubs.h
View File

@ -425,9 +425,9 @@ xpc_qsJsvalToWcharStr(JSContext *cx, jsval v, jsval *pval, PRUnichar **pstr);
JSBool
xpc_qsStringToJsval(JSContext *cx, nsString &str, jsval *rval);
/** Convert an nsAString to JSString, returning JS_TRUE on success. */
/** Convert an nsString to JSString, returning JS_TRUE on success. This will sometimes modify |str| to be empty. */
JSBool
xpc_qsStringToJsstring(JSContext *cx, const nsAString &str, JSString **rval);
xpc_qsStringToJsstring(JSContext *cx, nsString &str, JSString **rval);
nsresult
getWrapper(JSContext *cx,