diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:31:35 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:31:35 +0200 |
commit | 0f7f961e8894c8408b7fa21bbeba7ac503d372eb (patch) | |
tree | 033c37b3e8ca856d8b35d2408afa5269f0237078 /dom/base/nsXMLContentSerializer.cpp | |
parent | dba27e6f639954060b9353c6d8f594eab0e06a99 (diff) | |
parent | 6db06749e2037029adc96660aafa5339ed609e60 (diff) | |
download | UXP-0f7f961e8894c8408b7fa21bbeba7ac503d372eb.tar UXP-0f7f961e8894c8408b7fa21bbeba7ac503d372eb.tar.gz UXP-0f7f961e8894c8408b7fa21bbeba7ac503d372eb.tar.lz UXP-0f7f961e8894c8408b7fa21bbeba7ac503d372eb.tar.xz UXP-0f7f961e8894c8408b7fa21bbeba7ac503d372eb.zip |
Merge branch 'master' into Basilisk-releasev2019.09.12
Diffstat (limited to 'dom/base/nsXMLContentSerializer.cpp')
-rw-r--r-- | dom/base/nsXMLContentSerializer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dom/base/nsXMLContentSerializer.cpp b/dom/base/nsXMLContentSerializer.cpp index 54fadaa94..f12bb8fdc 100644 --- a/dom/base/nsXMLContentSerializer.cpp +++ b/dom/base/nsXMLContentSerializer.cpp @@ -1028,6 +1028,7 @@ nsXMLContentSerializer::AppendEndOfElementStart(Element* aElement, NS_IMETHODIMP nsXMLContentSerializer::AppendElementEnd(Element* aElement, + Element* aOriginalElement, nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -1035,7 +1036,7 @@ nsXMLContentSerializer::AppendElementEnd(Element* aElement, nsIContent* content = aElement; bool forceFormat = false, outputElementEnd; - outputElementEnd = CheckElementEnd(aElement, forceFormat, aStr); + outputElementEnd = CheckElementEnd(aElement, aOriginalElement, forceFormat, aStr); nsIAtom *name = content->NodeInfo()->NameAtom(); @@ -1161,16 +1162,14 @@ nsXMLContentSerializer::CheckElementStart(nsIContent * aContent, bool nsXMLContentSerializer::CheckElementEnd(Element* aElement, + Element* aOriginalElement, bool& aForceFormat, nsAString& aStr) { // We don't output a separate end tag for empty element aForceFormat = false; - // XXXbz this is a bit messed up, but by now we don't have our fixed-up - // version of aElement anymore. Let's hope fixup never changes the localName - // or namespace... - return ElementNeedsSeparateEndTag(aElement, aElement); + return ElementNeedsSeparateEndTag(aElement, aOriginalElement); } bool |