Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1763372 - address new issues in the hybrid build; r=jonco

Browse Source 
Depends on D143036

Differential Revision: https://phabricator.services.mozilla.com/D143068
This commit is contained in:
Yulia Startsev 2022-04-22 13:24:10 +00:00
parent f1dd84285f
commit 604a6aa077
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/script/ScriptLoadContext.cpp
View File

@ -14,8 +14,8 @@
#include "js/OffThreadScriptCompilation.h"
#include "js/SourceText.h"
#include "js/loader/ScriptLoadRequest.h"
#include "js/loader/LoadContextBase.h"
#include "js/loader/ModuleLoadRequest.h"
#include "ScriptLoadContext.h"
#include "ModuleLoadRequest.h"

8
js/loader/ModuleLoadRequest.cpp
View File

@ -7,8 +7,10 @@
#include "ModuleLoadRequest.h"
#include "mozilla/HoldDropJSObjects.h"
#include "mozilla/dom/ScriptLoadContext.h"
#include "LoadedScript.h"
#include "LoadContextBase.h"
#include "ModuleLoaderBase.h"
namespace JS::loader {
@ -55,9 +57,9 @@ VisitedURLSet* ModuleLoadRequest::NewVisitedSetForTopLevelImport(nsIURI* aURI) {
ModuleLoadRequest::ModuleLoadRequest(
nsIURI* aURI, ScriptFetchOptions* aFetchOptions,
const mozilla::dom::SRIMetadata& aIntegrity, nsIURI* aReferrer,
mozilla::dom::ScriptLoadContext* aContext, bool aIsTopLevel,
bool aIsDynamicImport, ModuleLoaderBase* aLoader,
VisitedURLSet* aVisitedSet, ModuleLoadRequest* aRootModule)
LoadContextBase* aContext, bool aIsTopLevel, bool aIsDynamicImport,
ModuleLoaderBase* aLoader, VisitedURLSet* aVisitedSet,
ModuleLoadRequest* aRootModule)
: ScriptLoadRequest(ScriptKind::eModule, aURI, aFetchOptions, aIntegrity,
aReferrer, aContext),
mIsTopLevel(aIsTopLevel),

3
js/loader/ModuleLoadRequest.h
View File

@ -7,6 +7,7 @@
#ifndef js_loader_ModuleLoadRequest_h
#define js_loader_ModuleLoadRequest_h
#include "LoadContextBase.h"
#include "ScriptLoadRequest.h"
#include "ModuleLoaderBase.h"
#include "mozilla/Assertions.h"
@ -52,7 +53,7 @@ class ModuleLoadRequest final : public ScriptLoadRequest {
ModuleLoadRequest(nsIURI* aURI, ScriptFetchOptions* aFetchOptions,
const SRIMetadata& aIntegrity, nsIURI* aReferrer,
mozilla::dom::ScriptLoadContext* aContext, bool aIsTopLevel,
LoadContextBase* aContext, bool aIsTopLevel,
bool aIsDynamicImport, ModuleLoaderBase* aLoader,
VisitedURLSet* aVisitedSet, ModuleLoadRequest* aRootModule);

1
js/loader/ModuleLoaderBase.cpp
View File

@ -20,6 +20,7 @@
#include "js/SourceText.h"
#include "mozilla/BasePrincipal.h"
#include "mozilla/dom/AutoEntryScript.h"
#include "mozilla/dom/ScriptLoadContext.h"
#include "mozilla/CycleCollectedJSContext.h" // nsAutoMicroTask
#include "mozilla/Preferences.h"
#include "nsContentUtils.h"