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 766181 - Require Selection::AddItem's aOutIndex param. r=roc

Browse Source
This commit is contained in:
Graeme McCutcheon 2012-09-17 14:54:01 +01:00
parent 834326712b
commit 6e3081b400
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/generic/Selection.h
View File

@ -85,7 +85,7 @@ public:
int32_t aFlags = 0);
nsresult SubtractRange(RangeData* aRange, nsRange* aSubtract,
nsTArray<RangeData>* aOutput);
nsresult AddItem(nsRange *aRange, int32_t* aOutIndex = nullptr);
nsresult AddItem(nsRange *aRange, int32_t* aOutIndex);
nsresult RemoveItem(nsRange *aRange);
nsresult RemoveCollapsedRanges();
nsresult Clear(nsPresContext* aPresContext);

18
layout/generic/nsSelection.cpp
View File

@ -3452,8 +3452,10 @@ Selection::AddItem(nsRange* aItem, int32_t* aOutIndex)
return NS_ERROR_NULL_POINTER;
if (!aItem->IsPositioned())
return NS_ERROR_UNEXPECTED;
if (aOutIndex)
*aOutIndex = -1;
NS_ASSERTION(aOutIndex, "aOutIndex can't be null");
*aOutIndex = -1;
// a common case is that we have no ranges yet
if (mRanges.Length() == 0) {
@ -3461,8 +3463,7 @@ Selection::AddItem(nsRange* aItem, int32_t* aOutIndex)
return NS_ERROR_OUT_OF_MEMORY;
aItem->SetInSelection(true);
if (aOutIndex)
*aOutIndex = 0;
*aOutIndex = 0;
return NS_OK;
}
@ -3492,8 +3493,7 @@ Selection::AddItem(nsRange* aItem, int32_t* aOutIndex)
aItem->GetEndParent(),
aItem->EndOffset(), startIndex);
if (sameRange) {
if (aOutIndex)
*aOutIndex = startIndex;
*aOutIndex = startIndex;
return NS_OK;
}
@ -3502,8 +3502,7 @@ Selection::AddItem(nsRange* aItem, int32_t* aOutIndex)
if (!mRanges.InsertElementAt(startIndex, RangeData(aItem)))
return NS_ERROR_OUT_OF_MEMORY;
aItem->SetInSelection(true);
if (aOutIndex)
*aOutIndex = startIndex;
*aOutIndex = startIndex;
return NS_OK;
}
@ -4572,7 +4571,8 @@ Selection::Collapse(nsINode* aParentNode, int32_t aOffset)
}
#endif
result = AddItem(range);
int32_t rangeIndex = -1;
result = AddItem(range, &rangeIndex);
if (NS_FAILED(result))
return result;
setAnchorFocusRange(0);