corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1766355 - part 5: Make HTMLEditor::MoveChildrenWithTransaction and HTMLEditor::MoveNodeOrChildrenWithTransaction stop touching Selection directly r=m_kato

Browse Source 
Unfortunately, they call each other.  Therefore, this patch updates these 2
methods once.

Differential Revision: https://phabricator.services.mozilla.com/D146401
This commit is contained in:
Masayuki Nakano
2022-05-20 08:40:59 +00:00
parent 45567c8ce2
commit fda3a43b66
2 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
editor/libeditor/HTMLEditorDeleteHandler.cpp
View File

@@ -4782,13 +4782,23 @@ MoveNodeResult HTMLEditor::MoveOneHardLineContents(
NS_WARNING("HTMLEditor::MoveChildrenWithTransaction() failed");
return moveContentsInLineResult;
}
nsresult rv = moveContentsInLineResult.SuggestCaretPointTo(
*this, {SuggestCaret::OnlyIfHasSuggestion,
SuggestCaret::OnlyIfTransactionsAllowedToDoIt,
SuggestCaret::AndIgnoreTrivialError});
if (NS_FAILED(rv)) {
NS_WARNING("MoveNodeResult::SuggestCaretPointTo() failed");
return MoveNodeResult(rv);
}
NS_WARNING_ASSERTION(
rv != NS_SUCCESS_EDITOR_BUT_IGNORED_TRIVIAL_ERROR,
"MoveNodeResult::SuggestCaretPointTo() failed, but ignored");
offset = moveContentsInLineResult.NextInsertionPointRef().Offset();
// MOZ_KnownLive because 'arrayOfContents' is guaranteed to
// keep it alive.
DebugOnly<nsresult> rvIgnored =
DeleteNodeWithTransaction(MOZ_KnownLive(*content));
if (NS_WARN_IF(Destroyed())) {
moveContentsInLineResult.IgnoreCaretPointSuggestion();
return MoveNodeResult(NS_ERROR_EDITOR_DESTROYED);
}
NS_WARNING_ASSERTION(
@@ -4819,6 +4829,17 @@ MoveNodeResult HTMLEditor::MoveOneHardLineContents(
"ignored");
continue;
}
nsresult rv = moveNodeResult.SuggestCaretPointTo(
*this, {SuggestCaret::OnlyIfHasSuggestion,
SuggestCaret::OnlyIfTransactionsAllowedToDoIt,
SuggestCaret::AndIgnoreTrivialError});
if (NS_FAILED(rv)) {
NS_WARNING("MoveNodeResult::SuggestCaretPointTo() failed");
return MoveNodeResult(rv);
}
NS_WARNING_ASSERTION(
rv != NS_ERROR_EDITOR_NO_EDITABLE_RANGE,
"MoveNodeResult::SuggestCaretPointTo() failed, but ignored");
offset = moveNodeResult.NextInsertionPointRef().Offset();
moveContentsInLineResult |= moveNodeResult;
}
@@ -4841,31 +4862,19 @@ Result<bool, nsresult> HTMLEditor::CanMoveNodeOrChildren(
}
MoveNodeResult HTMLEditor::MoveNodeOrChildrenWithTransaction(
nsIContent& aContent, const EditorDOMPoint& aPointToInsert) {
nsIContent& aContentToMove, const EditorDOMPoint& aPointToInsert) {
MOZ_ASSERT(IsEditActionDataAvailable());
MOZ_ASSERT(aPointToInsert.IsSet());
// Check if this node can go into the destination node
if (HTMLEditUtils::CanNodeContain(*aPointToInsert.GetContainer(), aContent)) {
if (HTMLEditUtils::CanNodeContain(*aPointToInsert.GetContainer(),
aContentToMove)) {
// If it can, move it there.
EditorDOMPoint pointToInsert(aPointToInsert);
MoveNodeResult moveNodeResult =
MoveNodeWithTransaction(aContent, pointToInsert);
if (moveNodeResult.isErr()) {
NS_WARNING("HTMLEditor::MoveNodeWithTransaction() failed");
return MoveNodeResult(moveNodeResult.unwrapErr());
}
nsresult rv = moveNodeResult.SuggestCaretPointTo(
*this, {SuggestCaret::OnlyIfHasSuggestion,
SuggestCaret::OnlyIfTransactionsAllowedToDoIt,
SuggestCaret::AndIgnoreTrivialError});
if (NS_FAILED(rv)) {
NS_WARNING("MoveNodeResult::SuggestCaretPointTo() failed");
return MoveNodeResult(rv);
}
NS_WARNING_ASSERTION(
rv != NS_SUCCESS_EDITOR_BUT_IGNORED_TRIVIAL_ERROR,
"MoveNodeResult::SuggestCaretPointTo() failed, but ignored");
MoveNodeWithTransaction(aContentToMove, pointToInsert);
NS_WARNING_ASSERTION(moveNodeResult.isOk(),
"HTMLEditor::MoveNodeWithTransaction() failed");
// XXX This is odd to override the handled state here, but stopping this
// hits an NS_ASSERTION in WhiteSpaceVisibilityKeeper::
// MergeFirstLineOfRightBlockElementIntoAncestorLeftBlockElement.
@@ -4874,19 +4883,21 @@ MoveNodeResult HTMLEditor::MoveNodeOrChildrenWithTransaction(
}
// If it can't, move its children (if any), and then delete it.
MoveNodeResult moveNodeResult;
if (aContent.IsElement()) {
moveNodeResult = MoveChildrenWithTransaction(
MOZ_KnownLive(*aContent.AsElement()), aPointToInsert);
if (moveNodeResult.isErr()) {
NS_WARNING("HTMLEditor::MoveChildrenWithTransaction() failed");
return moveNodeResult;
MoveNodeResult moveNodeResult = [&]() MOZ_CAN_RUN_SCRIPT {
if (!aContentToMove.IsElement()) {
return MoveNodeHandled(aPointToInsert);
}
} else {
moveNodeResult = MoveNodeHandled(aPointToInsert);
MoveNodeResult moveChildrenResult = MoveChildrenWithTransaction(
MOZ_KnownLive(*aContentToMove.AsElement()), aPointToInsert);
NS_WARNING_ASSERTION(moveChildrenResult.isOk(),
"HTMLEditor::MoveChildrenWithTransaction() failed");
return moveChildrenResult;
}();
if (moveNodeResult.isErr()) {
return moveNodeResult; // Already warned in the lambda.
}
nsresult rv = DeleteNodeWithTransaction(aContent);
nsresult rv = DeleteNodeWithTransaction(aContentToMove);
if (NS_WARN_IF(Destroyed())) {
moveNodeResult.IgnoreCaretPointSuggestion();
return MoveNodeResult(NS_ERROR_EDITOR_DESTROYED);
@@ -4896,16 +4907,18 @@ MoveNodeResult HTMLEditor::MoveNodeOrChildrenWithTransaction(
moveNodeResult.IgnoreCaretPointSuggestion();
return MoveNodeResult(rv);
}
if (MayHaveMutationEventListeners()) {
// Mutation event listener may make `offset` value invalid with
// removing some previous children while we call
// `DeleteNodeWithTransaction()` so that we should adjust it here.
if (!moveNodeResult.NextInsertionPointRef().IsSetAndValid()) {
moveNodeResult = MoveNodeHandled(
EditorDOMPoint::AtEndOf(*aPointToInsert.GetContainer()));
}
if (!MayHaveMutationEventListeners()) {
return moveNodeResult;
}
return moveNodeResult;
// Mutation event listener may make `offset` value invalid with
// removing some previous children while we call
// `DeleteNodeWithTransaction()` so that we should adjust it here.
if (moveNodeResult.NextInsertionPointRef().IsSetAndValid()) {
return moveNodeResult;
}
moveNodeResult.IgnoreCaretPointSuggestion();
return MoveNodeHandled(
EditorDOMPoint::AtEndOf(*aPointToInsert.GetContainer()));
}
Result<bool, nsresult> HTMLEditor::CanMoveChildren(