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

Bug 1343037 part 13. Implement nsTextEditorState::SetSelectionEnd. r=ehsan

Browse Source 
This introduces three behavior changes:

1)  Before this change, in cached mode, we did not enforce the "start <= end"
    invariant.
2)  Before this change, in cached mode, we did not fire "select" events on
    selectionEnd changes.
3)  Changes the IDL type of HTMLInputElement's selectionEnd attribute to
    "unsigned long" to match the spec and HTMLTextareaElement.

MozReview-Commit-ID: J3Gkhr8VnbS
This commit is contained in:
Boris Zbarsky
2017-03-09 14:44:05 -05:00
parent f1bf8c9867
commit 5751a40e69
7 changed files with 72 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dom/html/HTMLInputElement.cpp
View File

@@ -6459,22 +6459,22 @@ HTMLInputElement::SetSelectionStart(const Nullable<uint32_t>& aSelectionStart,
state->SetSelectionStart(aSelectionStart, aRv);
}
Nullable<int32_t>
Nullable<uint32_t>
HTMLInputElement::GetSelectionEnd(ErrorResult& aRv)
{
if (!SupportsTextSelection()) {
return Nullable<int32_t>();
return Nullable<uint32_t>();
}
int32_t selEnd = GetSelectionEndIgnoringType(aRv);
uint32_t selEnd = GetSelectionEndIgnoringType(aRv);
if (aRv.Failed()) {
return Nullable<int32_t>();
return Nullable<uint32_t>();
}
return Nullable<int32_t>(selEnd);
return Nullable<uint32_t>(selEnd);
}
int32_t
uint32_t
HTMLInputElement::GetSelectionEndIgnoringType(ErrorResult& aRv)
{
int32_t selEnd, selStart;
@@ -6483,7 +6483,7 @@ HTMLInputElement::GetSelectionEndIgnoringType(ErrorResult& aRv)
}
void
HTMLInputElement::SetSelectionEnd(const Nullable<int32_t>& aSelectionEnd,
HTMLInputElement::SetSelectionEnd(const Nullable<uint32_t>& aSelectionEnd,
ErrorResult& aRv)
{
if (!SupportsTextSelection()) {
@@ -6491,35 +6491,9 @@ HTMLInputElement::SetSelectionEnd(const Nullable<int32_t>& aSelectionEnd,
return;
}
int32_t selEnd = 0;
if (!aSelectionEnd.IsNull()) {
selEnd = aSelectionEnd.Value();
}
nsTextEditorState* state = GetEditorState();
if (state && state->IsSelectionCached()) {
state->GetSelectionProperties().SetEnd(selEnd);
return;
}
nsAutoString direction;
GetSelectionDirection(direction, aRv);
if (aRv.Failed()) {
return;
}
int32_t start, end;
GetSelectionRange(&start, &end, aRv);
if (aRv.Failed()) {
return;
}
end = selEnd;
if (start > end) {
start = end;
}
aRv = SetSelectionRange(start, end, direction);
MOZ_ASSERT(state, "SupportsTextSelection() returned true!");
state->SetSelectionEnd(aSelectionEnd, aRv);
}
NS_IMETHODIMP