wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 23:38:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1367683 - Optimize initializing nsRange

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

85
layout/generic/nsSelection.cpp
View file

@ -1788,8 +1788,7 @@ nsFrameSelection::TakeFocus(nsIContent* aNewFocus,
RefPtr<nsRange> newRange = new nsRange(aNewFocus);
newRange->SetStart(aNewFocus, aContentOffset);
newRange->SetEnd(aNewFocus, aContentOffset);
newRange->CollapseTo(aNewFocus, aContentOffset);
mDomSelections[index]->AddRange(newRange);
mBatching = batching;
mChangesDuringBatching = changes;
@ -3352,10 +3351,11 @@ nsFrameSelection::CreateAndAddRange(nsINode *aParentNode, int32_t aOffset)
RefPtr<nsRange> range = new nsRange(aParentNode);
// Set range around child at given offset
nsresult result = range->SetStart(aParentNode, aOffset);
if (NS_FAILED(result)) return result;
result = range->SetEnd(aParentNode, aOffset+1);
if (NS_FAILED(result)) return result;
nsresult rv = range->SetStartAndEnd(aParentNode, aOffset,
aParentNode, aOffset + 1);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
int8_t index = GetIndexFromSelectionType(SelectionType::eNormal);
if (!mDomSelections[index])
@ -3780,13 +3780,12 @@ Selection::SubtractRange(RangeData* aRange, nsRange* aSubtract,
// We need to add a new RangeData to the output, running from
// the end of aSubtract to the end of range
RefPtr<nsRange> postOverlap = new nsRange(aSubtract->GetEndParent());
rv =
postOverlap->SetStart(aSubtract->GetEndParent(), aSubtract->EndOffset());
NS_ENSURE_SUCCESS(rv, rv);
rv =
postOverlap->SetEnd(range->GetEndParent(), range->EndOffset());
NS_ENSURE_SUCCESS(rv, rv);
rv = postOverlap->SetStartAndEnd(
aSubtract->GetEndParent(), aSubtract->EndOffset(),
range->GetEndParent(), range->EndOffset());
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
if (!postOverlap->Collapsed()) {
if (!aOutput->InsertElementAt(0, RangeData(postOverlap)))
return NS_ERROR_OUT_OF_MEMORY;
@ -3799,12 +3798,12 @@ Selection::SubtractRange(RangeData* aRange, nsRange* aSubtract,
// the start of the range to the start of aSubtract
RefPtr<nsRange> preOverlap = new nsRange(range->GetStartParent());
nsresult rv =
preOverlap->SetStart(range->GetStartParent(), range->StartOffset());
NS_ENSURE_SUCCESS(rv, rv);
rv =
preOverlap->SetEnd(aSubtract->GetStartParent(), aSubtract->StartOffset());
NS_ENSURE_SUCCESS(rv, rv);
rv = preOverlap->SetStartAndEnd(
range->GetStartParent(), range->StartOffset(),
aSubtract->GetStartParent(), aSubtract->StartOffset());
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
if (!preOverlap->Collapsed()) {
if (!aOutput->InsertElementAt(0, RangeData(preOverlap)))
@ -5186,12 +5185,7 @@ Selection::Collapse(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
RefPtr<nsRange> range = new nsRange(parentNode);
result = range->SetEnd(parentNode, aOffset);
if (NS_FAILED(result)) {
aRv.Throw(result);
return;
}
result = range->SetStart(parentNode, aOffset);
result = range->CollapseTo(parentNode, aOffset);
if (NS_FAILED(result)) {
aRv.Throw(result);
return;
@ -5579,11 +5573,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
return;
}
SetDirection(eDirNext);
res = difRange->SetEnd(range->GetEndParent(), range->EndOffset());
nsresult tmp = difRange->SetStart(focusNode, focusOffset);
if (NS_FAILED(tmp)) {
res = tmp;
}
res = difRange->SetStartAndEnd(focusNode, focusOffset,
range->GetEndParent(), range->EndOffset());
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@ -5611,11 +5602,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
else if (result3 <= 0 && result2 >= 0) {//a,2,1 or a2,1 or a,21 or a21
//deselect from 2 to 1
res = difRange->SetEnd(focusNode, focusOffset);
difRange->SetStart(aParentNode, aOffset, aRv);
if (aRv.Failed()) {
return;
}
res = difRange->SetStartAndEnd(&aParentNode, aOffset,
focusNode, focusOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@ -5678,11 +5666,8 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
else if (result2 <= 0 && result3 >= 0) {//1,2,a or 12,a or 1,2a or 12a
//deselect from 1 to 2
difRange->SetEnd(aParentNode, aOffset, aRv);
res = difRange->SetStart(focusNode, focusOffset);
if (aRv.Failed()) {
return;
}
res = difRange->SetStartAndEnd(focusNode, focusOffset,
&aParentNode, aOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@ -5713,15 +5698,9 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
}
//deselect from a to 1
if (focusNode != anchorNode || focusOffset!= anchorOffset) {//if collapsed diff dont do anything
res = difRange->SetStart(anchorNode, anchorOffset);
nsresult tmp = difRange->SetEnd(focusNode, focusOffset);
if (NS_FAILED(tmp)) {
res = tmp;
}
tmp = SetAnchorFocusToRange(range);
if (NS_FAILED(tmp)) {
res = tmp;
}
res = difRange->SetStartAndEnd(anchorNode, anchorOffset,
focusNode, focusOffset);
nsresult tmp = SetAnchorFocusToRange(range);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;
@ -5746,11 +5725,9 @@ Selection::Extend(nsINode& aParentNode, uint32_t aOffset, ErrorResult& aRv)
return;
}
SetDirection(eDirPrevious);
res = difRange->SetEnd(focusNode, focusOffset);
nsresult tmp = difRange->SetStart(range->GetStartParent(), range->StartOffset());
if (NS_FAILED(tmp)) {
res = tmp;
}
res = difRange->SetStartAndEnd(
range->GetStartParent(), range->StartOffset(),
focusNode, focusOffset);
if (NS_FAILED(res)) {
aRv.Throw(res);
return;