Bug 1463985 - part 19: Rename EditSubAction::removeList to EditSubAction::eRemoveList r=m_kato

MozReview-Commit-ID: DgsZwANcEdF

--HG--
extra : rebase_source : e0032e957ccc4448e210783a67ef83c1257c0a3b
This commit is contained in:
Masayuki Nakano 2018-05-28 23:05:00 +09:00
Родитель 7d6ea95d32
Коммит 220ec91e25
4 изменённых файлов: 8 добавлений и 6 удалений

Просмотреть файл

@ -86,7 +86,9 @@ enum class EditSubAction : int32_t
// move its descendants to where the block was.
eCreateOrRemoveBlock,
removeList,
// eRemoveList removes specific type of list but keep its content.
eRemoveList,
makeDefListItem,
insertElement,
insertQuotation,

Просмотреть файл

@ -91,7 +91,7 @@ IsStyleCachePreservingSubAction(EditSubAction aEditSubAction)
aEditSubAction == EditSubAction::eOutdent ||
aEditSubAction == EditSubAction::eSetOrClearAlignment ||
aEditSubAction == EditSubAction::eCreateOrRemoveBlock ||
aEditSubAction == EditSubAction::removeList ||
aEditSubAction == EditSubAction::eRemoveList ||
aEditSubAction == EditSubAction::makeDefListItem ||
aEditSubAction == EditSubAction::insertElement ||
aEditSubAction == EditSubAction::insertQuotation;
@ -710,7 +710,7 @@ HTMLEditRules::WillDoAction(Selection* aSelection,
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())) {

Просмотреть файл

@ -2117,14 +2117,14 @@ HTMLEditor::RemoveList(const nsAString& aListType)
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 {

Просмотреть файл

@ -548,7 +548,7 @@ public:
nsIEditor::EDirection collapsedAction;
nsIEditor::EStripWrappers stripWrappers;
// EditSubAction::removeList
// EditSubAction::eRemoveList
bool bOrdered;
// EditSubAction::eCreateOrChangeList