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

Bug 1460509 - part 33: Make HTMLEditRules::JoinNearestEditableNodesWithTransaction() return NS_ERROR_EDITOR_DESTROYED if it causes destroying the editor r=m_kato

Browse Source 
Unfortunately, we need to make it take out argument for returning new first
child point of right node.  If we can create JoinNodesResult which have
nsresult and EditorDOMPoint, we can avoid that, but EditorBase::JoinNodes()
does not want it.  So, even if we create such class, only 2 callers of the
methods are its users...

MozReview-Commit-ID: 1zwVZ0FriwN

--HG--
extra : rebase_source : 1f7867774f9a30bec78596b0282717435e7223c0
This commit is contained in:
Masayuki Nakano 2018-05-14 23:51:23 +09:00
parent f82870c55b
commit a3320a815b
2 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
editor/libeditor/HTMLEditRules.cpp
View File

@ -2672,9 +2672,13 @@ HTMLEditRules::WillDeleteSelection(nsIEditor::EDirection aAction,
// Are they both text nodes? If so, join them!
if (startNode == stepbrother && startNode->GetAsText() &&
sibling->GetAsText()) {
EditorDOMPoint pt =
EditorDOMPoint pt;
nsresult rv =
JoinNearestEditableNodesWithTransaction(*sibling,
*startNode->AsContent());
*startNode->AsContent(), &pt);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
if (NS_WARN_IF(!pt.IsSet())) {
return NS_ERROR_FAILURE;
}
@ -3516,8 +3520,12 @@ HTMLEditRules::TryToJoinBlocksWithTransaction(nsIContent& aLeftNode,
if (mergeLists || leftBlock->NodeInfo()->NameAtom() ==
rightBlock->NodeInfo()->NameAtom()) {
// Nodes are same type. merge them.
EditorDOMPoint pt =
JoinNearestEditableNodesWithTransaction(*leftBlock, *rightBlock);
EditorDOMPoint pt;
nsresult rv =
JoinNearestEditableNodesWithTransaction(*leftBlock, *rightBlock, &pt);
if (NS_WARN_IF(rv == NS_ERROR_EDITOR_DESTROYED)) {
return EditActionIgnored(NS_ERROR_EDITOR_DESTROYED);
}
if (pt.IsSet() && mergeLists) {
RefPtr<Element> newBlock =
ConvertListType(rightBlock, existingList, nsGkAtoms::li);
@ -8382,28 +8390,34 @@ HTMLEditRules::MaybeSplitAncestorsForInsertWithTransaction(
return splitNodeResult;
}
EditorDOMPoint
HTMLEditRules::JoinNearestEditableNodesWithTransaction(nsIContent& aNodeLeft,
nsIContent& aNodeRight)
nsresult
HTMLEditRules::JoinNearestEditableNodesWithTransaction(
nsIContent& aNodeLeft,
nsIContent& aNodeRight,
EditorDOMPoint* aNewFirstChildOfRightNode)
{
MOZ_ASSERT(IsEditorDataAvailable());
MOZ_ASSERT(aNewFirstChildOfRightNode);
// Caller responsible for left and right node being the same type
nsCOMPtr<nsINode> parent = aNodeLeft.GetParentNode();
if (NS_WARN_IF(!parent)) {
return EditorDOMPoint();
return NS_ERROR_FAILURE;
}
int32_t parOffset = parent->ComputeIndexOf(&aNodeLeft);
nsCOMPtr<nsINode> rightParent = aNodeRight.GetParentNode();
// If they don't have the same parent, first move the right node to after the
// left one
if (parent != rightParent) {
int32_t parOffset = parent->ComputeIndexOf(&aNodeLeft);
nsresult rv =
HTMLEditorRef().MoveNodeWithTransaction(
aNodeRight, EditorRawDOMPoint(parent, parOffset));
if (NS_WARN_IF(!CanHandleEditAction())) {
return NS_ERROR_EDITOR_DESTROYED;
}
if (NS_WARN_IF(NS_FAILED(rv))) {
return EditorDOMPoint();
return rv;
}
}
@ -8414,29 +8428,36 @@ HTMLEditRules::JoinNearestEditableNodesWithTransaction(nsIContent& aNodeLeft,
// For lists, merge shallow (wouldn't want to combine list items)
nsresult rv =
HTMLEditorRef().JoinNodesWithTransaction(aNodeLeft, aNodeRight);
if (NS_WARN_IF(NS_FAILED(rv))) {
return EditorDOMPoint();
if (NS_WARN_IF(!CanHandleEditAction())) {
return NS_ERROR_EDITOR_DESTROYED;
}
return ret;
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
*aNewFirstChildOfRightNode = Move(ret);
return NS_OK;
}
// Remember the last left child, and first right child
nsCOMPtr<nsIContent> lastLeft =
HTMLEditorRef().GetLastEditableChild(aNodeLeft);
if (NS_WARN_IF(!lastLeft)) {
return EditorDOMPoint();
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIContent> firstRight =
HTMLEditorRef().GetFirstEditableChild(aNodeRight);
if (NS_WARN_IF(!firstRight)) {
return EditorDOMPoint();
return NS_ERROR_FAILURE;
}
// For list items, divs, etc., merge smart
nsresult rv = HTMLEditorRef().JoinNodesWithTransaction(aNodeLeft, aNodeRight);
if (NS_WARN_IF(!CanHandleEditAction())) {
return NS_ERROR_EDITOR_DESTROYED;
}
if (NS_WARN_IF(NS_FAILED(rv))) {
return EditorDOMPoint();
return rv;
}
if (lastLeft && firstRight &&
@ -8445,9 +8466,16 @@ HTMLEditRules::JoinNearestEditableNodesWithTransaction(nsIContent& aNodeLeft,
(lastLeft->IsElement() && firstRight->IsElement() &&
CSSEditUtils::ElementsSameStyle(lastLeft->AsElement(),
firstRight->AsElement())))) {
return JoinNearestEditableNodesWithTransaction(*lastLeft, *firstRight);
nsresult rv =
JoinNearestEditableNodesWithTransaction(*lastLeft, *firstRight,
aNewFirstChildOfRightNode);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
return ret;
*aNewFirstChildOfRightNode = Move(ret);
return NS_OK;
}
Element*

10
editor/libeditor/HTMLEditRules.h
View File

@ -550,11 +550,13 @@ protected:
* @param aLeftNode The node which will be removed.
* @param aRightNode The node which will be inserted the content of
* aLeftNode.
* @return The point at the first child of aRightNode.
* @param aNewFirstChildOfRightNode
* The point at the first child of aRightNode.
*/
EditorDOMPoint
JoinNearestEditableNodesWithTransaction(nsIContent& aLeftNode,
nsIContent& aRightNode);
MOZ_MUST_USE nsresult
JoinNearestEditableNodesWithTransaction(
nsIContent& aLeftNode, nsIContent& aRightNode,
EditorDOMPoint* aNewFirstChildOfRightNode);
Element* GetTopEnclosingMailCite(nsINode& aNode);