Bug 1388728 - Rename JS APIs for loading modules in line with the spec r=bkelly

This commit is contained in:
Jon Coppeard
2017-08-22 10:07:49 +01:00
parent cbbb17c1f9
commit 0149ba95cf
3 changed files with 12 additions and 12 deletions

View File

@@ -828,7 +828,7 @@ ScriptLoader::InstantiateModuleTree(ModuleLoadRequest* aRequest)
NS_ENSURE_SUCCESS(rv, false);
JS::Rooted<JSObject*> module(jsapi.cx(), ms->ModuleRecord());
bool ok = NS_SUCCEEDED(nsJSUtils::ModuleDeclarationInstantiation(jsapi.cx(), module));
bool ok = NS_SUCCEEDED(nsJSUtils::ModuleInstantiate(jsapi.cx(), module));
JS::RootedValue exception(jsapi.cx());
if (!ok) {
@@ -2085,7 +2085,7 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
} else {
JS::Rooted<JSObject*> module(aes.cx(), ms->ModuleRecord());
MOZ_ASSERT(module);
rv = nsJSUtils::ModuleEvaluation(aes.cx(), module);
rv = nsJSUtils::ModuleEvaluate(aes.cx(), module);
}
aRequest->mCacheInfo = nullptr;
} else {