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

Bug 1521853 - Remove Throws annotation from some infallible HTMLOptionsCollection/HTMLSelectElement properties. r=qdot

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D17265
This commit is contained in:
Peter Van der Beken
2019-01-22 19:03:07 +00:00
parent a3fa6a450e
commit 77167d21e5
11 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dom/html/HTMLSelectElement.cpp
View File

@@ -622,8 +622,7 @@ nsIHTMLCollection* HTMLSelectElement::SelectedOptions() {
return mSelectedOptions;
}
nsresult HTMLSelectElement::SetSelectedIndexInternal(int32_t aIndex,
bool aNotify) {
void HTMLSelectElement::SetSelectedIndexInternal(int32_t aIndex, bool aNotify) {
int32_t oldSelectedIndex = mSelectedIndex;
uint32_t mask = IS_SELECTED | CLEAR_ALL | SET_DISABLED;
if (aNotify) {
@@ -632,15 +631,12 @@ nsresult HTMLSelectElement::SetSelectedIndexInternal(int32_t aIndex,
SetOptionsSelectedByIndex(aIndex, aIndex, mask);
nsresult rv = NS_OK;
nsISelectControlFrame* selectFrame = GetSelectFrame();
if (selectFrame) {
rv = selectFrame->OnSetSelectedIndex(oldSelectedIndex, mSelectedIndex);
selectFrame->OnSetSelectedIndex(oldSelectedIndex, mSelectedIndex);
}
SetSelectionChanged(true, aNotify);
return rv;
}
bool HTMLSelectElement::IsOptionSelectedByIndex(int32_t aIndex) {
@@ -995,8 +991,7 @@ bool HTMLSelectElement::SelectSomething(bool aNotify) {
nsresult rv = IsOptionDisabled(i, &disabled);
if (NS_FAILED(rv) || !disabled) {
rv = SetSelectedIndexInternal(i, aNotify);
NS_ENSURE_SUCCESS(rv, false);
SetSelectedIndexInternal(i, aNotify);
UpdateValueMissingValidityState();
UpdateState(aNotify);