wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 769791 - Optimize nsSelection::GetIndicesForInterval for adding ranges to the end. r=smaug

Browse Source
This commit is contained in:
Adam Dane [:hobophobe] 2012-07-03 18:19:42 -05:00
parent dc45f76604
commit 45587019f8
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
layout/generic/nsSelection.cpp
View File

@ -3780,10 +3780,34 @@ Selection::GetIndicesForInterval(nsINode* aBeginNode, PRInt32 aBeginOffset,
bool intervalIsCollapsed = aBeginNode == aEndNode &&
aBeginOffset == aEndOffset;
bool doSearches = true;
// Ranges that end before the given interval and begin after the given
// interval can be discarded
PRInt32 endsBeforeIndex;
if (NS_FAILED(FindInsertionPoint(&mRanges, aEndNode, aEndOffset,
PRInt32 beginsAfterIndex;
// Optimization: Check that we're not at/after the end first
PRInt32 cmp;
if (NS_FAILED(CompareToRangeEnd(aBeginNode, aBeginOffset,
mRanges[mRanges.Length() - 1].mRange,
&cmp))) {
return;
} else if (cmp == 1) {
*aEndIndex = mRanges.Length();
return;
} else if (cmp == 0) {
beginsAfterIndex = mRanges.Length() - 1;
if (!intervalIsCollapsed) {
endsBeforeIndex = beginsAfterIndex + 1;
} else {
endsBeforeIndex = beginsAfterIndex;
}
doSearches = false;
}
if (doSearches &&
NS_FAILED(FindInsertionPoint(&mRanges, aEndNode, aEndOffset,
&CompareToRangeStart,
&endsBeforeIndex))) {
return;
@ -3807,14 +3831,12 @@ Selection::GetIndicesForInterval(nsINode* aBeginNode, PRInt32 aBeginOffset,
}
*aEndIndex = endsBeforeIndex;
PRInt32 beginsAfterIndex;
if (NS_FAILED(FindInsertionPoint(&mRanges, aBeginNode, aBeginOffset,
if (doSearches &&
NS_FAILED(FindInsertionPoint(&mRanges, aBeginNode, aBeginOffset,
&CompareToRangeEnd,
&beginsAfterIndex))) {
return;
}
if (beginsAfterIndex == (PRInt32) mRanges.Length())
return; // optimization: all ranges are strictly before us
if (aAllowAdjacent) {
// At this point, one of the following holds: