corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 939294 - Change xpidl jsval to handles. r=gabor,bz,khuey,bsmedberg,terrence

Browse Source
This commit is contained in:
Tom Schuster
2014-01-09 18:39:36 +01:00
parent 648a6bdcd2
commit 4a7dd51a60
111 changed files with 593 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
js/xpconnect/loader/mozJSSubScriptLoader.cpp
View File

@@ -184,10 +184,10 @@ mozJSSubScriptLoader::ReadScript(nsIURI *uri, JSContext *cx, JSObject *targetObj
NS_IMETHODIMP
mozJSSubScriptLoader::LoadSubScript(const nsAString& url,
const Value& targetArg,
HandleValue target,
const nsAString& charset,
JSContext* cx,
Value* retval)
JSContext *cx,
MutableHandleValue retval)
{
/*
* Loads a local url and evals it into the current cx
@@ -202,14 +202,16 @@ mozJSSubScriptLoader::LoadSubScript(const nsAString& url,
*/
LoadSubScriptOptions options(cx);
options.charset = charset;
options.target = targetArg.isObject() ? &targetArg.toObject() : nullptr;
options.target = target.isObject() ? &target.toObject() : nullptr;
return DoLoadSubScriptWithOptions(url, options, cx, retval);
}
NS_IMETHODIMP
mozJSSubScriptLoader::LoadSubScriptWithOptions(const nsAString& url, const Value& optionsVal,
JSContext* cx, Value* retval)
mozJSSubScriptLoader::LoadSubScriptWithOptions(const nsAString& url,
HandleValue optionsVal,
JSContext *cx,
MutableHandleValue retval)
{
if (!optionsVal.isObject())
return NS_ERROR_INVALID_ARG;
@@ -222,7 +224,8 @@ mozJSSubScriptLoader::LoadSubScriptWithOptions(const nsAString& url, const Value
nsresult
mozJSSubScriptLoader::DoLoadSubScriptWithOptions(const nsAString& url,
LoadSubScriptOptions& options,
JSContext* cx, Value* retval)
JSContext *cx,
MutableHandleValue retval)
{
nsresult rv = NS_OK;
@@ -346,19 +349,18 @@ mozJSSubScriptLoader::DoLoadSubScriptWithOptions(const nsAString& url,
loader->NoteSubScript(script, targetObj);
RootedValue rval(cx);
bool ok = false;
if (function) {
ok = JS_CallFunction(cx, targetObj, function, 0, nullptr, rval.address());
ok = JS_CallFunction(cx, targetObj, function, 0, nullptr, retval.address());
} else {
ok = JS_ExecuteScriptVersion(cx, targetObj, script, rval.address(), version);
ok = JS_ExecuteScriptVersion(cx, targetObj, script, retval.address(), version);
}
if (ok) {
JSAutoCompartment rac(cx, result_obj);
if (!JS_WrapValue(cx, &rval))
if (!JS_WrapValue(cx, retval))
return NS_ERROR_UNEXPECTED;
*retval = rval;
}
if (cache && ok && writeScript) {