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

Bug 1804254 - Part 3: Replace RequestedModuleObject with native RequestedModule r=arai

Browse Source 
This is more complicated because it needed a change to the public API now we're
not longer returning an array object. The new API is less error prone since
it's no longer possible for the caller to mutate the object returned.

Depends on D163948

Differential Revision: https://phabricator.services.mozilla.com/D163949
This commit is contained in:
Jon Coppeard
2022-12-07 11:28:28 +00:00
parent 40ba9f5ff6
commit f23abe74f7
6 changed files with 107 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/loader/ModuleLoaderBase.cpp
View File

@@ -759,23 +759,12 @@ nsresult ModuleLoaderBase::ResolveRequestedModules(
JSContext* cx = jsapi.cx();
JS::Rooted<JSObject*> moduleRecord(cx, ms->ModuleRecord());
JS::Rooted<JSObject*> requestedModules(cx);
requestedModules = JS::GetRequestedModules(cx, moduleRecord);
MOZ_ASSERT(requestedModules);
uint32_t length;
if (!JS::GetArrayLength(cx, requestedModules, &length)) {
return NS_ERROR_FAILURE;
}
uint32_t length = JS::GetRequestedModulesCount(cx, moduleRecord);
JS::Rooted<JS::Value> requestedModule(cx);
for (uint32_t i = 0; i < length; i++) {
if (!JS_GetElement(cx, requestedModules, i, &requestedModule)) {
return NS_ERROR_FAILURE;
}
JS::Rooted<JSString*> str(
cx, JS::GetRequestedModuleSpecifier(cx, requestedModule));
cx, JS::GetRequestedModuleSpecifier(cx, moduleRecord, i));
MOZ_ASSERT(str);
nsAutoJSString specifier;
@@ -790,7 +779,7 @@ nsresult ModuleLoaderBase::ResolveRequestedModules(
if (result.isErr()) {
uint32_t lineNumber = 0;
uint32_t columnNumber = 0;
JS::GetRequestedModuleSourcePos(cx, requestedModule, &lineNumber,
JS::GetRequestedModuleSourcePos(cx, moduleRecord, i, &lineNumber,
&columnNumber);
JS::Rooted<JS::Value> error(cx);