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

Backed out 11 changesets (bug 1688879) for causing build bustages. CLOSED TREE

Browse Source 
Backed out changeset 350ddd17c7f5 (bug 1688879)
Backed out changeset 27984b95ed20 (bug 1688879)
Backed out changeset 6a5bb063965f (bug 1688879)
Backed out changeset d8edcfdb504b (bug 1688879)
Backed out changeset 77ab231310ec (bug 1688879)
Backed out changeset c2bce95a1aca (bug 1688879)
Backed out changeset f5862572ced8 (bug 1688879)
Backed out changeset 05e0a1bf32fc (bug 1688879)
Backed out changeset adeab05b7419 (bug 1688879)
Backed out changeset 0e60834e17e5 (bug 1688879)
Backed out changeset 877bb4c2ce66 (bug 1688879)
This commit is contained in:
Butkovits Atila
2022-05-05 19:52:05 +03:00
parent ef7d77fcdb
commit b018b0e4da
57 changed files with 590 additions and 1452 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,