Bug 1463985 - part 12: Rename EditSubAction::outputText to EditSubAction::eComputeTextToOutput r?m_kato
MozReview-Commit-ID: ItJi2rKv6Pw
--- a/editor/libeditor/EditAction.h
+++ b/editor/libeditor/EditAction.h
@@ -53,17 +53,20 @@ enum class EditSubAction : int32_t
eDeleteSelectedContent,
// eSetTextProperty indicates to set a style from text.
eSetTextProperty,
// eRemoveTextProperty indicates to remove a style from text.
eRemoveTextProperty,
- outputText,
+ // eComputeTextToOutput indicates to compute the editor value as plain text
+ // or something requested format.
+ eComputeTextToOutput,
+
setText,
// HTML editor only actions
insertBreak = 3000,
makeList,
indent,
outdent,
align,
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -639,17 +639,17 @@ HTMLEditRules::WillDoAction(Selection* a
MOZ_ASSERT(aCancel);
MOZ_ASSERT(aHandled);
*aCancel = false;
*aHandled = false;
// Deal with actions for which we don't need to check whether the selection is
// editable.
- if (aInfo.mEditSubAction == EditSubAction::outputText ||
+ if (aInfo.mEditSubAction == EditSubAction::eComputeTextToOutput ||
aInfo.mEditSubAction == EditSubAction::eUndo ||
aInfo.mEditSubAction == EditSubAction::eRedo) {
return TextEditRules::WillDoAction(aSelection, aInfo, aCancel, aHandled);
}
AutoSafeEditorData setData(*this, *mHTMLEditor, *aSelection);
// Nothing to do if there's no selection to act on
--- a/editor/libeditor/TextEditRules.cpp
+++ b/editor/libeditor/TextEditRules.cpp
@@ -345,17 +345,17 @@ TextEditRules::WillDoAction(Selection* a
case EditSubAction::eUndo:
return WillUndo(aCancel, aHandled);
case EditSubAction::eRedo:
return WillRedo(aCancel, aHandled);
case EditSubAction::eSetTextProperty:
return WillSetTextProperty(aCancel, aHandled);
case EditSubAction::eRemoveTextProperty:
return WillRemoveTextProperty(aCancel, aHandled);
- case EditSubAction::outputText:
+ case EditSubAction::eComputeTextToOutput:
return WillOutputText(aInfo.outputFormat, aInfo.outString, aInfo.flags,
aCancel, aHandled);
case EditSubAction::insertElement:
// i had thought this would be html rules only. but we put pre elements
// into plaintext mail when doing quoting for reply! doh!
return WillInsert(aCancel);
default:
return NS_ERROR_FAILURE;
--- a/editor/libeditor/TextEditRules.h
+++ b/editor/libeditor/TextEditRules.h
@@ -536,17 +536,17 @@ public:
EditSubAction mEditSubAction;
// EditSubAction::eInsertText / EditSubAction::eInsertTextComingFromIME
const nsAString* inString;
nsAString* outString;
const nsAString* outputFormat;
int32_t maxLength;
- // EditSubAction::outputText
+ // EditSubAction::eComputeTextToOutput
uint32_t flags;
// EditSubAction::eDeleteSelectedContent
nsIEditor::EDirection collapsedAction;
nsIEditor::EStripWrappers stripWrappers;
// EditSubAction::removeList
bool bOrdered;
--- a/editor/libeditor/TextEditor.cpp
+++ b/editor/libeditor/TextEditor.cpp
@@ -1753,17 +1753,17 @@ TextEditor::GetAndInitDocEncoder(const n
NS_IMETHODIMP
TextEditor::OutputToString(const nsAString& aFormatType,
uint32_t aFlags,
nsAString& aOutputString)
{
// Protect the edit rules object from dying
RefPtr<TextEditRules> rules(mRules);
- EditSubActionInfo subActionInfo(EditSubAction::outputText);
+ EditSubActionInfo subActionInfo(EditSubAction::eComputeTextToOutput);
subActionInfo.outString = &aOutputString;
subActionInfo.flags = aFlags;
subActionInfo.outputFormat = &aFormatType;
Selection* selection = GetSelection();
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
bool cancel, handled;