зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1356666, part 4 - Use handles as arguments in mozJSSubscriptLoader. r=mrbkap
MozReview-Commit-ID: 9fClU6BIWfT --HG-- extra : rebase_source : 0f255542a13fd1fdad3a950892694bc8684c0ac0
This commit is contained in:
Родитель
f5c9d2bf30
Коммит
39d3aedd82
|
@ -123,7 +123,7 @@ ReportError(JSContext* cx, const char* origMsg, nsIURI* uri)
|
||||||
static bool
|
static bool
|
||||||
PrepareScript(nsIURI* uri,
|
PrepareScript(nsIURI* uri,
|
||||||
JSContext* cx,
|
JSContext* cx,
|
||||||
RootedObject& targetObj,
|
HandleObject targetObj,
|
||||||
const char* uriStr,
|
const char* uriStr,
|
||||||
const nsAString& charset,
|
const nsAString& charset,
|
||||||
const char* buf,
|
const char* buf,
|
||||||
|
@ -185,15 +185,15 @@ PrepareScript(nsIURI* uri,
|
||||||
|
|
||||||
static bool
|
static bool
|
||||||
EvalScript(JSContext* cx,
|
EvalScript(JSContext* cx,
|
||||||
RootedObject& targetObj,
|
HandleObject targetObj,
|
||||||
MutableHandleValue retval,
|
MutableHandleValue retval,
|
||||||
nsIURI* uri,
|
nsIURI* uri,
|
||||||
bool cache,
|
bool cache,
|
||||||
RootedScript& script,
|
MutableHandleScript script,
|
||||||
RootedFunction& function)
|
HandleFunction function)
|
||||||
{
|
{
|
||||||
if (function) {
|
if (function) {
|
||||||
script = JS_GetFunctionScript(cx, function);
|
script.set(JS_GetFunctionScript(cx, function));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (function) {
|
if (function) {
|
||||||
|
@ -393,7 +393,7 @@ AsyncScriptLoader::OnStreamComplete(nsIIncrementalStreamLoader* aLoader,
|
||||||
}
|
}
|
||||||
|
|
||||||
JS::Rooted<JS::Value> retval(cx);
|
JS::Rooted<JS::Value> retval(cx);
|
||||||
if (EvalScript(cx, targetObj, &retval, uri, mCache, script, function)) {
|
if (EvalScript(cx, targetObj, &retval, uri, mCache, &script, function)) {
|
||||||
autoPromise.ResolvePromise(retval);
|
autoPromise.ResolvePromise(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -697,7 +697,7 @@ mozJSSubScriptLoader::DoLoadSubScriptWithOptions(const nsAString& url,
|
||||||
cache = nullptr;
|
cache = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
Unused << EvalScript(cx, targetObj, retval, uri, !!cache, script, function);
|
Unused << EvalScript(cx, targetObj, retval, uri, !!cache, &script, function);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче