--- a/editor/libeditor/EditAction.h
+++ b/editor/libeditor/EditAction.h
@@ -44,17 +44,19 @@ enum class EditSubAction : int32_t
 
   // eInsertText indicates to insert some characters.
   eInsertText,
 
   // eInsertTextComingFromIME indicates to insert or update composition string
   // with new text which is new composition string or commit string.
   eInsertTextComingFromIME,
 
-  deleteSelection,
+  // eDeleteSelectedContent indicates to remove selected content.
+  eDeleteSelectedContent,
+
   setTextProperty,
   removeTextProperty,
   outputText,
   setText,
 
   // HTML editor only actions
   insertBreak = 3000,
   makeList,

--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -79,17 +79,17 @@ enum
 
 /********************************************************
  *  first some helpful functors we will use
  ********************************************************/
 
 static bool
 IsStyleCachePreservingSubAction(EditSubAction aEditSubAction)
 {
-  return aEditSubAction == EditSubAction::deleteSelection ||
+  return aEditSubAction == EditSubAction::eDeleteSelectedContent ||
          aEditSubAction == EditSubAction::insertBreak ||
          aEditSubAction == EditSubAction::makeList ||
          aEditSubAction == EditSubAction::indent ||
          aEditSubAction == EditSubAction::outdent ||
          aEditSubAction == EditSubAction::align ||
          aEditSubAction == EditSubAction::makeBasicBlock ||
          aEditSubAction == EditSubAction::removeList ||
          aEditSubAction == EditSubAction::makeDefListItem ||
@@ -367,17 +367,17 @@ HTMLEditRules::BeforeEdit(EditSubAction 
     if (mUtilRange) {
       // Ditto for mUtilRange.
       mUtilRange->Reset();
     }
 
     // Remember current inline styles for deletion and normal insertion ops
     if (aEditSubAction == EditSubAction::eInsertText ||
         aEditSubAction == EditSubAction::eInsertTextComingFromIME ||
-        aEditSubAction == EditSubAction::deleteSelection ||
+        aEditSubAction == EditSubAction::eDeleteSelectedContent ||
         IsStyleCachePreservingSubAction(aEditSubAction)) {
       nsCOMPtr<nsINode> selNode =
         aDirection == nsIEditor::eNext ? selEndNode : selStartNode;
       nsresult rv = CacheInlineStyles(selNode);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }
@@ -496,17 +496,18 @@ HTMLEditRules::AfterEditInner(EditSubAct
     PromoteRange(*mDocChangeRange, aEditSubAction);
 
     // if we did a ranged deletion or handling backspace key, make sure we have
     // a place to put caret.
     // Note we only want to do this if the overall operation was deletion,
     // not if deletion was done along the way for EditSubAction::loadHTML,
     // EditSubAction::eInsertText, etc.  That's why this is here rather than
     // DidDeleteSelection().
-    if (aEditSubAction == EditSubAction::deleteSelection && mDidRangedDelete) {
+    if (aEditSubAction == EditSubAction::eDeleteSelectedContent &&
+        mDidRangedDelete) {
       nsresult rv = InsertBRIfNeeded();
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }
 
     // add in any needed <br>s, and remove any unneeded ones.
     nsresult rv = InsertBRElementToEmptyListItemsAndTableCellsInChangedRange();
@@ -532,17 +533,17 @@ HTMLEditRules::AfterEditInner(EditSubAct
     rv = RemoveEmptyNodesInChangedRange();
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
     // attempt to transform any unneeded nbsp's into spaces after doing various operations
     if (aEditSubAction == EditSubAction::eInsertText ||
         aEditSubAction == EditSubAction::eInsertTextComingFromIME ||
-        aEditSubAction == EditSubAction::deleteSelection ||
+        aEditSubAction == EditSubAction::eDeleteSelectedContent ||
         aEditSubAction == EditSubAction::insertBreak ||
         aEditSubAction == EditSubAction::htmlPaste ||
         aEditSubAction == EditSubAction::loadHTML) {
       rv = AdjustWhitespace();
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
 
@@ -568,30 +569,30 @@ HTMLEditRules::AfterEditInner(EditSubAct
       NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
         "Failed to pin selection to the new block");
       mNewBlock = nullptr;
     }
 
     // adjust selection for insert text, html paste, and delete actions
     if (aEditSubAction == EditSubAction::eInsertText ||
         aEditSubAction == EditSubAction::eInsertTextComingFromIME ||
-        aEditSubAction == EditSubAction::deleteSelection ||
+        aEditSubAction == EditSubAction::eDeleteSelectedContent ||
         aEditSubAction == EditSubAction::insertBreak ||
         aEditSubAction == EditSubAction::htmlPaste ||
         aEditSubAction == EditSubAction::loadHTML) {
       rv = AdjustSelection(aDirection);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
     }
 
     // check for any styles which were removed inappropriately
     if (aEditSubAction == EditSubAction::eInsertText ||
         aEditSubAction == EditSubAction::eInsertTextComingFromIME ||
-        aEditSubAction == EditSubAction::deleteSelection ||
+        aEditSubAction == EditSubAction::eDeleteSelectedContent ||
         IsStyleCachePreservingSubAction(aEditSubAction)) {
       HTMLEditorRef().mTypeInState->UpdateSelState(&SelectionRef());
       rv = ReapplyCachedStyles();
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
       ClearCachedStyles();
     }
@@ -686,17 +687,17 @@ HTMLEditRules::WillDoAction(Selection* a
       return WillInsertText(aInfo.mEditSubAction, aCancel, aHandled,
                             aInfo.inString, aInfo.outString,
                             aInfo.maxLength);
     case EditSubAction::loadHTML:
       return WillLoadHTML();
     case EditSubAction::insertBreak:
       UndefineCaretBidiLevel();
       return WillInsertBreak(aCancel, aHandled);
-    case EditSubAction::deleteSelection:
+    case EditSubAction::eDeleteSelectedContent:
       return WillDeleteSelection(aInfo.collapsedAction, aInfo.stripWrappers,
                                  aCancel, aHandled);
     case EditSubAction::makeList:
       return WillMakeList(aInfo.blockType, aInfo.entireList,
                           aInfo.bulletType, aCancel, aHandled);
     case EditSubAction::indent:
       return WillIndent(aCancel, aHandled);
     case EditSubAction::outdent:
@@ -755,17 +756,17 @@ HTMLEditRules::DidDoAction(Selection* aS
 
   AutoSafeEditorData setData(*this, *mHTMLEditor, *aSelection);
 
   switch (aInfo.mEditSubAction) {
     case EditSubAction::eInsertText:
     case EditSubAction::insertBreak:
     case EditSubAction::eInsertTextComingFromIME:
       return NS_OK;
-    case EditSubAction::deleteSelection:
+    case EditSubAction::eDeleteSelectedContent:
       return DidDeleteSelection();
     case EditSubAction::makeBasicBlock:
     case EditSubAction::indent:
     case EditSubAction::outdent:
     case EditSubAction::align:
       return DidMakeBasicBlock();
     case EditSubAction::setAbsolutePosition: {
       nsresult rv = DidMakeBasicBlock();
@@ -1411,17 +1412,17 @@ HTMLEditRules::WillInsert(bool* aCancel)
         return error.StealNSResult();
       }
     }
   }
 
   if (mDidDeleteSelection &&
       (mTopLevelEditSubAction == EditSubAction::eInsertText ||
        mTopLevelEditSubAction == EditSubAction::eInsertTextComingFromIME ||
-       mTopLevelEditSubAction == EditSubAction::deleteSelection)) {
+       mTopLevelEditSubAction == EditSubAction::eDeleteSelectedContent)) {
     nsresult rv = ReapplyCachedStyles();
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
   }
   // For most actions we want to clear the cached styles, but there are
   // exceptions
   if (!IsStyleCachePreservingSubAction(mTopLevelEditSubAction)) {

--- a/editor/libeditor/TextEditRules.cpp
+++ b/editor/libeditor/TextEditRules.cpp
@@ -335,17 +335,17 @@ TextEditRules::WillDoAction(Selection* a
       UndefineCaretBidiLevel();
       return WillInsertText(aInfo.mEditSubAction, aCancel, aHandled,
                             aInfo.inString, aInfo.outString,
                             aInfo.maxLength);
     case EditSubAction::setText:
       UndefineCaretBidiLevel();
       return WillSetText(aCancel, aHandled, aInfo.inString,
                          aInfo.maxLength);
-    case EditSubAction::deleteSelection:
+    case EditSubAction::eDeleteSelectedContent:
       return WillDeleteSelection(aInfo.collapsedAction, aCancel, aHandled);
     case EditSubAction::eUndo:
       return WillUndo(aCancel, aHandled);
     case EditSubAction::eRedo:
       return WillRedo(aCancel, aHandled);
     case EditSubAction::setTextProperty:
       return WillSetTextProperty(aCancel, aHandled);
     case EditSubAction::removeTextProperty:
@@ -376,17 +376,17 @@ TextEditRules::DidDoAction(Selection* aS
 
   AutoSafeEditorData setData(*this, *mTextEditor, *aSelection);
 
   // don't let any txns in here move the selection around behind our back.
   // Note that this won't prevent explicit selection setting from working.
   AutoTransactionsConserveSelection dontChangeMySelection(&TextEditorRef());
 
   switch (aInfo.mEditSubAction) {
-    case EditSubAction::deleteSelection:
+    case EditSubAction::eDeleteSelectedContent:
       return DidDeleteSelection();
     case EditSubAction::eUndo:
       return DidUndo(aResult);
     case EditSubAction::eRedo:
       return DidRedo(aResult);
     default:
       // Don't fail on transactions we don't handle here!
       return NS_OK;

--- a/editor/libeditor/TextEditRules.h
+++ b/editor/libeditor/TextEditRules.h
@@ -539,17 +539,17 @@ public:
   const nsAString* inString;
   nsAString* outString;
   const nsAString* outputFormat;
   int32_t maxLength;
 
   // EditSubAction::outputText
   uint32_t flags;
 
-  // EditSubAction::deleteSelection
+  // EditSubAction::eDeleteSelectedContent
   nsIEditor::EDirection collapsedAction;
   nsIEditor::EStripWrappers stripWrappers;
 
   // EditSubAction::removeList
   bool bOrdered;
 
   // EditSubAction::makeList
   bool entireList;

--- a/editor/libeditor/TextEditor.cpp
+++ b/editor/libeditor/TextEditor.cpp
@@ -664,17 +664,18 @@ TextEditor::DeleteSelectionAsAction(EDir
   }
 
   // Protect the edit rules object from dying
   RefPtr<TextEditRules> rules(mRules);
 
   // delete placeholder txns merge.
   AutoPlaceholderBatch batch(this, nsGkAtoms::DeleteTxnName);
   AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
-                                      *this, EditSubAction::deleteSelection,
+                                      *this,
+                                      EditSubAction::eDeleteSelectedContent,
                                       aDirection);
 
   // pre-process
   RefPtr<Selection> selection = GetSelection();
   NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
 
   // If there is an existing selection when an extended delete is requested,
   //  platforms that use "caret-style" caret positioning collapse the
@@ -698,17 +699,17 @@ TextEditor::DeleteSelectionAsAction(EDir
         }
         break;
       }
       default:
         break;
     }
   }
 
-  EditSubActionInfo subActionInfo(EditSubAction::deleteSelection);
+  EditSubActionInfo subActionInfo(EditSubAction::eDeleteSelectedContent);
   subActionInfo.collapsedAction = aDirection;
   subActionInfo.stripWrappers = aStripWrappers;
   bool cancel, handled;
   nsresult rv =
     rules->WillDoAction(selection, subActionInfo, &cancel, &handled);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     return rv;
   }
@@ -745,17 +746,18 @@ TextEditor::DeleteSelectionWithTransacti
     if (NS_WARN_IF(!deleteSelectionTransaction)) {
       return NS_ERROR_FAILURE;
     }
   }
 
   RefPtr<CharacterData> deleteCharData =
     CharacterData::FromNodeOrNull(deleteNode);
   AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
-                                      *this, EditSubAction::deleteSelection,
+                                      *this,
+                                      EditSubAction::eDeleteSelectedContent,
                                       aDirection);
 
   if (mRules && mRules->AsHTMLEditRules()) {
     if (!deleteNode) {
       RefPtr<HTMLEditRules> htmlEditRules = mRules->AsHTMLEditRules();
       htmlEditRules->WillDeleteSelection(*selection);
     } else if (!deleteCharData) {
       RefPtr<HTMLEditRules> htmlEditRules = mRules->AsHTMLEditRules();

--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -122,17 +122,17 @@ mozInlineSpellStatus::InitForEditorChang
   }
 
   // save the anchor point as a range so we can find the current word later
   mAnchorRange = PositionToCollapsedRange(aAnchorNode, aAnchorOffset);
   if (NS_WARN_IF(!mAnchorRange)) {
     return NS_ERROR_FAILURE;
   }
 
-  bool deleted = aEditSubAction == EditSubAction::deleteSelection;
+  bool deleted = aEditSubAction == EditSubAction::eDeleteSelectedContent;
   if (aEditSubAction == EditSubAction::eInsertTextComingFromIME) {
     // IME may remove the previous node if it cancels composition when
     // there is no text around the composition.
     deleted = !aPreviousNode->IsInComposedDoc();
   }
 
   if (deleted) {
     // Deletes are easy, the range is just the current anchor. We set the range