Bug 1463985 - part 19: Rename EditSubAction::removeList to EditSubAction::eRemoveList r?m_kato
MozReview-Commit-ID: DgsZwANcEdF
--- a/editor/libeditor/EditAction.h
+++ b/editor/libeditor/EditAction.h
@@ -81,17 +81,19 @@ enum class EditSubAction : int32_t
// eSetOrClearAlignment aligns content or clears alignment with align
// attribute or text-align.
eSetOrClearAlignment,
// eCreateOrRemoveBlock creates new block or removes existing block and
// move its descendants to where the block was.
eCreateOrRemoveBlock,
- removeList,
+ // eRemoveList removes specific type of list but keep its content.
+ eRemoveList,
+
makeDefListItem,
insertElement,
insertQuotation,
htmlPaste = 3012,
loadHTML,
resetTextProperties,
setAbsolutePosition,
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -86,17 +86,17 @@ IsStyleCachePreservingSubAction(EditSubA
{
return aEditSubAction == EditSubAction::eDeleteSelectedContent ||
aEditSubAction == EditSubAction::eInsertParagraphSeparator ||
aEditSubAction == EditSubAction::eCreateOrChangeList ||
aEditSubAction == EditSubAction::eIndent ||
aEditSubAction == EditSubAction::eOutdent ||
aEditSubAction == EditSubAction::eSetOrClearAlignment ||
aEditSubAction == EditSubAction::eCreateOrRemoveBlock ||
- aEditSubAction == EditSubAction::removeList ||
+ aEditSubAction == EditSubAction::eRemoveList ||
aEditSubAction == EditSubAction::makeDefListItem ||
aEditSubAction == EditSubAction::insertElement ||
aEditSubAction == EditSubAction::insertQuotation;
}
static nsAtom&
ParagraphSeparatorElement(ParagraphSeparator separator)
{
@@ -705,17 +705,17 @@ HTMLEditRules::WillDoAction(Selection* a
case EditSubAction::setAbsolutePosition:
return WillAbsolutePosition(aCancel, aHandled);
case EditSubAction::removeAbsolutePosition:
return WillRemoveAbsolutePosition(aCancel, aHandled);
case EditSubAction::eSetOrClearAlignment:
return WillAlign(*aInfo.alignType, aCancel, aHandled);
case EditSubAction::eCreateOrRemoveBlock:
return WillMakeBasicBlock(*aInfo.blockType, aCancel, aHandled);
- case EditSubAction::removeList: {
+ case EditSubAction::eRemoveList: {
nsresult rv = WillRemoveList(aCancel, aHandled);
if (NS_WARN_IF(rv == NS_ERROR_EDITOR_DESTROYED) ||
NS_WARN_IF(!CanHandleEditAction())) {
return NS_ERROR_EDITOR_DESTROYED;
}
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
--- a/editor/libeditor/HTMLEditor.cpp
+++ b/editor/libeditor/HTMLEditor.cpp
@@ -2112,24 +2112,24 @@ HTMLEditor::RemoveList(const nsAString&
// Protect the edit rules object from dying
RefPtr<TextEditRules> rules(mRules);
bool cancel, handled;
AutoPlaceholderBatch beginBatching(this);
AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
- *this, EditSubAction::removeList,
+ *this, EditSubAction::eRemoveList,
nsIEditor::eNext);
// pre-process
RefPtr<Selection> selection = GetSelection();
NS_ENSURE_TRUE(selection, NS_ERROR_NULL_POINTER);
- EditSubActionInfo subActionInfo(EditSubAction::removeList);
+ EditSubActionInfo subActionInfo(EditSubAction::eRemoveList);
if (aListType.LowerCaseEqualsLiteral("ol")) {
subActionInfo.bOrdered = true;
} else {
subActionInfo.bOrdered = false;
}
nsresult rv =
rules->WillDoAction(selection, subActionInfo, &cancel, &handled);
if (cancel || NS_FAILED(rv)) {
--- a/editor/libeditor/TextEditRules.h
+++ b/editor/libeditor/TextEditRules.h
@@ -543,17 +543,17 @@ public:
// EditSubAction::eComputeTextToOutput
uint32_t flags;
// EditSubAction::eDeleteSelectedContent
nsIEditor::EDirection collapsedAction;
nsIEditor::EStripWrappers stripWrappers;
- // EditSubAction::removeList
+ // EditSubAction::eRemoveList
bool bOrdered;
// EditSubAction::eCreateOrChangeList
bool entireList;
const nsAString* bulletType;
// EditSubAction::eSetOrClearAlignment
const nsAString* alignType;