Backed out 9 changesets (bug 1747059, bug 1767525)for causing hazard failures on ShadowRealmGlobalScope.cpp. CLOSED TREE
Backed out changeset ed7aad37f2cf (bug 1747059) Backed out changeset 40a257fb4788 (bug 1747059) Backed out changeset f7b049ef3b8c (bug 1747059) Backed out changeset aad38abc7139 (bug 1747059) Backed out changeset 8115813e77a5 (bug 1747059) Backed out changeset e06192e664fd (bug 1747059) Backed out changeset a198b0893220 (bug 1767525) Backed out changeset c083f0824619 (bug 1767525) Backed out changeset 9a3bf794ec6d (bug 1767525)
This commit is contained in:
@@ -172,7 +172,7 @@ NS_IMPL_CYCLE_COLLECTION(ScriptLoader, mNonAsyncExternalScriptInsertedRequests,
|
||||
mXSLTRequests, mParserBlockingRequest,
|
||||
mBytecodeEncodingQueue, mPreloads,
|
||||
mPendingChildLoaders, mModuleLoader,
|
||||
mWebExtModuleLoaders, mShadowRealmModuleLoaders)
|
||||
mWebExtModuleLoaders)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(ScriptLoader)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(ScriptLoader)
|
||||
@@ -279,13 +279,6 @@ void ScriptLoader::RegisterContentScriptModuleLoader(ModuleLoader* aLoader) {
|
||||
mWebExtModuleLoaders.AppendElement(aLoader);
|
||||
}
|
||||
|
||||
void ScriptLoader::RegisterShadowRealmModuleLoader(ModuleLoader* aLoader) {
|
||||
MOZ_ASSERT(aLoader);
|
||||
MOZ_ASSERT(aLoader->GetScriptLoader() == this);
|
||||
|
||||
mShadowRealmModuleLoaders.AppendElement(aLoader);
|
||||
}
|
||||
|
||||
// Collect telemtry data about the cache information, and the kind of source
|
||||
// which are being loaded, and where it is being loaded from.
|
||||
static void CollectScriptTelemetry(ScriptLoadRequest* aRequest) {
|
||||
@@ -2691,12 +2684,6 @@ bool ScriptLoader::HasPendingDynamicImports() const {
|
||||
}
|
||||
}
|
||||
|
||||
for (ModuleLoader* loader : mShadowRealmModuleLoaders) {
|
||||
if (loader->HasPendingDynamicImports()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -3535,10 +3522,6 @@ void ScriptLoader::ParsingComplete(bool aTerminated) {
|
||||
loader->CancelAndClearDynamicImports();
|
||||
}
|
||||
|
||||
for (ModuleLoader* loader : mShadowRealmModuleLoaders) {
|
||||
loader->CancelAndClearDynamicImports();
|
||||
}
|
||||
|
||||
if (mParserBlockingRequest) {
|
||||
mParserBlockingRequest->Cancel();
|
||||
mParserBlockingRequest = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user