From a48c9c34aa30b7ac570887f9292c887e72cc0e8a Mon Sep 17 00:00:00 2001
From: Masayuki Nakano <masayuki@d-toybox.com>
Date: Mon, 28 May 2018 23:40:45 +0900
Subject: [PATCH] Bug 1463985 - part 24: Rename
 EditSubAction::resetTextProperties to EditSubAction::eRemoveAllTextProperties
 r=m_kato

MozReview-Commit-ID: 1QKUg361MSY

--HG--
extra : rebase_source : 7ed2f41e20e498e105fac8a88be90157dd812fa1
---
 editor/libeditor/EditAction.h        | 4 +++-
 editor/libeditor/HTMLStyleEditor.cpp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/editor/libeditor/EditAction.h b/editor/libeditor/EditAction.h
index 8b5bbccffd2a..c51f9f4ed3d5 100644
--- a/editor/libeditor/EditAction.h
+++ b/editor/libeditor/EditAction.h
@@ -58,6 +58,9 @@ enum class EditSubAction : int32_t
   // eRemoveTextProperty indicates to remove a style from text.
   eRemoveTextProperty,
 
+  // eRemoveAllTextProperties indicate to remove all styles from text.
+  eRemoveAllTextProperties,
+
   // eComputeTextToOutput indicates to compute the editor value as plain text
   // or something requested format.
   eComputeTextToOutput,
@@ -106,7 +109,6 @@ enum class EditSubAction : int32_t
   // source and insert into the DOM tree.  So, this is similar to innerHTML.
   eInsertHTMLSource,
 
-  resetTextProperties,
   setAbsolutePosition,
   removeAbsolutePosition,
   decreaseZIndex,
diff --git a/editor/libeditor/HTMLStyleEditor.cpp b/editor/libeditor/HTMLStyleEditor.cpp
index 221bdaa94602..62808b36d247 100644
--- a/editor/libeditor/HTMLStyleEditor.cpp
+++ b/editor/libeditor/HTMLStyleEditor.cpp
@@ -1194,7 +1194,8 @@ HTMLEditor::RemoveAllInlineProperties()
 {
   AutoPlaceholderBatch batchIt(this);
   AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
-                                      *this, EditSubAction::resetTextProperties,
+                                      *this,
+                                      EditSubAction::eRemoveAllTextProperties,
                                       nsIEditor::eNext);
 
   nsresult rv = RemoveInlineProperty(nullptr, nullptr);