Bug 1367683 - Optimize initializing nsRange

Tag #1375
This commit is contained in:
Matt A. Tobin 2020-04-17 05:28:43 -04:00 committed by Roy Tam
commit 9d8343e19c
16 changed files with 330 additions and 205 deletions

View file

@ -541,9 +541,11 @@ HTMLEditor::SplitStyleAboveRange(nsRange* inRange,
NS_ENSURE_SUCCESS(rv, rv);
// reset the range
rv = inRange->SetStart(startNode, startOffset);
NS_ENSURE_SUCCESS(rv, rv);
return inRange->SetEnd(endNode, endOffset);
rv = inRange->SetStartAndEnd(startNode, startOffset, endNode, endOffset);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
nsresult
@ -885,10 +887,11 @@ HTMLEditor::PromoteRangeIfStartsOrEndsInNamedAnchor(nsRange& aRange)
endOffset = endNode ? endNode->IndexOf(parent) + 1 : 0;
}
nsresult rv = aRange.SetStart(startNode, startOffset);
NS_ENSURE_SUCCESS(rv, rv);
rv = aRange.SetEnd(endNode, endOffset);
NS_ENSURE_SUCCESS(rv, rv);
nsresult rv = aRange.SetStartAndEnd(startNode, startOffset,
endNode, endOffset);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}
@ -918,10 +921,11 @@ HTMLEditor::PromoteInlineRange(nsRange& aRange)
endNode = parent;
}
nsresult rv = aRange.SetStart(startNode, startOffset);
NS_ENSURE_SUCCESS(rv, rv);
rv = aRange.SetEnd(endNode, endOffset);
NS_ENSURE_SUCCESS(rv, rv);
nsresult rv = aRange.SetStartAndEnd(startNode, startOffset,
endNode, endOffset);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
return NS_OK;
}