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

Bug 1620504 - part 16: Clean up warnings in JoinNodeTransaction r=m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D66178

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Masayuki Nakano 2020-03-10 14:20:22 +00:00
parent 32d4290527
commit 5343ffcff8
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
editor/libeditor/JoinNodeTransaction.cpp
View File

@ -52,39 +52,40 @@ bool JoinNodeTransaction::CanDoIt() const {
// After DoTransaction() and RedoTransaction(), the left node is removed from
// the content tree and right node remains.
MOZ_CAN_RUN_SCRIPT_BOUNDARY
NS_IMETHODIMP
JoinNodeTransaction::DoTransaction() {
MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHODIMP JoinNodeTransaction::DoTransaction() {
if (NS_WARN_IF(!mEditorBase) || NS_WARN_IF(!mLeftNode) ||
NS_WARN_IF(!mRightNode)) {
return NS_ERROR_NOT_INITIALIZED;
}
// Get the parent node
nsCOMPtr<nsINode> leftParent = mLeftNode->GetParentNode();
NS_ENSURE_TRUE(leftParent, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsINode> leftNodeParent = mLeftNode->GetParentNode();
if (NS_WARN_IF(!leftNodeParent)) {
return NS_ERROR_FAILURE;
}
// Verify that mLeftNode and mRightNode have the same parent
if (leftParent != mRightNode->GetParentNode()) {
if (leftNodeParent != mRightNode->GetParentNode()) {
NS_ASSERTION(false, "Nodes do not have same parent");
return NS_ERROR_INVALID_ARG;
}
// Set this instance's mParent. Other methods will see a non-null mParent
// and know all is well
mParent = leftParent;
mParent = leftNodeParent;
mOffset = mLeftNode->Length();
RefPtr<EditorBase> editorBase = mEditorBase;
nsCOMPtr<nsINode> leftNode = mLeftNode;
nsCOMPtr<nsINode> rightNode = mRightNode;
return editorBase->DoJoinNodes(rightNode, leftNode, MOZ_KnownLive(mParent));
nsresult rv = editorBase->DoJoinNodes(rightNode, leftNode, leftNodeParent);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "EditorBase::DoJoinNodes() failed");
return rv;
}
// XXX: What if instead of split, we just deleted the unneeded children of
// mRight and re-inserted mLeft?
MOZ_CAN_RUN_SCRIPT_BOUNDARY
NS_IMETHODIMP
MOZ_CAN_RUN_SCRIPT_BOUNDARY NS_IMETHODIMP
JoinNodeTransaction::UndoTransaction() {
if (NS_WARN_IF(!mParent) || NS_WARN_IF(!mLeftNode) ||
NS_WARN_IF(!mRightNode) || NS_WARN_IF(!mEditorBase)) {
@ -92,32 +93,38 @@ JoinNodeTransaction::UndoTransaction() {
}
// First, massage the existing node so it is in its post-split state
ErrorResult rv;
ErrorResult error;
if (mRightNode->GetAsText()) {
RefPtr<EditorBase> editorBase = mEditorBase;
RefPtr<Text> rightNodeAsText = mRightNode->GetAsText();
editorBase->DoDeleteText(*rightNodeAsText, 0, mOffset, rv);
if (NS_WARN_IF(rv.Failed())) {
return rv.StealNSResult();
editorBase->DoDeleteText(*rightNodeAsText, 0, mOffset, error);
if (error.Failed()) {
NS_WARNING("EditorBase::DoDeleteText() failed");
return error.StealNSResult();
}
} else {
nsCOMPtr<nsIContent> child = mRightNode->GetFirstChild();
for (uint32_t i = 0; i < mOffset; i++) {
if (rv.Failed()) {
return rv.StealNSResult();
if (error.Failed()) {
return error.StealNSResult();
}
if (!child) {
return NS_ERROR_NULL_POINTER;
}
nsCOMPtr<nsIContent> nextSibling = child->GetNextSibling();
mLeftNode->AppendChild(*child, rv);
mLeftNode->AppendChild(*child, error);
NS_WARNING_ASSERTION(!error.Failed(), "nsINode::AppendChild() failed");
child = nextSibling;
}
}
NS_WARNING_ASSERTION(!error.Failed(), "The previous error was ignored");
// Second, re-insert the left node into the tree
nsCOMPtr<nsINode> refNode = mRightNode;
mParent->InsertBefore(*mLeftNode, refNode, rv);
return rv.StealNSResult();
mParent->InsertBefore(*mLeftNode, refNode, error);
NS_WARNING_ASSERTION(!error.Failed(), "nsINode::InsertBefore() failed");
return error.StealNSResult();
}
} // namespace mozilla