From b58a8779c02e8d4abdaae49e1fcc11efeb407bee Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 28 Aug 2019 14:39:17 +0200 Subject: Issue #1221: Pass the original element into nsXMLContentSerializer::CheckElementEnd so that we can properly determine whether it has children. This resolves #1221 --- dom/base/nsPlainTextSerializer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'dom/base/nsPlainTextSerializer.h') diff --git a/dom/base/nsPlainTextSerializer.h b/dom/base/nsPlainTextSerializer.h index 95cf5590c..5055c75a0 100644 --- a/dom/base/nsPlainTextSerializer.h +++ b/dom/base/nsPlainTextSerializer.h @@ -61,6 +61,7 @@ public: mozilla::dom::Element* aOriginalElement, nsAString& aStr) override; NS_IMETHOD AppendElementEnd(mozilla::dom::Element* aElement, + mozilla::dom::Element* aOriginalElement, nsAString& aStr) override; NS_IMETHOD Flush(nsAString& aStr) override; -- cgit v1.2.3 From e287979b3eedb2c67a3c6da2991fdb56a4d35742 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 6 Dec 2019 14:54:57 +0100 Subject: Fix incorrect values for saving ordered lists as text. --- dom/base/nsPlainTextSerializer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dom/base/nsPlainTextSerializer.h') diff --git a/dom/base/nsPlainTextSerializer.h b/dom/base/nsPlainTextSerializer.h index 5055c75a0..650a8e3e7 100644 --- a/dom/base/nsPlainTextSerializer.h +++ b/dom/base/nsPlainTextSerializer.h @@ -81,6 +81,7 @@ private: void Write(const nsAString& aString); bool IsInPre(); bool IsInOL(); + bool IsInOLOrUL() const; bool IsCurrentNodeConverted(); bool MustSuppressLeaf(); @@ -218,8 +219,7 @@ private: uint32_t mIgnoreAboveIndex; // The stack for ordered lists - int32_t *mOLStack; - uint32_t mOLStackIndex; + AutoTArray mOLStack; uint32_t mULCount; -- cgit v1.2.3