From 3cae23189b81ff87790ec5cfd2e228798923b214 Mon Sep 17 00:00:00 2001
From: Mirko Brodesser <mbrodesser@mozilla.com>
Date: Mon, 2 Sep 2019 15:25:15 +0000
Subject: [PATCH] Bug 1578149: part 5) Bundle resetting `mIndentation.mHeader`
 and `mCurrentLineContent`. r=hsivonen

Depends on D44349

Differential Revision: https://phabricator.services.mozilla.com/D44350

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsPlainTextSerializer.cpp | 21 +++++++++++----------
 dom/base/nsPlainTextSerializer.h   |  3 +++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dom/base/nsPlainTextSerializer.cpp b/dom/base/nsPlainTextSerializer.cpp
index 866c6b199186..c8fc2ee3417a 100644
--- a/dom/base/nsPlainTextSerializer.cpp
+++ b/dom/base/nsPlainTextSerializer.cpp
@@ -1127,6 +1127,13 @@ void nsPlainTextSerializer::EnsureVerticalSpace(int32_t noOfRows) {
   mFloatingLines = -1;
 }
 
+void nsPlainTextSerializer::ResetCurrentLineContentAndIndentationHeader() {
+  mCurrentLineContent.mValue.Truncate();
+  mCurrentLineContent.mWidth = 0;
+
+  mIndentation.mHeader.Truncate();
+}
+
 /**
  * This empties the current line cache without adding a NEWLINE.
  * Should not be used if line wrapping is of importance since
@@ -1143,14 +1150,12 @@ void nsPlainTextSerializer::FlushLine() {
       nsAutoString quotesAndIndent;
       CreateQuotesAndIndent(
           quotesAndIndent);  // XXX: Should we always do this? Bug?
-      mIndentation.mHeader.Truncate();
       mOutputManager->Append(quotesAndIndent);
     }
 
     mCurrentLineContent.MaybeReplaceNbsps();
     mOutputManager->Append(mCurrentLineContent.mValue);
-    mCurrentLineContent.mValue.Truncate();
-    mCurrentLineContent.mWidth = 0;
+    ResetCurrentLineContentAndIndentationHeader();
   }
 }
 
@@ -1406,7 +1411,6 @@ void nsPlainTextSerializer::EndLine(bool aSoftlinebreak, bool aBreakBySpace) {
     const bool stripTrailingSpaces = mCurrentLineContent.mValue.IsEmpty();
     nsAutoString quotesAndIndent;
     CreateQuotesAndIndent(quotesAndIndent);
-    mIndentation.mHeader.Truncate();
 
     if (stripTrailingSpaces) {
       quotesAndIndent.Trim(" ", false, true, false);
@@ -1418,8 +1422,7 @@ void nsPlainTextSerializer::EndLine(bool aSoftlinebreak, bool aBreakBySpace) {
   mCurrentLineContent.MaybeReplaceNbsps();
   mOutputManager->Append(mCurrentLineContent.mValue);
   mOutputManager->AppendLineBreak();
-  mCurrentLineContent.mValue.Truncate();
-  mCurrentLineContent.mWidth = 0;
+  ResetCurrentLineContentAndIndentationHeader();
   mInWhitespace = true;
   mLineBreakDue = false;
   mFloatingLines = -1;
@@ -1584,7 +1587,6 @@ void nsPlainTextSerializer::Write(const nsAString& aStr) {
         }
       }
 
-      mCurrentLineContent.mValue.Truncate();
       if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
         if ((outputLineBreak || !spacesOnly) &&  // bugs 261467,125928
             !IsQuotedLine(stringpart) && !stringpart.EqualsLiteral("-- ") &&
@@ -1598,7 +1600,6 @@ void nsPlainTextSerializer::Write(const nsAString& aStr) {
       if (outputQuotes) {
         nsAutoString quotesAndIndent;
         CreateQuotesAndIndent(quotesAndIndent);
-        mIndentation.mHeader.Truncate();
         mOutputManager->Append(quotesAndIndent);
       }
 
@@ -1610,9 +1611,9 @@ void nsPlainTextSerializer::Write(const nsAString& aStr) {
       if (outputLineBreak) {
         mOutputManager->AppendLineBreak();
       }
-    }
 
-    mCurrentLineContent.mValue.Truncate();
+      ResetCurrentLineContentAndIndentationHeader();
+    }
 
 #ifdef DEBUG_wrapping
     printf("No wrapping: newline is %d, totLen is %d\n", newline, totLen);
diff --git a/dom/base/nsPlainTextSerializer.h b/dom/base/nsPlainTextSerializer.h
index 0035f1c35214..83cf76610b9f 100644
--- a/dom/base/nsPlainTextSerializer.h
+++ b/dom/base/nsPlainTextSerializer.h
@@ -90,6 +90,9 @@ class nsPlainTextSerializer final : public nsIContentSerializer {
   void AddToLine(const char16_t* aStringToAdd, int32_t aLength);
   void EndLine(bool softlinebreak, bool aBreakBySpace = false);
   void EnsureVerticalSpace(int32_t noOfRows);
+
+  void ResetCurrentLineContentAndIndentationHeader();
+
   void FlushLine();
   void CreateQuotesAndIndent(nsAString& aResult) const;