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

Bug 1343037 part 2. Get rid of nsIDOMHTMLInputElement's selectionEnd accessors. r=ehsan,MattN

Browse Source 
MozReview-Commit-ID: L2Ozu7Vvort
This commit is contained in:
Boris Zbarsky
2017-03-09 14:44:03 -05:00
parent da687175e6
commit b55933e687
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dom/html/HTMLInputElement.cpp
View File

@@ -6507,34 +6507,30 @@ HTMLInputElement::GetSelectionEnd(ErrorResult& aRv)
return Nullable<int32_t>();
}
int32_t selEnd;
nsresult rv = GetSelectionEnd(&selEnd);
if (NS_FAILED(rv)) {
aRv.Throw(rv);
int32_t selEnd = GetSelectionEndIgnoringType(aRv);
if (aRv.Failed()) {
return Nullable<int32_t>();
}
return Nullable<int32_t>(selEnd);
}
NS_IMETHODIMP
HTMLInputElement::GetSelectionEnd(int32_t* aSelectionEnd)
int32_t
HTMLInputElement::GetSelectionEndIgnoringType(ErrorResult& aRv)
{
NS_ENSURE_ARG_POINTER(aSelectionEnd);
int32_t selEnd, selStart;
nsresult rv = GetSelectionRange(&selStart, &selEnd);
if (NS_FAILED(rv)) {
nsTextEditorState* state = GetEditorState();
if (state && state->IsSelectionCached()) {
*aSelectionEnd = state->GetSelectionProperties().GetEnd();
return NS_OK;
return state->GetSelectionProperties().GetEnd();
}
return rv;
aRv.Throw(rv);
return 0;
}
*aSelectionEnd = selEnd;
return NS_OK;
return selEnd;
}
void
@@ -6577,15 +6573,6 @@ HTMLInputElement::SetSelectionEnd(const Nullable<int32_t>& aSelectionEnd,
aRv = SetSelectionRange(start, end, direction);
}
NS_IMETHODIMP
HTMLInputElement::SetSelectionEnd(int32_t aSelectionEnd)
{
ErrorResult rv;
Nullable<int32_t> selEnd(aSelectionEnd);
SetSelectionEnd(selEnd, rv);
return rv.StealNSResult();
}
NS_IMETHODIMP
HTMLInputElement::GetFiles(nsIDOMFileList** aFileList)
{