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

Backed out 15 changesets (bug 1757597, bug 1436400) for causing mochitest failures on test_bug1656248.html. CLOSED TREE

Browse Source 
Backed out changeset 4be29c1eb5bc (bug 1436400)
Backed out changeset ffd9ddcef6b0 (bug 1436400)
Backed out changeset 5ac844508d8b (bug 1436400)
Backed out changeset 561aeb550892 (bug 1436400)
Backed out changeset 6f473bcf809a (bug 1436400)
Backed out changeset c33620854115 (bug 1436400)
Backed out changeset 8f894ea40eb2 (bug 1436400)
Backed out changeset cce080064d82 (bug 1436400)
Backed out changeset 001d8528ff96 (bug 1436400)
Backed out changeset dd2bb1b46f75 (bug 1436400)
Backed out changeset b1c2084042fa (bug 1436400)
Backed out changeset dd0fea93bcd7 (bug 1436400)
Backed out changeset e38a959648e1 (bug 1436400)
Backed out changeset 40b474d430e9 (bug 1436400)
Backed out changeset 5bef21ef1ba2 (bug 1757597)
This commit is contained in:
Csoregi Natalia
2022-03-15 07:23:29 +02:00
parent 4bd139da25
commit cae02f7373
133 changed files with 244 additions and 2584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/loader/ModuleLoaderBase.cpp
View File

@@ -113,12 +113,6 @@ bool ModuleLoaderBase::ModuleMapContainsURL(nsIURI* aURL,
return mFetchingModules.Contains(key) || mFetchedModules.Contains(key);
}
bool ModuleLoaderBase::IsModuleFetching(nsIURI* aURL,
nsIGlobalObject* aGlobal) const {
ModuleMapKey key(aURL, aGlobal);
return mFetchingModules.Contains(key);
}
void ModuleLoaderBase::SetModuleFetchStarted(ModuleLoadRequest* aRequest) {
// Update the module map to indicate that a module is currently being fetched.
@@ -748,6 +742,10 @@ nsresult ModuleLoaderBase::EvaluateModule(nsIGlobalObject* aGlobalObject,
MarkerInnerWindowIdFromJSContext(cx),
profilerLabelString);
// When a module is already loaded, it is not feched a second time and the
// mDataType of the request might remain set to DataType::Unknown.
MOZ_ASSERT(aRequest->IsTextSource() || aRequest->IsUnknownDataType());
ModuleLoadRequest* request = aRequest->AsModuleRequest();
MOZ_ASSERT(request->mModuleScript);
MOZ_ASSERT_IF(request->HasLoadContext(),
@@ -779,8 +777,6 @@ nsresult ModuleLoaderBase::EvaluateModule(nsIGlobalObject* aGlobalObject,
JS::Rooted<JS::Value> rval(cx);
mLoader->MaybePrepareModuleForBytecodeEncodingBeforeExecute(cx, request);
rv = nsJSUtils::ModuleEvaluate(cx, module, &rval);
if (NS_SUCCEEDED(rv)) {
@@ -818,10 +814,11 @@ nsresult ModuleLoaderBase::EvaluateModule(nsIGlobalObject* aGlobalObject,
}
}
rv = mLoader->MaybePrepareModuleForBytecodeEncodingAfterExecute(request, rv);
mLoader->MaybeTriggerBytecodeEncoding();
if (aRequest->HasLoadContext()) {
TRACE_FOR_TEST_NONE(aRequest->GetLoadContext()->GetScriptElement(),
"scriptloader_no_encode");
}
aRequest->mCacheInfo = nullptr;
return rv;
}