mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1546839 - part 4: Make all editor command classes use Command instead of command name r=smaug 

`strcmp` may be slow due to checking null character.  Therefore, internal
methods of them should use command as far as possible.  This patch makes
them take/use `Command` instead of `const char*`.

Differential Revision: https://phabricator.services.mozilla.com/D29174

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Masayuki Nakano 2019-04-30 04:24:49 +00:00
Родитель a658371e04
Коммит 6da5cf38da
4 изменённых файлов: 655 добавлений и 647 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

341
editor/libeditor/EditorCommands.cpp
Просмотреть файл

@ -41,7 +41,8 @@ EditorCommand::IsCommandEnabled(const char* aCommandName,
nsCOMPtr<nsIEditor> editor = do_QueryInterface(aCommandRefCon);
TextEditor* textEditor = editor ? editor->AsTextEditor() : nullptr;
*aIsEnabled = IsCommandEnabled(aCommandName, MOZ_KnownLive(textEditor));
*aIsEnabled = IsCommandEnabled(GetInternalCommand(aCommandName),
MOZ_KnownLive(textEditor));
return NS_OK;
}
@ -55,7 +56,8 @@ EditorCommand::DoCommand(const char* aCommandName,
if (NS_WARN_IF(!editor)) {
return NS_ERROR_INVALID_ARG;
}
nsresult rv = DoCommand(aCommandName, MOZ_KnownLive(*editor->AsTextEditor()));
nsresult rv = DoCommand(GetInternalCommand(aCommandName),
MOZ_KnownLive(*editor->AsTextEditor()));
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"Failed to do command from nsIControllerCommand::DoCommand()");
@ -73,8 +75,16 @@ EditorCommand::DoCommandParams(const char* aCommandName,
if (NS_WARN_IF(!editor)) {
return NS_ERROR_INVALID_ARG;
}
nsresult rv =
DoCommandParams(aCommandName, MOZ_KnownLive(aParams->AsCommandParams()),
Command command;
nsCommandParams* params = aParams->AsCommandParams();
if (params) {
nsAutoString value;
params->GetString(aCommandName, value);
command = GetInternalCommand(aCommandName, value);
} else {
command = GetInternalCommand(aCommandName);
}
nsresult rv = DoCommandParams(command, MOZ_KnownLive(params),
MOZ_KnownLive(*editor->AsTextEditor()));
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
@ -91,18 +101,19 @@ EditorCommand::GetCommandStateParams(const char* aCommandName,
}
nsCOMPtr<nsIEditor> editor = do_QueryInterface(aCommandRefCon);
if (editor) {
return GetCommandStateParams(
aCommandName, MOZ_KnownLive(*aParams->AsCommandParams()),
MOZ_KnownLive(editor->AsTextEditor()), nullptr);
return GetCommandStateParams(GetInternalCommand(aCommandName),
MOZ_KnownLive(*aParams->AsCommandParams()),
MOZ_KnownLive(editor->AsTextEditor()),
nullptr);
}
nsCOMPtr<nsIEditingSession> editingSession =
do_QueryInterface(aCommandRefCon);
if (editingSession) {
return GetCommandStateParams(aCommandName,
return GetCommandStateParams(GetInternalCommand(aCommandName),
MOZ_KnownLive(*aParams->AsCommandParams()),
nullptr, editingSession);
}
return GetCommandStateParams(aCommandName,
return GetCommandStateParams(GetInternalCommand(aCommandName),
MOZ_KnownLive(*aParams->AsCommandParams()),
nullptr, nullptr);
}
@ -113,7 +124,7 @@ EditorCommand::GetCommandStateParams(const char* aCommandName,
StaticRefPtr<UndoCommand> UndoCommand::sInstance;
bool UndoCommand::IsCommandEnabled(const char* aCommandName,
bool UndoCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -121,22 +132,22 @@ bool UndoCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable() && aTextEditor->CanUndo();
}
nsresult UndoCommand::DoCommand(const char* aCommandName,
nsresult UndoCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.Undo(1);
}
nsresult UndoCommand::DoCommandParams(const char* aCommandName,
nsresult UndoCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult UndoCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -145,7 +156,7 @@ nsresult UndoCommand::GetCommandStateParams(
StaticRefPtr<RedoCommand> RedoCommand::sInstance;
bool RedoCommand::IsCommandEnabled(const char* aCommandName,
bool RedoCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -153,22 +164,22 @@ bool RedoCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable() && aTextEditor->CanRedo();
}
nsresult RedoCommand::DoCommand(const char* aCommandName,
nsresult RedoCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.Redo(1);
}
nsresult RedoCommand::DoCommandParams(const char* aCommandName,
nsresult RedoCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult RedoCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -177,7 +188,7 @@ nsresult RedoCommand::GetCommandStateParams(
StaticRefPtr<CutCommand> CutCommand::sInstance;
bool CutCommand::IsCommandEnabled(const char* aCommandName,
bool CutCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -185,22 +196,21 @@ bool CutCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable() && aTextEditor->CanCut();
}
nsresult CutCommand::DoCommand(const char* aCommandName,
nsresult CutCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.Cut();
}
nsresult CutCommand::DoCommandParams(const char* aCommandName,
nsCommandParams* aParams,
nsresult CutCommand::DoCommandParams(Command aCommand, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult CutCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -209,7 +219,7 @@ nsresult CutCommand::GetCommandStateParams(
StaticRefPtr<CutOrDeleteCommand> CutOrDeleteCommand::sInstance;
bool CutOrDeleteCommand::IsCommandEnabled(const char* aCommandName,
bool CutOrDeleteCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -217,7 +227,7 @@ bool CutOrDeleteCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult CutOrDeleteCommand::DoCommand(const char* aCommandName,
nsresult CutOrDeleteCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
dom::Selection* selection = aTextEditor.GetSelection();
if (selection && selection->IsCollapsed()) {
@ -231,17 +241,17 @@ nsresult CutOrDeleteCommand::DoCommand(const char* aCommandName,
return aTextEditor.Cut();
}
nsresult CutOrDeleteCommand::DoCommandParams(const char* aCommandName,
nsresult CutOrDeleteCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult CutOrDeleteCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -250,7 +260,7 @@ nsresult CutOrDeleteCommand::GetCommandStateParams(
StaticRefPtr<CopyCommand> CopyCommand::sInstance;
bool CopyCommand::IsCommandEnabled(const char* aCommandName,
bool CopyCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -258,22 +268,22 @@ bool CopyCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->CanCopy();
}
nsresult CopyCommand::DoCommand(const char* aCommandName,
nsresult CopyCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.Copy();
}
nsresult CopyCommand::DoCommandParams(const char* aCommandName,
nsresult CopyCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult CopyCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -282,7 +292,7 @@ nsresult CopyCommand::GetCommandStateParams(
StaticRefPtr<CopyOrDeleteCommand> CopyOrDeleteCommand::sInstance;
bool CopyOrDeleteCommand::IsCommandEnabled(const char* aCommandName,
bool CopyOrDeleteCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -290,7 +300,7 @@ bool CopyOrDeleteCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult CopyOrDeleteCommand::DoCommand(const char* aCommandName,
nsresult CopyOrDeleteCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
dom::Selection* selection = aTextEditor.GetSelection();
if (selection && selection->IsCollapsed()) {
@ -304,17 +314,17 @@ nsresult CopyOrDeleteCommand::DoCommand(const char* aCommandName,
return aTextEditor.Copy();
}
nsresult CopyOrDeleteCommand::DoCommandParams(const char* aCommandName,
nsresult CopyOrDeleteCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult CopyOrDeleteCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -323,7 +333,7 @@ nsresult CopyOrDeleteCommand::GetCommandStateParams(
StaticRefPtr<PasteCommand> PasteCommand::sInstance;
bool PasteCommand::IsCommandEnabled(const char* aCommandName,
bool PasteCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -332,22 +342,22 @@ bool PasteCommand::IsCommandEnabled(const char* aCommandName,
aTextEditor->CanPaste(nsIClipboard::kGlobalClipboard);
}
nsresult PasteCommand::DoCommand(const char* aCommandName,
nsresult PasteCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.PasteAsAction(nsIClipboard::kGlobalClipboard, true);
}
nsresult PasteCommand::DoCommandParams(const char* aCommandName,
nsresult PasteCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult PasteCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -356,7 +366,7 @@ nsresult PasteCommand::GetCommandStateParams(
StaticRefPtr<PasteTransferableCommand> PasteTransferableCommand::sInstance;
bool PasteTransferableCommand::IsCommandEnabled(const char* aCommandName,
bool PasteTransferableCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -365,14 +375,13 @@ bool PasteTransferableCommand::IsCommandEnabled(const char* aCommandName,
aTextEditor->CanPasteTransferable(nullptr);
}
nsresult PasteTransferableCommand::DoCommand(const char* aCommandName,
nsresult PasteTransferableCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return NS_ERROR_FAILURE;
}
nsresult PasteTransferableCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
if (NS_WARN_IF(!aParams)) {
return NS_ERROR_INVALID_ARG;
}
@ -397,7 +406,7 @@ nsresult PasteTransferableCommand::DoCommandParams(
}
nsresult PasteTransferableCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
if (NS_WARN_IF(!aTextEditor)) {
return NS_ERROR_INVALID_ARG;
@ -425,29 +434,28 @@ nsresult PasteTransferableCommand::GetCommandStateParams(
StaticRefPtr<SwitchTextDirectionCommand> SwitchTextDirectionCommand::sInstance;
bool SwitchTextDirectionCommand::IsCommandEnabled(
const char* aCommandName, TextEditor* aTextEditor) const {
Command aCommand, TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
}
return aTextEditor->IsSelectionEditable();
}
nsresult SwitchTextDirectionCommand::DoCommand(const char* aCommandName,
nsresult SwitchTextDirectionCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.ToggleTextDirection();
}
nsresult SwitchTextDirectionCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult SwitchTextDirectionCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -456,7 +464,7 @@ nsresult SwitchTextDirectionCommand::GetCommandStateParams(
StaticRefPtr<DeleteCommand> DeleteCommand::sInstance;
bool DeleteCommand::IsCommandEnabled(const char* aCommandName,
bool DeleteCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -466,33 +474,41 @@ bool DeleteCommand::IsCommandEnabled(const char* aCommandName,
// directionless, which is the same condition under which we can't cut.
bool isEnabled = aTextEditor->IsSelectionEditable();
if (!nsCRT::strcmp("cmd_delete", aCommandName) && isEnabled) {
if (aCommand == Command::Delete && isEnabled) {
return aTextEditor->CanDelete();
}
return isEnabled;
}
nsresult DeleteCommand::DoCommand(const char* aCommandName,
nsresult DeleteCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
nsIEditor::EDirection deleteDir = nsIEditor::eNone;
if (!strcmp("cmd_delete", aCommandName)) {
// Really this should probably be eNone, but it only makes a difference if
// the selection is collapsed, and then this command is disabled. So let's
// keep it as it always was to avoid breaking things.
switch (aCommand) {
case Command::Delete:
// Really this should probably be eNone, but it only makes a difference
// if the selection is collapsed, and then this command is disabled. So
// let's keep it as it always was to avoid breaking things.
deleteDir = nsIEditor::ePrevious;
} else if (!strcmp("cmd_deleteCharForward", aCommandName)) {
break;
case Command::DeleteCharForward:
deleteDir = nsIEditor::eNext;
} else if (!strcmp("cmd_deleteCharBackward", aCommandName)) {
break;
case Command::DeleteCharBackward:
deleteDir = nsIEditor::ePrevious;
} else if (!strcmp("cmd_deleteWordBackward", aCommandName)) {
break;
case Command::DeleteWordBackward:
deleteDir = nsIEditor::ePreviousWord;
} else if (!strcmp("cmd_deleteWordForward", aCommandName)) {
break;
case Command::DeleteWordForward:
deleteDir = nsIEditor::eNextWord;
} else if (!strcmp("cmd_deleteToBeginningOfLine", aCommandName)) {
break;
case Command::DeleteToBeginningOfLine:
deleteDir = nsIEditor::eToBeginningOfLine;
} else if (!strcmp("cmd_deleteToEndOfLine", aCommandName)) {
break;
case Command::DeleteToEndOfLine:
deleteDir = nsIEditor::eToEndOfLine;
} else {
break;
default:
MOZ_CRASH("Unrecognized nsDeleteCommand");
}
nsresult rv =
@ -503,17 +519,17 @@ nsresult DeleteCommand::DoCommand(const char* aCommandName,
return NS_OK;
}
nsresult DeleteCommand::DoCommandParams(const char* aCommandName,
nsresult DeleteCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult DeleteCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -522,7 +538,7 @@ nsresult DeleteCommand::GetCommandStateParams(
StaticRefPtr<SelectAllCommand> SelectAllCommand::sInstance;
bool SelectAllCommand::IsCommandEnabled(const char* aCommandName,
bool SelectAllCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
// You can always select all, unless the selection is editable,
// and the editable region is empty!
@ -538,22 +554,22 @@ bool SelectAllCommand::IsCommandEnabled(const char* aCommandName,
return !isEmpty;
}
nsresult SelectAllCommand::DoCommand(const char* aCommandName,
nsresult SelectAllCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return aTextEditor.SelectAll();
}
nsresult SelectAllCommand::DoCommandParams(const char* aCommandName,
nsresult SelectAllCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult SelectAllCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -562,7 +578,7 @@ nsresult SelectAllCommand::GetCommandStateParams(
StaticRefPtr<SelectionMoveCommands> SelectionMoveCommands::sInstance;
bool SelectionMoveCommands::IsCommandEnabled(const char* aCommandName,
bool SelectionMoveCommands::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -571,53 +587,58 @@ bool SelectionMoveCommands::IsCommandEnabled(const char* aCommandName,
}
static const struct ScrollCommand {
const char* reverseScroll;
const char* forwardScroll;
Command mReverseScroll;
Command mForwardScroll;
nsresult (NS_STDCALL nsISelectionController::*scroll)(bool);
} scrollCommands[] = {{"cmd_scrollTop", "cmd_scrollBottom",
} scrollCommands[] = {{Command::ScrollTop, Command::ScrollBottom,
&nsISelectionController::CompleteScroll},
{"cmd_scrollPageUp", "cmd_scrollPageDown",
{Command::ScrollPageUp, Command::ScrollPageDown,
&nsISelectionController::ScrollPage},
{"cmd_scrollLineUp", "cmd_scrollLineDown",
{Command::ScrollLineUp, Command::ScrollLineDown,
&nsISelectionController::ScrollLine}};
static const struct MoveCommand {
const char* reverseMove;
const char* forwardMove;
const char* reverseSelect;
const char* forwardSelect;
Command mReverseMove;
Command mForwardMove;
Command mReverseSelect;
Command mForwardSelect;
nsresult (NS_STDCALL nsISelectionController::*move)(bool, bool);
} moveCommands[] = {
{"cmd_charPrevious", "cmd_charNext", "cmd_selectCharPrevious",
"cmd_selectCharNext", &nsISelectionController::CharacterMove},
{"cmd_linePrevious", "cmd_lineNext", "cmd_selectLinePrevious",
"cmd_selectLineNext", &nsISelectionController::LineMove},
{"cmd_wordPrevious", "cmd_wordNext", "cmd_selectWordPrevious",
"cmd_selectWordNext", &nsISelectionController::WordMove},
{"cmd_beginLine", "cmd_endLine", "cmd_selectBeginLine", "cmd_selectEndLine",
&nsISelectionController::IntraLineMove},
{"cmd_movePageUp", "cmd_movePageDown", "cmd_selectPageUp",
"cmd_selectPageDown", &nsISelectionController::PageMove},
{"cmd_moveTop", "cmd_moveBottom", "cmd_selectTop", "cmd_selectBottom",
&nsISelectionController::CompleteMove}};
{Command::CharPrevious, Command::CharNext, Command::SelectCharPrevious,
Command::SelectCharNext, &nsISelectionController::CharacterMove},
{Command::LinePrevious, Command::LineNext, Command::SelectLinePrevious,
Command::SelectLineNext, &nsISelectionController::LineMove},
{Command::WordPrevious, Command::WordNext, Command::SelectWordPrevious,
Command::SelectWordNext, &nsISelectionController::WordMove},
{Command::BeginLine, Command::EndLine, Command::SelectBeginLine,
Command::SelectEndLine, &nsISelectionController::IntraLineMove},
{Command::MovePageUp, Command::MovePageDown, Command::SelectPageUp,
Command::SelectPageDown, &nsISelectionController::PageMove},
{Command::MoveTop, Command::MoveBottom, Command::SelectTop,
Command::SelectBottom, &nsISelectionController::CompleteMove}};
static const struct PhysicalCommand {
const char* move;
const char* select;
Command mMove;
Command mSelect;
int16_t direction;
int16_t amount;
} physicalCommands[] = {
{"cmd_moveLeft", "cmd_selectLeft", nsISelectionController::MOVE_LEFT, 0},
{"cmd_moveRight", "cmd_selectRight", nsISelectionController::MOVE_RIGHT, 0},
{"cmd_moveUp", "cmd_selectUp", nsISelectionController::MOVE_UP, 0},
{"cmd_moveDown", "cmd_selectDown", nsISelectionController::MOVE_DOWN, 0},
{"cmd_moveLeft2", "cmd_selectLeft2", nsISelectionController::MOVE_LEFT, 1},
{"cmd_moveRight2", "cmd_selectRight2", nsISelectionController::MOVE_RIGHT,
1},
{"cmd_moveUp2", "cmd_selectUp2", nsISelectionController::MOVE_UP, 1},
{"cmd_moveDown2", "cmd_selectDown2", nsISelectionController::MOVE_DOWN, 1}};
{Command::MoveLeft, Command::SelectLeft, nsISelectionController::MOVE_LEFT,
0},
{Command::MoveRight, Command::SelectRight,
nsISelectionController::MOVE_RIGHT, 0},
{Command::MoveUp, Command::SelectUp, nsISelectionController::MOVE_UP, 0},
{Command::MoveDown, Command::SelectDown, nsISelectionController::MOVE_DOWN,
0},
{Command::MoveLeft2, Command::SelectLeft2,
nsISelectionController::MOVE_LEFT, 1},
{Command::MoveRight2, Command::SelectRight2,
nsISelectionController::MOVE_RIGHT, 1},
{Command::MoveUp2, Command::SelectUp2, nsISelectionController::MOVE_UP, 1},
{Command::MoveDown2, Command::SelectDown2,
nsISelectionController::MOVE_DOWN, 1}};
nsresult SelectionMoveCommands::DoCommand(const char* aCommandName,
nsresult SelectionMoveCommands::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
RefPtr<Document> document = aTextEditor.GetDocument();
if (document) {
@ -635,9 +656,10 @@ nsresult SelectionMoveCommands::DoCommand(const char* aCommandName,
// scroll commands
for (size_t i = 0; i < ArrayLength(scrollCommands); i++) {
const ScrollCommand& cmd = scrollCommands[i];
if (!strcmp(aCommandName, cmd.reverseScroll)) {
if (aCommand == cmd.mReverseScroll) {
return (selectionController->*(cmd.scroll))(false);
} else if (!strcmp(aCommandName, cmd.forwardScroll)) {
}
if (aCommand == cmd.mForwardScroll) {
return (selectionController->*(cmd.scroll))(true);
}
}
@ -645,13 +667,16 @@ nsresult SelectionMoveCommands::DoCommand(const char* aCommandName,
// caret movement/selection commands
for (size_t i = 0; i < ArrayLength(moveCommands); i++) {
const MoveCommand& cmd = moveCommands[i];
if (!strcmp(aCommandName, cmd.reverseMove)) {
if (aCommand == cmd.mReverseMove) {
return (selectionController->*(cmd.move))(false, false);
} else if (!strcmp(aCommandName, cmd.forwardMove)) {
}
if (aCommand == cmd.mForwardMove) {
return (selectionController->*(cmd.move))(true, false);
} else if (!strcmp(aCommandName, cmd.reverseSelect)) {
}
if (aCommand == cmd.mReverseSelect) {
return (selectionController->*(cmd.move))(false, true);
} else if (!strcmp(aCommandName, cmd.forwardSelect)) {
}
if (aCommand == cmd.mForwardSelect) {
return (selectionController->*(cmd.move))(true, true);
}
}
@ -659,10 +684,11 @@ nsresult SelectionMoveCommands::DoCommand(const char* aCommandName,
// physical-direction movement/selection
for (size_t i = 0; i < ArrayLength(physicalCommands); i++) {
const PhysicalCommand& cmd = physicalCommands[i];
if (!strcmp(aCommandName, cmd.move)) {
if (aCommand == cmd.mMove) {
return selectionController->PhysicalMove(cmd.direction, cmd.amount,
false);
} else if (!strcmp(aCommandName, cmd.select)) {
}
if (aCommand == cmd.mSelect) {
return selectionController->PhysicalMove(cmd.direction, cmd.amount, true);
}
}
@ -670,17 +696,17 @@ nsresult SelectionMoveCommands::DoCommand(const char* aCommandName,
return NS_ERROR_FAILURE;
}
nsresult SelectionMoveCommands::DoCommandParams(const char* aCommandName,
nsresult SelectionMoveCommands::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult SelectionMoveCommands::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -689,7 +715,7 @@ nsresult SelectionMoveCommands::GetCommandStateParams(
StaticRefPtr<InsertPlaintextCommand> InsertPlaintextCommand::sInstance;
bool InsertPlaintextCommand::IsCommandEnabled(const char* aCommandName,
bool InsertPlaintextCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -697,7 +723,7 @@ bool InsertPlaintextCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult InsertPlaintextCommand::DoCommand(const char* aCommandName,
nsresult InsertPlaintextCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
// XXX InsertTextAsAction() is not same as OnInputText(). However, other
// commands to insert line break or paragraph separator use OnInput*().
@ -711,8 +737,7 @@ nsresult InsertPlaintextCommand::DoCommand(const char* aCommandName,
}
nsresult InsertPlaintextCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
if (NS_WARN_IF(!aParams)) {
return NS_ERROR_INVALID_ARG;
}
@ -736,10 +761,10 @@ nsresult InsertPlaintextCommand::DoCommandParams(
}
nsresult InsertPlaintextCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -748,7 +773,7 @@ nsresult InsertPlaintextCommand::GetCommandStateParams(
StaticRefPtr<InsertParagraphCommand> InsertParagraphCommand::sInstance;
bool InsertParagraphCommand::IsCommandEnabled(const char* aCommandName,
bool InsertParagraphCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -756,7 +781,7 @@ bool InsertParagraphCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult InsertParagraphCommand::DoCommand(const char* aCommandName,
nsresult InsertParagraphCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -766,16 +791,15 @@ nsresult InsertParagraphCommand::DoCommand(const char* aCommandName,
}
nsresult InsertParagraphCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult InsertParagraphCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -784,7 +808,7 @@ nsresult InsertParagraphCommand::GetCommandStateParams(
StaticRefPtr<InsertLineBreakCommand> InsertLineBreakCommand::sInstance;
bool InsertLineBreakCommand::IsCommandEnabled(const char* aCommandName,
bool InsertLineBreakCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -792,7 +816,7 @@ bool InsertLineBreakCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult InsertLineBreakCommand::DoCommand(const char* aCommandName,
nsresult InsertLineBreakCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -802,16 +826,15 @@ nsresult InsertLineBreakCommand::DoCommand(const char* aCommandName,
}
nsresult InsertLineBreakCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult InsertLineBreakCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/******************************************************************************
@ -820,7 +843,7 @@ nsresult InsertLineBreakCommand::GetCommandStateParams(
StaticRefPtr<PasteQuotationCommand> PasteQuotationCommand::sInstance;
bool PasteQuotationCommand::IsCommandEnabled(const char* aCommandName,
bool PasteQuotationCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -829,7 +852,7 @@ bool PasteQuotationCommand::IsCommandEnabled(const char* aCommandName,
aTextEditor->CanPaste(nsIClipboard::kGlobalClipboard);
}
nsresult PasteQuotationCommand::DoCommand(const char* aCommandName,
nsresult PasteQuotationCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
nsresult rv = aTextEditor.PasteAsQuotationAsAction(
nsIClipboard::kGlobalClipboard, true);
@ -839,14 +862,14 @@ nsresult PasteQuotationCommand::DoCommand(const char* aCommandName,
return NS_OK;
}
nsresult PasteQuotationCommand::DoCommandParams(const char* aCommandName,
nsresult PasteQuotationCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult PasteQuotationCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
if (!aTextEditor) {
return NS_OK;

135
editor/libeditor/EditorCommands.h
Просмотреть файл

@ -51,14 +51,13 @@ class EditorCommand : public nsIControllerCommand {
nsISupports* aCommandRefCon) final;
MOZ_CAN_RUN_SCRIPT
virtual bool IsCommandEnabled(const char* aCommandName,
virtual bool IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const = 0;
MOZ_CAN_RUN_SCRIPT
virtual nsresult DoCommand(const char* aCommandName,
virtual nsresult DoCommand(Command aCommand,
TextEditor& aTextEditor) const = 0;
MOZ_CAN_RUN_SCRIPT
virtual nsresult DoCommandParams(const char* aCommandName,
nsCommandParams* aParams,
virtual nsresult DoCommandParams(Command aCommand, nsCommandParams* aParams,
TextEditor& aTextEditor) const = 0;
/**
* @param aTextEditor If the context is an editor, should be set to
@ -70,8 +69,8 @@ class EditorCommand : public nsIControllerCommand {
*/
MOZ_CAN_RUN_SCRIPT
virtual nsresult GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams,
TextEditor* aTextEditor, nsIEditingSession* aEditingSession) const = 0;
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const = 0;
protected:
EditorCommand() = default;
@ -81,23 +80,21 @@ class EditorCommand : public nsIControllerCommand {
#define NS_DECL_EDITOR_COMMAND_METHODS(_cmd) \
public: \
MOZ_CAN_RUN_SCRIPT \
virtual bool IsCommandEnabled(const char* aCommandName, \
TextEditor* aTextEditor) const final; \
virtual bool IsCommandEnabled(Command aCommand, TextEditor* aTextEditor) \
const final; \
using EditorCommand::IsCommandEnabled; \
MOZ_CAN_RUN_SCRIPT \
virtual nsresult DoCommand(const char* aCommandName, \
TextEditor& aTextEditor) const final; \
virtual nsresult DoCommand(Command aCommand, TextEditor& aTextEditor) \
const final; \
using EditorCommand::DoCommand; \
MOZ_CAN_RUN_SCRIPT \
virtual nsresult DoCommandParams(const char* aCommandName, \
nsCommandParams* aParams, \
virtual nsresult DoCommandParams(Command aCommand, nsCommandParams* aParams, \
TextEditor& aTextEditor) const final; \
using EditorCommand::DoCommandParams; \
MOZ_CAN_RUN_SCRIPT \
virtual nsresult GetCommandStateParams( \
const char* aCommandName, nsCommandParams& aParams, \
TextEditor* aTextEditor, nsIEditingSession* aEditingSession) \
const final; \
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor, \
nsIEditingSession* aEditingSession) const final; \
using EditorCommand::GetCommandStateParams;
#define NS_INLINE_DECL_EDITOR_COMMAND_MAKE_SINGLETON(_cmd) \
@ -160,7 +157,7 @@ class StateUpdatingCommandBase : public EditorCommand {
protected:
StateUpdatingCommandBase() = default;
virtual ~StateUpdatingCommandBase() { sTagNameTable.Clear(); }
virtual ~StateUpdatingCommandBase() = default;
// get the current state (on or off) for this style or block format
MOZ_CAN_RUN_SCRIPT
@ -172,41 +169,57 @@ class StateUpdatingCommandBase : public EditorCommand {
virtual nsresult ToggleState(nsAtom* aTagName,
HTMLEditor* aHTMLEditor) const = 0;
static already_AddRefed<nsAtom> TagName(const char* aCommandName) {
MOZ_DIAGNOSTIC_ASSERT(aCommandName);
if (NS_WARN_IF(!aCommandName)) {
static nsAtom* GetTagName(Command aCommand) {
switch (aCommand) {
case Command::FormatBold:
return nsGkAtoms::b;
case Command::FormatItalic:
return nsGkAtoms::i;
case Command::FormatUnderline:
return nsGkAtoms::u;
case Command::FormatTeletypeText:
return nsGkAtoms::tt;
case Command::FormatStrikeThrough:
return nsGkAtoms::strike;
case Command::FormatSuperscript:
return nsGkAtoms::sup;
case Command::FormatSubscript:
return nsGkAtoms::sub;
case Command::FormatNoBreak:
return nsGkAtoms::nobr;
case Command::FormatEmphasis:
return nsGkAtoms::em;
case Command::FormatStrong:
return nsGkAtoms::strong;
case Command::FormatCitation:
return nsGkAtoms::cite;
case Command::FormatAbbreviation:
return nsGkAtoms::abbr;
case Command::FormatAcronym:
return nsGkAtoms::acronym;
case Command::FormatCode:
return nsGkAtoms::code;
case Command::FormatSample:
return nsGkAtoms::samp;
case Command::FormatVariable:
return nsGkAtoms::var;
case Command::FormatRemoveLink:
return nsGkAtoms::href;
case Command::InsertOrderedList:
return nsGkAtoms::ol;
case Command::InsertUnorderedList:
return nsGkAtoms::ul;
case Command::InsertDefinitionTerm:
return nsGkAtoms::dt;
case Command::InsertDefinitionDetails:
return nsGkAtoms::dd;
case Command::FormatAbsolutePosition:
return nsGkAtoms::_empty;
default:
return nullptr;
}
if (!sTagNameTable.Count()) {
sTagNameTable.Put("cmd_bold", nsGkAtoms::b);
sTagNameTable.Put("cmd_italic", nsGkAtoms::i);
sTagNameTable.Put("cmd_underline", nsGkAtoms::u);
sTagNameTable.Put("cmd_tt", nsGkAtoms::tt);
sTagNameTable.Put("cmd_strikethrough", nsGkAtoms::strike);
sTagNameTable.Put("cmd_superscript", nsGkAtoms::sup);
sTagNameTable.Put("cmd_subscript", nsGkAtoms::sub);
sTagNameTable.Put("cmd_nobreak", nsGkAtoms::nobr);
sTagNameTable.Put("cmd_em", nsGkAtoms::em);
sTagNameTable.Put("cmd_strong", nsGkAtoms::strong);
sTagNameTable.Put("cmd_cite", nsGkAtoms::cite);
sTagNameTable.Put("cmd_abbr", nsGkAtoms::abbr);
sTagNameTable.Put("cmd_acronym", nsGkAtoms::acronym);
sTagNameTable.Put("cmd_code", nsGkAtoms::code);
sTagNameTable.Put("cmd_samp", nsGkAtoms::samp);
sTagNameTable.Put("cmd_var", nsGkAtoms::var);
sTagNameTable.Put("cmd_removeLinks", nsGkAtoms::href);
sTagNameTable.Put("cmd_ol", nsGkAtoms::ol);
sTagNameTable.Put("cmd_ul", nsGkAtoms::ul);
sTagNameTable.Put("cmd_dt", nsGkAtoms::dt);
sTagNameTable.Put("cmd_dd", nsGkAtoms::dd);
sTagNameTable.Put("cmd_absPos", nsGkAtoms::_empty);
}
RefPtr<nsAtom> tagName = sTagNameTable.Get(aCommandName);
MOZ_DIAGNOSTIC_ASSERT(tagName);
return tagName.forget();
}
static nsRefPtrHashtable<nsCharPtrHashKey, nsAtom> sTagNameTable;
friend class InsertTagCommand; // for allowing it to access GetTagName()
};
// Shared class for the various style updating commands like bold, italics etc.
@ -238,24 +251,20 @@ class InsertTagCommand final : public EditorCommand {
protected:
InsertTagCommand() = default;
virtual ~InsertTagCommand() { sTagNameTable.Clear(); }
virtual ~InsertTagCommand() = default;
static already_AddRefed<nsAtom> TagName(const char* aCommandName) {
MOZ_DIAGNOSTIC_ASSERT(aCommandName);
if (NS_WARN_IF(!aCommandName)) {
return nullptr;
static nsAtom* GetTagName(Command aCommand) {
switch (aCommand) {
case Command::InsertLink:
return nsGkAtoms::a;
case Command::InsertImage:
return nsGkAtoms::img;
case Command::InsertHorizontalRule:
return nsGkAtoms::hr;
default:
return StateUpdatingCommandBase::GetTagName(aCommand);
}
if (!sTagNameTable.Count()) {
sTagNameTable.Put("cmd_insertLinkNoUI", nsGkAtoms::a);
sTagNameTable.Put("cmd_insertImageNoUI", nsGkAtoms::img);
sTagNameTable.Put("cmd_insertHR", nsGkAtoms::hr);
}
RefPtr<nsAtom> tagName = sTagNameTable.Get(aCommandName);
MOZ_DIAGNOSTIC_ASSERT(tagName);
return tagName.forget();
}
static nsRefPtrHashtable<nsCharPtrHashKey, nsAtom> sTagNameTable;
};
class ListCommand final : public StateUpdatingCommandBase {

181
editor/libeditor/HTMLEditorCommands.cpp
Просмотреть файл

@ -11,10 +11,10 @@
#include "mozilla/HTMLEditor.h" // for HTMLEditor
#include "mozilla/dom/Element.h"
#include "nsAString.h"
#include "nsAtom.h" // for nsAtom, nsStaticAtom, etc
#include "nsCommandParams.h" // for nsCommandParams, etc
#include "nsComponentManagerUtils.h" // for do_CreateInstance
#include "nsGkAtoms.h" // for nsGkAtoms, nsGkAtoms::font, etc
#include "nsAtom.h" // for nsAtom, etc
#include "nsIClipboard.h" // for nsIClipboard, etc
#include "nsIEditingSession.h"
#include "nsLiteralString.h" // for NS_LITERAL_STRING
@ -46,10 +46,7 @@ static nsresult GetListState(HTMLEditor* aHTMLEditor, bool* aMixed,
* mozilla::StateUpdatingCommandBase
*****************************************************************************/
nsRefPtrHashtable<nsCharPtrHashKey, nsAtom>
StateUpdatingCommandBase::sTagNameTable;
bool StateUpdatingCommandBase::IsCommandEnabled(const char* aCommandName,
bool StateUpdatingCommandBase::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -57,34 +54,33 @@ bool StateUpdatingCommandBase::IsCommandEnabled(const char* aCommandName,
if (!aTextEditor->IsSelectionEditable()) {
return false;
}
if (!strcmp(aCommandName, "cmd_absPos")) {
if (aCommand == Command::FormatAbsolutePosition) {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
return htmlEditor && htmlEditor->IsAbsolutePositionEditorEnabled();
}
return true;
}
nsresult StateUpdatingCommandBase::DoCommand(const char* aCommandName,
nsresult StateUpdatingCommandBase::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_FAILURE;
}
RefPtr<nsAtom> tagName = TagName(aCommandName);
nsAtom* tagName = GetTagName(aCommand);
if (NS_WARN_IF(!tagName)) {
return NS_ERROR_UNEXPECTED;
}
return ToggleState(tagName, MOZ_KnownLive(htmlEditor));
return ToggleState(MOZ_KnownLive(tagName), MOZ_KnownLive(htmlEditor));
}
nsresult StateUpdatingCommandBase::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult StateUpdatingCommandBase::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
if (!aTextEditor) {
return NS_OK;
@ -93,11 +89,12 @@ nsresult StateUpdatingCommandBase::GetCommandStateParams(
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_FAILURE;
}
RefPtr<nsAtom> tagName = TagName(aCommandName);
nsAtom* tagName = GetTagName(aCommand);
if (NS_WARN_IF(!tagName)) {
return NS_ERROR_UNEXPECTED;
}
return GetCurrentState(tagName, MOZ_KnownLive(htmlEditor), aParams);
return GetCurrentState(MOZ_KnownLive(tagName), MOZ_KnownLive(htmlEditor),
aParams);
}
/*****************************************************************************
@ -106,7 +103,7 @@ nsresult StateUpdatingCommandBase::GetCommandStateParams(
StaticRefPtr<PasteNoFormattingCommand> PasteNoFormattingCommand::sInstance;
bool PasteNoFormattingCommand::IsCommandEnabled(const char* aCommandName,
bool PasteNoFormattingCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -122,7 +119,7 @@ bool PasteNoFormattingCommand::IsCommandEnabled(const char* aCommandName,
return htmlEditor->CanPaste(nsIClipboard::kGlobalClipboard);
}
nsresult PasteNoFormattingCommand::DoCommand(const char* aCommandName,
nsresult PasteNoFormattingCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
@ -134,16 +131,15 @@ nsresult PasteNoFormattingCommand::DoCommand(const char* aCommandName,
}
nsresult PasteNoFormattingCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult PasteNoFormattingCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -372,7 +368,7 @@ nsresult ListItemCommand::ToggleState(nsAtom* aTagName,
StaticRefPtr<RemoveListCommand> RemoveListCommand::sInstance;
bool RemoveListCommand::IsCommandEnabled(const char* aCommandName,
bool RemoveListCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -397,7 +393,7 @@ bool RemoveListCommand::IsCommandEnabled(const char* aCommandName,
return bMixed || !localName.IsEmpty();
}
nsresult RemoveListCommand::DoCommand(const char* aCommandName,
nsresult RemoveListCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -407,17 +403,17 @@ nsresult RemoveListCommand::DoCommand(const char* aCommandName,
return htmlEditor->RemoveList(EmptyString());
}
nsresult RemoveListCommand::DoCommandParams(const char* aCommandName,
nsresult RemoveListCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult RemoveListCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -426,7 +422,7 @@ nsresult RemoveListCommand::GetCommandStateParams(
StaticRefPtr<IndentCommand> IndentCommand::sInstance;
bool IndentCommand::IsCommandEnabled(const char* aCommandName,
bool IndentCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -434,7 +430,7 @@ bool IndentCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult IndentCommand::DoCommand(const char* aCommandName,
nsresult IndentCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -447,17 +443,17 @@ nsresult IndentCommand::DoCommand(const char* aCommandName,
return NS_OK;
}
nsresult IndentCommand::DoCommandParams(const char* aCommandName,
nsresult IndentCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult IndentCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -466,7 +462,7 @@ nsresult IndentCommand::GetCommandStateParams(
StaticRefPtr<OutdentCommand> OutdentCommand::sInstance;
bool OutdentCommand::IsCommandEnabled(const char* aCommandName,
bool OutdentCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -474,7 +470,7 @@ bool OutdentCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult OutdentCommand::DoCommand(const char* aCommandName,
nsresult OutdentCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -487,24 +483,24 @@ nsresult OutdentCommand::DoCommand(const char* aCommandName,
return NS_OK;
}
nsresult OutdentCommand::DoCommandParams(const char* aCommandName,
nsresult OutdentCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult OutdentCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
* mozilla::MultiStateCommandBase
*****************************************************************************/
bool MultiStateCommandBase::IsCommandEnabled(const char* aCommandName,
bool MultiStateCommandBase::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -513,14 +509,14 @@ bool MultiStateCommandBase::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult MultiStateCommandBase::DoCommand(const char* aCommandName,
nsresult MultiStateCommandBase::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
NS_WARNING(
"who is calling MultiStateCommandBase::DoCommand (no implementation)?");
return NS_OK;
}
nsresult MultiStateCommandBase::DoCommandParams(const char* aCommandName,
nsresult MultiStateCommandBase::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
@ -542,7 +538,7 @@ nsresult MultiStateCommandBase::DoCommandParams(const char* aCommandName,
}
nsresult MultiStateCommandBase::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
if (!aTextEditor) {
return NS_OK;
@ -950,7 +946,7 @@ nsresult AbsolutePositioningCommand::ToggleState(
StaticRefPtr<DecreaseZIndexCommand> DecreaseZIndexCommand::sInstance;
bool DecreaseZIndexCommand::IsCommandEnabled(const char* aCommandName,
bool DecreaseZIndexCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -969,7 +965,7 @@ bool DecreaseZIndexCommand::IsCommandEnabled(const char* aCommandName,
return htmlEditor->GetZIndex(*positionedElement) > 0;
}
nsresult DecreaseZIndexCommand::DoCommand(const char* aCommandName,
nsresult DecreaseZIndexCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
@ -978,17 +974,17 @@ nsresult DecreaseZIndexCommand::DoCommand(const char* aCommandName,
return htmlEditor->AddZIndex(-1);
}
nsresult DecreaseZIndexCommand::DoCommandParams(const char* aCommandName,
nsresult DecreaseZIndexCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult DecreaseZIndexCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -997,7 +993,7 @@ nsresult DecreaseZIndexCommand::GetCommandStateParams(
StaticRefPtr<IncreaseZIndexCommand> IncreaseZIndexCommand::sInstance;
bool IncreaseZIndexCommand::IsCommandEnabled(const char* aCommandName,
bool IncreaseZIndexCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1012,7 +1008,7 @@ bool IncreaseZIndexCommand::IsCommandEnabled(const char* aCommandName,
return !!htmlEditor->GetPositionedElement();
}
nsresult IncreaseZIndexCommand::DoCommand(const char* aCommandName,
nsresult IncreaseZIndexCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
@ -1021,17 +1017,17 @@ nsresult IncreaseZIndexCommand::DoCommand(const char* aCommandName,
return htmlEditor->AddZIndex(1);
}
nsresult IncreaseZIndexCommand::DoCommandParams(const char* aCommandName,
nsresult IncreaseZIndexCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult IncreaseZIndexCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -1040,7 +1036,7 @@ nsresult IncreaseZIndexCommand::GetCommandStateParams(
StaticRefPtr<RemoveStylesCommand> RemoveStylesCommand::sInstance;
bool RemoveStylesCommand::IsCommandEnabled(const char* aCommandName,
bool RemoveStylesCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1049,7 +1045,7 @@ bool RemoveStylesCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult RemoveStylesCommand::DoCommand(const char* aCommandName,
nsresult RemoveStylesCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -1058,17 +1054,17 @@ nsresult RemoveStylesCommand::DoCommand(const char* aCommandName,
return MOZ_KnownLive(htmlEditor)->RemoveAllInlineProperties();
}
nsresult RemoveStylesCommand::DoCommandParams(const char* aCommandName,
nsresult RemoveStylesCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
return DoCommand(aCommand, aTextEditor);
}
nsresult RemoveStylesCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -1077,7 +1073,7 @@ nsresult RemoveStylesCommand::GetCommandStateParams(
StaticRefPtr<IncreaseFontSizeCommand> IncreaseFontSizeCommand::sInstance;
bool IncreaseFontSizeCommand::IsCommandEnabled(const char* aCommandName,
bool IncreaseFontSizeCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1086,7 +1082,7 @@ bool IncreaseFontSizeCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult IncreaseFontSizeCommand::DoCommand(const char* aCommandName,
nsresult IncreaseFontSizeCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -1096,16 +1092,15 @@ nsresult IncreaseFontSizeCommand::DoCommand(const char* aCommandName,
}
nsresult IncreaseFontSizeCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult IncreaseFontSizeCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -1114,7 +1109,7 @@ nsresult IncreaseFontSizeCommand::GetCommandStateParams(
StaticRefPtr<DecreaseFontSizeCommand> DecreaseFontSizeCommand::sInstance;
bool DecreaseFontSizeCommand::IsCommandEnabled(const char* aCommandName,
bool DecreaseFontSizeCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1123,7 +1118,7 @@ bool DecreaseFontSizeCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult DecreaseFontSizeCommand::DoCommand(const char* aCommandName,
nsresult DecreaseFontSizeCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (!htmlEditor) {
@ -1133,16 +1128,15 @@ nsresult DecreaseFontSizeCommand::DoCommand(const char* aCommandName,
}
nsresult DecreaseFontSizeCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return DoCommand(aCommandName, aTextEditor);
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
return DoCommand(aCommand, aTextEditor);
}
nsresult DecreaseFontSizeCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -1151,7 +1145,7 @@ nsresult DecreaseFontSizeCommand::GetCommandStateParams(
StaticRefPtr<InsertHTMLCommand> InsertHTMLCommand::sInstance;
bool InsertHTMLCommand::IsCommandEnabled(const char* aCommandName,
bool InsertHTMLCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1159,7 +1153,7 @@ bool InsertHTMLCommand::IsCommandEnabled(const char* aCommandName,
return aTextEditor->IsSelectionEditable();
}
nsresult InsertHTMLCommand::DoCommand(const char* aCommandName,
nsresult InsertHTMLCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
// If nsInsertHTMLCommand is called with no parameters, it was probably called
// with an empty string parameter ''. In this case, it should act the same as
@ -1172,7 +1166,7 @@ nsresult InsertHTMLCommand::DoCommand(const char* aCommandName,
return MOZ_KnownLive(htmlEditor)->InsertHTML(html);
}
nsresult InsertHTMLCommand::DoCommandParams(const char* aCommandName,
nsresult InsertHTMLCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
if (NS_WARN_IF(!aParams)) {
@ -1194,10 +1188,10 @@ nsresult InsertHTMLCommand::DoCommandParams(const char* aCommandName,
}
nsresult InsertHTMLCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************
@ -1205,9 +1199,8 @@ nsresult InsertHTMLCommand::GetCommandStateParams(
*****************************************************************************/
StaticRefPtr<InsertTagCommand> InsertTagCommand::sInstance;
nsRefPtrHashtable<nsCharPtrHashKey, nsAtom> InsertTagCommand::sTagNameTable;
bool InsertTagCommand::IsCommandEnabled(const char* aCommandName,
bool InsertTagCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
if (!aTextEditor) {
return false;
@ -1216,9 +1209,9 @@ bool InsertTagCommand::IsCommandEnabled(const char* aCommandName,
}
// corresponding STATE_ATTRIBUTE is: src (img) and href (a)
nsresult InsertTagCommand::DoCommand(const char* aCmdName,
nsresult InsertTagCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
RefPtr<nsAtom> tagName = TagName(aCmdName);
nsAtom* tagName = GetTagName(aCommand);
if (NS_WARN_IF(tagName != nsGkAtoms::hr)) {
return NS_ERROR_NOT_IMPLEMENTED;
}
@ -1229,7 +1222,8 @@ nsresult InsertTagCommand::DoCommand(const char* aCmdName,
}
RefPtr<Element> newElement =
MOZ_KnownLive(htmlEditor)->CreateElementWithDefaults(*tagName);
MOZ_KnownLive(htmlEditor)
->CreateElementWithDefaults(MOZ_KnownLive(*tagName));
if (NS_WARN_IF(!newElement)) {
return NS_ERROR_FAILURE;
}
@ -1241,18 +1235,18 @@ nsresult InsertTagCommand::DoCommand(const char* aCmdName,
return NS_OK;
}
nsresult InsertTagCommand::DoCommandParams(const char* aCommandName,
nsresult InsertTagCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
// inserting an hr shouldn't have an parameters, just call DoCommand for that
if (!strcmp(aCommandName, "cmd_insertHR")) {
return DoCommand(aCommandName, aTextEditor);
if (aCommand == Command::InsertHorizontalRule) {
return DoCommand(aCommand, aTextEditor);
}
if (NS_WARN_IF(!aParams)) {
return NS_ERROR_INVALID_ARG;
}
RefPtr<nsAtom> tagName = TagName(aCommandName);
nsAtom* tagName = GetTagName(aCommand);
if (NS_WARN_IF(!tagName)) {
return NS_ERROR_UNEXPECTED;
}
@ -1285,7 +1279,8 @@ nsresult InsertTagCommand::DoCommandParams(const char* aCommandName,
}
RefPtr<Element> newElement =
MOZ_KnownLive(htmlEditor)->CreateElementWithDefaults(*tagName);
MOZ_KnownLive(htmlEditor)
->CreateElementWithDefaults(MOZ_KnownLive(*tagName));
if (NS_WARN_IF(!newElement)) {
return NS_ERROR_FAILURE;
}
@ -1313,10 +1308,10 @@ nsresult InsertTagCommand::DoCommandParams(const char* aCommandName,
}
nsresult InsertTagCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
return aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
IsCommandEnabled(aCommand, aTextEditor));
}
/*****************************************************************************

117
editor/libeditor/HTMLEditorDocumentCommands.cpp
Просмотреть файл

@ -37,25 +37,25 @@ namespace mozilla {
StaticRefPtr<SetDocumentStateCommand> SetDocumentStateCommand::sInstance;
bool SetDocumentStateCommand::IsCommandEnabled(const char* aCommandName,
bool SetDocumentStateCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
// These commands are always enabled
return true;
}
nsresult SetDocumentStateCommand::DoCommand(const char* aCommandName,
nsresult SetDocumentStateCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult SetDocumentStateCommand::DoCommandParams(
const char* aCommandName, nsCommandParams* aParams,
TextEditor& aTextEditor) const {
Command aCommand, nsCommandParams* aParams, TextEditor& aTextEditor) const {
if (NS_WARN_IF(!aParams)) {
return NS_ERROR_INVALID_ARG;
}
if (!strcmp(aCommandName, "cmd_setDocumentModified")) {
switch (aCommand) {
case Command::SetDocumentModified: {
ErrorResult error;
bool modified = aParams->GetBool(STATE_ATTRIBUTE, error);
// Should we fail if this param wasn't set?
@ -76,8 +76,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
}
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_setDocumentReadOnly")) {
case Command::SetDocumentReadOnly: {
ErrorResult error;
bool isReadOnly = aParams->GetBool(STATE_ATTRIBUTE, error);
if (NS_WARN_IF(error.Failed())) {
@ -98,8 +97,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
}
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_setDocumentUseCSS")) {
case Command::SetDocumentUseCSS: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -115,8 +113,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
}
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_insertBrOnReturn")) {
case Command::SetDocumentInsertBROnEnterKeyPress: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -126,15 +123,14 @@ nsresult SetDocumentStateCommand::DoCommandParams(
if (NS_WARN_IF(error.Failed())) {
return error.StealNSResult();
}
nsresult rv =
htmlEditor->SetReturnInParagraphCreatesNewParagraph(!insertBrOnReturn);
nsresult rv = htmlEditor->SetReturnInParagraphCreatesNewParagraph(
!insertBrOnReturn);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_defaultParagraphSeparator")) {
case Command::SetDocumentDefaultParagraphSeparator: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -164,8 +160,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
NS_WARNING("Invalid default paragraph separator");
return NS_ERROR_UNEXPECTED;
}
if (!strcmp(aCommandName, "cmd_enableObjectResizing")) {
case Command::ToggleObjectResizers: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -178,8 +173,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
htmlEditor->EnableObjectResizer(enabled);
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_enableInlineTableEditing")) {
case Command::ToggleInlineTableEditor: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -192,8 +186,7 @@ nsresult SetDocumentStateCommand::DoCommandParams(
htmlEditor->EnableInlineTableEditor(enabled);
return NS_OK;
}
if (!strcmp(aCommandName, "cmd_enableAbsolutePositionEditing")) {
case Command::ToggleAbsolutePositionEditor: {
HTMLEditor* htmlEditor = aTextEditor.AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -206,12 +199,13 @@ nsresult SetDocumentStateCommand::DoCommandParams(
htmlEditor->EnableAbsolutePositionEditor(enabled);
return NS_OK;
}
default:
return NS_ERROR_NOT_IMPLEMENTED;
}
}
nsresult SetDocumentStateCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
// If the result is set to STATE_ALL as bool value, queryCommandState()
// returns the bool value.
@ -224,14 +218,14 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
return NS_ERROR_INVALID_ARG;
}
// Always get the enabled state
nsresult rv = aParams.SetBool(STATE_ENABLED,
IsCommandEnabled(aCommandName, aTextEditor));
nsresult rv =
aParams.SetBool(STATE_ENABLED, IsCommandEnabled(aCommand, aTextEditor));
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
// cmd_setDocumentModified is an internal command.
if (!strcmp(aCommandName, "cmd_setDocumentModified")) {
switch (aCommand) {
case Command::SetDocumentModified: {
bool modified;
rv = aTextEditor->GetDocumentModified(&modified);
if (NS_WARN_IF(NS_FAILED(rv))) {
@ -244,9 +238,7 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
}
return NS_OK;
}
// cmd_setDocumentReadOnly is a Gecko specific command, "contentReadOnly".
if (!strcmp(aCommandName, "cmd_setDocumentReadOnly")) {
case Command::SetDocumentReadOnly: {
// XXX Nobody refers this result due to wrong type.
rv = aParams.SetBool(STATE_ATTRIBUTE, aTextEditor->IsReadonly());
if (NS_WARN_IF(NS_FAILED(rv))) {
@ -254,9 +246,7 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
}
return NS_OK;
}
// cmd_setDocumentUseCSS is a common command, "styleWithCSS".
if (!strcmp(aCommandName, "cmd_setDocumentUseCSS")) {
case Command::SetDocumentUseCSS: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -267,9 +257,7 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
}
return NS_OK;
}
// cmd_insertBrOnReturn is a Gecko specific command, "insertBrOrReturn".
if (!strcmp(aCommandName, "cmd_insertBrOnReturn")) {
case Command::SetDocumentInsertBROnEnterKeyPress: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -283,10 +271,7 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
}
return NS_OK;
}
// cmd_defaultParagraphSeparator is a common command,
// "defaultParagraphSeparator".
if (!strcmp(aCommandName, "cmd_defaultParagraphSeparator")) {
case Command::SetDocumentDefaultParagraphSeparator: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -296,7 +281,8 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
case ParagraphSeparator::div: {
DebugOnly<nsresult> rv =
aParams.SetCString(STATE_ATTRIBUTE, NS_LITERAL_CSTRING("div"));
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"Failed to set command params to return \"div\"");
return NS_OK;
}
@ -319,44 +305,37 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
return NS_ERROR_UNEXPECTED;
}
}
// cmd_enableObjectResizing is a Gecko specific command,
// "enableObjectResizing".
if (!strcmp(aCommandName, "cmd_enableObjectResizing")) {
case Command::ToggleObjectResizers: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
}
// We returned the result as STATE_ATTRIBUTE with bool value 60 or earlier.
// So, the result was ignored by both nsHTMLDocument::QueryCommandValue()
// and nsHTMLDocument::QueryCommandState().
// We returned the result as STATE_ATTRIBUTE with bool value 60 or
// earlier. So, the result was ignored by both
// nsHTMLDocument::QueryCommandValue() and
// nsHTMLDocument::QueryCommandState().
rv = aParams.SetBool(STATE_ALL, htmlEditor->IsObjectResizerEnabled());
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
// cmd_enableInlineTableEditing is a Gecko specific command,
// "enableInlineTableEditing".
if (!strcmp(aCommandName, "cmd_enableInlineTableEditing")) {
case Command::ToggleInlineTableEditor: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
}
// We returned the result as STATE_ATTRIBUTE with bool value 60 or earlier.
// So, the result was ignored by both nsHTMLDocument::QueryCommandValue()
// and nsHTMLDocument::QueryCommandState().
// We returned the result as STATE_ATTRIBUTE with bool value 60 or
// earlier. So, the result was ignored by both
// nsHTMLDocument::QueryCommandValue() and
// nsHTMLDocument::QueryCommandState().
rv = aParams.SetBool(STATE_ALL, htmlEditor->IsInlineTableEditorEnabled());
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
// cmd_enableAbsolutePositionEditing is a Gecko specific command,
// "cenableAbsolutePositionEditing".
if (!strcmp(aCommandName, "cmd_enableAbsolutePositionEditing")) {
case Command::ToggleAbsolutePositionEditor: {
HTMLEditor* htmlEditor = aTextEditor->AsHTMLEditor();
if (NS_WARN_IF(!htmlEditor)) {
return NS_ERROR_INVALID_ARG;
@ -364,9 +343,10 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
return aParams.SetBool(STATE_ALL,
htmlEditor->IsAbsolutePositionEditorEnabled());
}
default:
return NS_ERROR_NOT_IMPLEMENTED;
}
}
/*****************************************************************************
* mozilla::DocumentStateCommand
@ -407,27 +387,28 @@ nsresult SetDocumentStateCommand::GetCommandStateParams(
StaticRefPtr<DocumentStateCommand> DocumentStateCommand::sInstance;
bool DocumentStateCommand::IsCommandEnabled(const char* aCommandName,
bool DocumentStateCommand::IsCommandEnabled(Command aCommand,
TextEditor* aTextEditor) const {
// Always return false to discourage callers from using DoCommand()
return false;
}
nsresult DocumentStateCommand::DoCommand(const char* aCommandName,
nsresult DocumentStateCommand::DoCommand(Command aCommand,
TextEditor& aTextEditor) const {
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult DocumentStateCommand::DoCommandParams(const char* aCommandName,
nsresult DocumentStateCommand::DoCommandParams(Command aCommand,
nsCommandParams* aParams,
TextEditor& aTextEditor) const {
return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult DocumentStateCommand::GetCommandStateParams(
const char* aCommandName, nsCommandParams& aParams, TextEditor* aTextEditor,
Command aCommand, nsCommandParams& aParams, TextEditor* aTextEditor,
nsIEditingSession* aEditingSession) const {
if (!strcmp(aCommandName, "obs_documentCreated")) {
switch (aCommand) {
case Command::EditorObserverDocumentCreated: {
uint32_t editorStatus = nsIEditingSession::eEditorErrorUnknown;
if (aEditingSession) {
// Current context is initially set to nsIEditingSession until editor is
@ -449,8 +430,7 @@ nsresult DocumentStateCommand::GetCommandStateParams(
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to set editor status");
return NS_OK;
}
if (!strcmp(aCommandName, "obs_documentLocationChanged")) {
case Command::EditorObserverDocumentLocationChanged: {
if (!aTextEditor) {
return NS_OK;
}
@ -468,8 +448,9 @@ nsresult DocumentStateCommand::GetCommandStateParams(
}
return NS_OK;
}
default:
return NS_ERROR_NOT_IMPLEMENTED;
}
}
} // namespace mozilla