diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-31 05:54:39 +0000 |
| commit | a6f632714fcb1be3dd00b0fc76fbf6bfc693155b (patch) | |
| tree | b04c82f9af4a0d288a6d4350d774ad8fe6dac903 /parser/html/nsHtml5TreeBuilderCppSupplement.h | |
| parent | 2ed0607c747b21cadaf7401d4ba706097578e74d (diff) | |
| parent | b28effe2ea93e43e362f7ce263d23b55adcb6da7 (diff) | |
| download | UXP-RELBASE_20200831.tar UXP-RELBASE_20200831.tar.gz UXP-RELBASE_20200831.tar.lz UXP-RELBASE_20200831.tar.xz UXP-RELBASE_20200831.zip | |
Merge branch 'redwood' into releaseRELBASE_20200831
Diffstat (limited to 'parser/html/nsHtml5TreeBuilderCppSupplement.h')
| -rw-r--r-- | parser/html/nsHtml5TreeBuilderCppSupplement.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/parser/html/nsHtml5TreeBuilderCppSupplement.h b/parser/html/nsHtml5TreeBuilderCppSupplement.h index aacc5a3e0..9709396c7 100644 --- a/parser/html/nsHtml5TreeBuilderCppSupplement.h +++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h @@ -167,16 +167,20 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName, aAttributes->getValue(nsHtml5AttributeName::ATTR_CROSSORIGIN); nsHtml5String integrity = aAttributes->getValue(nsHtml5AttributeName::ATTR_INTEGRITY); + bool async = + aAttributes->contains(nsHtml5AttributeName::ATTR_ASYNC); + bool defer = + aAttributes->contains(nsHtml5AttributeName::ATTR_DEFER); mSpeculativeLoadQueue.AppendElement()->InitScript( url, charset, type, crossOrigin, integrity, - mode == NS_HTML5TREE_BUILDER_IN_HEAD); - mCurrentHtmlScriptIsAsyncOrDefer = - aAttributes->contains(nsHtml5AttributeName::ATTR_ASYNC) || - aAttributes->contains(nsHtml5AttributeName::ATTR_DEFER); + mode == NS_HTML5TREE_BUILDER_IN_HEAD, + async, + defer); + mCurrentHtmlScriptIsAsyncOrDefer = async || defer; } } else if (nsHtml5Atoms::link == aName) { nsHtml5String rel = @@ -279,7 +283,9 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName, type, crossOrigin, integrity, - mode == NS_HTML5TREE_BUILDER_IN_HEAD); + mode == NS_HTML5TREE_BUILDER_IN_HEAD, + false /* async */, + false /* defer */); } } else if (nsHtml5Atoms::style == aName) { nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement(); |