diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-09-23 23:45:46 +0000 |
| commit | 9f5c27ba479c54d4ebb1bd59b61fbf793f6df93f (patch) | |
| tree | 831e0ae1649d6135429def03688bc93ff7c86b03 /parser/html/nsHtml5SpeculativeLoad.h | |
| parent | 42f895f27f239e973c9c06241f7a58da7381353c (diff) | |
| parent | f624bd1375655dea196cdcb70a9860bc5817df49 (diff) | |
| download | UXP-RC_20200924.tar UXP-RC_20200924.tar.gz UXP-RC_20200924.tar.lz UXP-RC_20200924.tar.xz UXP-RC_20200924.zip | |
Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924
Diffstat (limited to 'parser/html/nsHtml5SpeculativeLoad.h')
| -rw-r--r-- | parser/html/nsHtml5SpeculativeLoad.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/parser/html/nsHtml5SpeculativeLoad.h b/parser/html/nsHtml5SpeculativeLoad.h index fcc84de4f..1f4a61741 100644 --- a/parser/html/nsHtml5SpeculativeLoad.h +++ b/parser/html/nsHtml5SpeculativeLoad.h @@ -10,7 +10,8 @@ class nsHtml5TreeOpExecutor; -enum eHtml5SpeculativeLoad { +enum eHtml5SpeculativeLoad +{ #ifdef DEBUG eSpeculativeLoadUninitialized, #endif @@ -23,6 +24,8 @@ enum eHtml5SpeculativeLoad { eSpeculativeLoadPictureSource, eSpeculativeLoadScript, eSpeculativeLoadScriptFromHead, + eSpeculativeLoadNoModuleScript, + eSpeculativeLoadNoModuleScriptFromHead, eSpeculativeLoadStyle, eSpeculativeLoadManifest, eSpeculativeLoadSetDocumentCharset, @@ -130,12 +133,18 @@ class nsHtml5SpeculativeLoad { nsHtml5String aIntegrity, bool aParserInHead, bool aAsync, - bool aDefer) + bool aDefer, + bool aNoModule) { NS_PRECONDITION(mOpCode == eSpeculativeLoadUninitialized, "Trying to reinitialize a speculative load!"); - mOpCode = aParserInHead ? - eSpeculativeLoadScriptFromHead : eSpeculativeLoadScript; + if (aNoModule) { + mOpCode = aParserInHead ? eSpeculativeLoadNoModuleScriptFromHead + : eSpeculativeLoadNoModuleScript; + } else { + mOpCode = aParserInHead ? eSpeculativeLoadScriptFromHead + : eSpeculativeLoadScript; + } aUrl.ToString(mUrl); aCharset.ToString(mCharset); aType.ToString(mTypeOrCharsetSourceOrDocumentMode); |