Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1463985 - part 13: Rename EditSubAction::setText to EditSubAction::eSetText r=m_kato

Browse Source 
MozReview-Commit-ID: A4DF3fX9IV6

--HG--
extra : rebase_source : d89acbacb9f17a599ee5b1c1387fd08f42cac3b6
This commit is contained in:
Masayuki Nakano 2018-05-28 22:20:43 +09:00
parent b539d189c1
commit f24da5be63
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/libeditor/EditAction.h
View File

@ -62,7 +62,8 @@ enum class EditSubAction : int32_t
// or something requested format.
eComputeTextToOutput,
setText,
// eSetText indicates to set editor value to new value.
eSetText,
// HTML editor only actions
insertBreak = 3000,

2
editor/libeditor/EditorBase.cpp
View File

@ -2914,7 +2914,7 @@ EditorBase::SetTextImpl(Selection& aSelection, const nsAString& aString,
const uint32_t length = aCharData.Length();
AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
*this, EditSubAction::setText,
*this, EditSubAction::eSetText,
nsIEditor::eNext);
// Let listeners know what's up

4
editor/libeditor/TextEditRules.cpp
View File

@ -220,7 +220,7 @@ TextEditRules::BeforeEdit(EditSubAction aEditSubAction,
}
mActionNesting++;
if (aEditSubAction == EditSubAction::setText) {
if (aEditSubAction == EditSubAction::eSetText) {
// setText replaces all text, so mCachedSelectionNode might be invalid on
// AfterEdit.
// Since this will be used as start position of spellchecker, we should
@ -336,7 +336,7 @@ TextEditRules::WillDoAction(Selection* aSelection,
return WillInsertText(aInfo.mEditSubAction, aCancel, aHandled,
aInfo.inString, aInfo.outString,
aInfo.maxLength);
case EditSubAction::setText:
case EditSubAction::eSetText:
UndefineCaretBidiLevel();
return WillSetText(aCancel, aHandled, aInfo.inString,
aInfo.maxLength);

4
editor/libeditor/TextEditor.cpp
View File

@ -1105,7 +1105,7 @@ TextEditor::SetText(const nsAString& aString)
// delete placeholder txns merge.
AutoPlaceholderBatch batch(this, nullptr);
AutoTopLevelEditSubActionNotifier maybeTopLevelEditSubAction(
*this, EditSubAction::setText,
*this, EditSubAction::eSetText,
nsIEditor::eNext);
// pre-process
@ -1113,7 +1113,7 @@ TextEditor::SetText(const nsAString& aString)
if (NS_WARN_IF(!selection)) {
return NS_ERROR_NULL_POINTER;
}
EditSubActionInfo subActionInfo(EditSubAction::setText);
EditSubActionInfo subActionInfo(EditSubAction::eSetText);
subActionInfo.inString = &aString;
subActionInfo.maxLength = mMaxTextLength;