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

Bug 1675883 - Use SetStartAndEndInLimiter() in SetSelectionInternal() r=masayuki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D96503
This commit is contained in:
Kagami Sascha Rosylight
2020-11-12 14:28:39 +00:00
parent 77cdce65f8
commit 07595b54b1
2 changed files with 153 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
layout/forms/nsTextControlFrame.cpp
View File

@@ -793,25 +793,6 @@ already_AddRefed<TextEditor> nsTextControlFrame::GetTextEditor() {
nsresult nsTextControlFrame::SetSelectionInternal(
nsINode* aStartNode, uint32_t aStartOffset, nsINode* aEndNode,
uint32_t aEndOffset, nsITextControlFrame::SelectionDirection aDirection) {
// Create a new range to represent the new selection.
// Note that we use a new range to avoid having to do
// isIncreasing checks to avoid possible errors.
// Be careful to use internal nsRange methods which do not check to make sure
// we have access to the node.
// XXXbz nsRange::SetStartAndEnd takes int32_t (and ranges generally work on
// int32_t), but we're passing uint32_t. The good news is that at this point
// our endpoints should really be within our length, so not really that big.
// And if they _are_ that big, SetStartAndEnd() will simply error out, which
// is not too bad for a case we don't expect to happen.
ErrorResult error;
RefPtr<nsRange> range =
nsRange::Create(aStartNode, aStartOffset, aEndNode, aEndOffset, error);
if (NS_WARN_IF(error.Failed())) {
return error.StealNSResult();
}
MOZ_ASSERT(range);
// Get the selection, clear it and add the new range to it!
TextControlElement* textControlElement =
TextControlElement::FromNode(GetContent());
@@ -831,16 +812,10 @@ nsresult nsTextControlFrame::SetSelectionInternal(
direction = (aDirection == eBackward) ? eDirPrevious : eDirNext;
}
selection->RemoveAllRanges(error);
if (NS_WARN_IF(error.Failed())) {
return error.StealNSResult();
}
selection->AddRangeAndSelectFramesAndNotifyListeners(
*range, error); // NOTE: can destroy the world
if (NS_WARN_IF(error.Failed())) {
return error.StealNSResult();
}
ErrorResult error;
selection->SetStartAndEndInLimiter(*aStartNode, aStartOffset, *aEndNode,
aEndOffset, error);
MOZ_TRY(error.StealNSResult());
selection->SetDirection(direction);
return NS_OK;