diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-06 13:49:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 13:49:06 +0200 |
| commit | 1c342a57ee39df04da71d62b80e245810c32fb42 (patch) | |
| tree | b707f289d60e74b398c362e671708e5248667d2b /dom/script/ScriptLoader.h | |
| parent | 501b29a5df925f2de3c0a1343290982e5ff6f829 (diff) | |
| parent | 15a7be79bd1396df9d19e15fd072bb825b0d9313 (diff) | |
| download | UXP-1c342a57ee39df04da71d62b80e245810c32fb42.tar UXP-1c342a57ee39df04da71d62b80e245810c32fb42.tar.gz UXP-1c342a57ee39df04da71d62b80e245810c32fb42.tar.lz UXP-1c342a57ee39df04da71d62b80e245810c32fb42.tar.xz UXP-1c342a57ee39df04da71d62b80e245810c32fb42.zip | |
Merge pull request #1627 from g4jc/618
Keep track of which modules in a graph have been fetched
Diffstat (limited to 'dom/script/ScriptLoader.h')
| -rw-r--r-- | dom/script/ScriptLoader.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h index db2eeed31..3cbecbf03 100644 --- a/dom/script/ScriptLoader.h +++ b/dom/script/ScriptLoader.h @@ -62,6 +62,7 @@ protected: public: ScriptLoadRequest(ScriptKind aKind, + nsIURI* aURI, nsIScriptElement* aElement, uint32_t aVersion, mozilla::CORSMode aCORSMode, @@ -81,6 +82,7 @@ public: mScriptTextBuf(nullptr), mScriptTextLength(0), mJSVersion(aVersion), + mURI(aURI), mLineNo(1), mCORSMode(aCORSMode), mIntegrity(aIntegrity), @@ -165,7 +167,7 @@ public: char16_t* mScriptTextBuf; // Holds script text for non-inline scripts. Don't size_t mScriptTextLength; // use nsString so we can give ownership to jsapi. uint32_t mJSVersion; - nsCOMPtr<nsIURI> mURI; + const nsCOMPtr<nsIURI> mURI; nsCOMPtr<nsIPrincipal> mOriginPrincipal; nsAutoCString mURL; // Keep the URI's filename alive during off thread parsing. int32_t mLineNo; @@ -470,6 +472,7 @@ private: ScriptLoadRequest* CreateLoadRequest( ScriptKind aKind, + nsIURI* aURI, nsIScriptElement* aElement, uint32_t aVersion, mozilla::CORSMode aCORSMode, @@ -572,8 +575,8 @@ private: bool IsFetchingModule(ModuleLoadRequest *aRequest) const; - bool ModuleMapContainsModule(ModuleLoadRequest *aRequest) const; - RefPtr<mozilla::GenericPromise> WaitForModuleFetch(ModuleLoadRequest *aRequest); + bool ModuleMapContainsURL(nsIURI* aURL) const; + RefPtr<mozilla::GenericPromise> WaitForModuleFetch(nsIURI* aURL); ModuleScript* GetFetchedModule(nsIURI* aURL) const; friend bool @@ -588,7 +591,7 @@ private: void StartFetchingModuleDependencies(ModuleLoadRequest* aRequest); RefPtr<mozilla::GenericPromise> - StartFetchingModuleAndDependencies(ModuleLoadRequest* aRequest, nsIURI* aURI); + StartFetchingModuleAndDependencies(ModuleLoadRequest* aParent, nsIURI* aURI); nsIDocument* mDocument; // [WEAK] nsCOMArray<nsIScriptLoaderObserver> mObservers; |