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

Backed out 9 changesets (bug 1688879) for bustages on ImportMap.cpp

Browse Source 
Backed out changeset 44e9abe72a5e (bug 1688879)
Backed out changeset 0503d2d2ae01 (bug 1688879)
Backed out changeset 2cf08a51b184 (bug 1688879)
Backed out changeset 6f0276c3ab0e (bug 1688879)
Backed out changeset f16b14d8f677 (bug 1688879)
Backed out changeset 03b772e02d07 (bug 1688879)
Backed out changeset 39ed48a5ecc2 (bug 1688879)
Backed out changeset d7b42d8312bb (bug 1688879)
Backed out changeset 5e695bf5dd0d (bug 1688879)
This commit is contained in:
Narcis Beleuzu
2022-05-05 03:41:31 +03:00
parent 46eb24dc40
commit 8fd1fceb75
54 changed files with 590 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/loader/ModuleLoaderBase.h
View File

@@ -10,7 +10,6 @@
#include "LoadedScript.h"
#include "ScriptLoadRequest.h"
#include "ImportMap.h"
#include "js/TypeDecls.h" // JS::MutableHandle, JS::Handle, JS::Root
#include "js/Modules.h"
#include "nsRefPtrHashtable.h"
@@ -23,8 +22,6 @@
#include "mozilla/dom/JSExecutionContext.h"
#include "mozilla/MaybeOneOf.h"
#include "mozilla/MozPromise.h"
#include "mozilla/UniquePtr.h"
#include "ResolveResult.h"
class nsIURI;
@@ -63,10 +60,6 @@ class ScriptLoaderInterface : public nsISupports {
virtual void ReportErrorToConsole(ScriptLoadRequest* aRequest,
nsresult aResult) const = 0;
virtual void ReportWarningToConsole(
ScriptLoadRequest* aRequest, const char* aMessageName,
const nsTArray<nsString>& aParams = nsTArray<nsString>()) const = 0;
// Fill in CompileOptions, as well as produce the introducer script for
// subsequent calls to UpdateDebuggerMetadata
virtual nsresult FillCompileOptionsForRequest(
@@ -151,16 +144,9 @@ class ModuleLoaderBase : public nsISupports {
nsCOMPtr<nsIGlobalObject> mGlobalObject;
// https://wicg.github.io/import-maps/#document-acquiring-import-maps
//
// Each Document has an acquiring import maps boolean. It is initially true.
bool mAcquiringImportMaps = true;
protected:
RefPtr<ScriptLoaderInterface> mLoader;
mozilla::UniquePtr<ImportMap> mImportMap;
virtual ~ModuleLoaderBase();
public:
@@ -241,20 +227,6 @@ class ModuleLoaderBase : public nsISupports {
void ProcessDynamicImport(ModuleLoadRequest* aRequest);
void CancelAndClearDynamicImports();
// Process <script type="importmap">
mozilla::UniquePtr<ImportMap> ParseImportMap(ScriptLoadRequest* aRequest);
// Implements https://wicg.github.io/import-maps/#register-an-import-map
void RegisterImportMap(mozilla::UniquePtr<ImportMap> aImportMap);
/**
* Getter and Setter for mAcquiringImportMaps.
*/
bool GetAcquiringImportMaps() const { return mAcquiringImportMaps; }
void SetAcquiringImportMaps(bool acquiring) {
mAcquiringImportMaps = acquiring;
}
// Internal methods.
private:
@@ -281,15 +253,14 @@ class ModuleLoaderBase : public nsISupports {
static bool HostGetSupportedImportAssertions(
JSContext* aCx, JS::ImportAssertionVector& aValues);
ResolveResult ResolveModuleSpecifier(LoadedScript* aScript,
const nsAString& aSpecifier);
already_AddRefed<nsIURI> ResolveModuleSpecifier(LoadedScript* aScript,
const nsAString& aSpecifier);
static nsresult HandleResolveFailure(JSContext* aCx, LoadedScript* aScript,
const nsAString& aSpecifier,
ResolveError aError,
uint32_t aLineNumber,
uint32_t aColumnNumber,
JS::MutableHandle<JS::Value> aErrorOut);
JS::MutableHandle<JS::Value> errorOut);
enum class RestartRequest { No, Yes };
nsresult StartOrRestartModuleLoad(ModuleLoadRequest* aRequest,