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

Backed out changeset da82ea6820ee (bug 1482153)

Browse Source
This commit is contained in:
Jon Coppeard
2018-10-04 11:50:55 +01:00
parent 22df12aff0
commit 6347e29d3c
10 changed files with 43 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dom/script/ScriptLoader.cpp
View File

@@ -763,13 +763,8 @@ HostResolveImportedModule(JSContext* aCx, JS::Handle<JSScript*> aScript,
JS::Handle<JSString*> aSpecifier)
{
// Let referencing module script be referencingModule.[[HostDefined]].
void* value = JS::GetTopLevelScriptPrivate(aScript);
if (!value) {
JS_ReportErrorASCII(aCx, "Module script not found");
return nullptr;
}
auto script = static_cast<ModuleScript*>(value);
JS::Value value = JS::GetModuleHostDefinedField(aScript);
auto script = static_cast<ModuleScript*>(value.toPrivate());
MOZ_ASSERT(script->Script() == aScript);
// Let url be the result of resolving a module specifier given referencing
@@ -802,13 +797,13 @@ HostPopulateImportMeta(JSContext* aCx, JS::Handle<JSScript*> aScript,
{
MOZ_DIAGNOSTIC_ASSERT(aScript);
void* value = JS::GetTopLevelScriptPrivate(aScript);
if (!value) {
JS::Value value = JS::GetModuleHostDefinedField(aScript);
if (value.isUndefined()) {
JS_ReportErrorASCII(aCx, "Module script not found");
return false;
}
auto script = static_cast<ModuleScript*>(value);
auto script = static_cast<ModuleScript*>(value.toPrivate());
MOZ_DIAGNOSTIC_ASSERT(script->Script() == aScript);
nsAutoCString url;