Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 893909 - Part b: Return void from InsertOptionsIntoList{,Recurse}; r=dzbarsky

Browse Source
This commit is contained in:
Ms2ger 2013-07-24 09:35:08 +02:00
parent 16b01af8bd
commit 3c84aefd10
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
content/html/content/src/HTMLSelectElement.cpp
View File

@ -201,17 +201,15 @@ HTMLSelectElement::RemoveChildAt(uint32_t aIndex, bool aNotify)
}
// SelectElement methods
nsresult
void
HTMLSelectElement::InsertOptionsIntoList(nsIContent* aOptions,
int32_t aListIndex,
int32_t aDepth,
bool aNotify)
{
int32_t insertIndex = aListIndex;
nsresult rv = InsertOptionsIntoListRecurse(aOptions, &insertIndex, aDepth);
NS_ENSURE_SUCCESS(rv, rv);
InsertOptionsIntoListRecurse(aOptions, &insertIndex, aDepth);
// Deal with the selected list
if (insertIndex - aListIndex) {
@ -264,8 +262,6 @@ HTMLSelectElement::InsertOptionsIntoList(nsIContent* aOptions,
CheckSelectSomething(aNotify);
}
return NS_OK;
}
nsresult
@ -320,7 +316,7 @@ HTMLSelectElement::RemoveOptionsFromList(nsIContent* aOptions,
// If the document is such that recursing over these options gets us
// deeper than four levels, there is something terribly wrong with the
// world.
nsresult
void
HTMLSelectElement::InsertOptionsIntoListRecurse(nsIContent* aOptions,
int32_t* aInsertIndex,
int32_t aDepth)
@ -334,7 +330,7 @@ HTMLSelectElement::InsertOptionsIntoListRecurse(nsIContent* aOptions,
if (optElement) {
mOptions->InsertOptionAt(optElement, *aInsertIndex);
(*aInsertIndex)++;
return NS_OK;
return;
}
// If it's at the top level, then we just found out there are non-options
@ -350,13 +346,9 @@ HTMLSelectElement::InsertOptionsIntoListRecurse(nsIContent* aOptions,
for (nsIContent* child = aOptions->GetFirstChild();
child;
child = child->GetNextSibling()) {
nsresult rv = InsertOptionsIntoListRecurse(child,
aInsertIndex, aDepth + 1);
NS_ENSURE_SUCCESS(rv, rv);
InsertOptionsIntoListRecurse(child, aInsertIndex, aDepth + 1);
}
}
return NS_OK;
}
// If the document is such that recursing over these options gets us deeper than
@ -450,7 +442,8 @@ HTMLSelectElement::WillAddOptions(nsIContent* aOptions,
}
}
return InsertOptionsIntoList(aOptions, ind, level, aNotify);
InsertOptionsIntoList(aOptions, ind, level, aNotify);
return NS_OK;
}
NS_IMETHODIMP

14
content/html/content/src/HTMLSelectElement.h
View File

@ -464,10 +464,10 @@ protected:
* @param aListIndex the index to start adding options into the list at
* @param aDepth the depth of aOptions (1=direct child of select ...)
*/
nsresult InsertOptionsIntoList(nsIContent* aOptions,
int32_t aListIndex,
int32_t aDepth,
bool aNotify);
void InsertOptionsIntoList(nsIContent* aOptions,
int32_t aListIndex,
int32_t aDepth,
bool aNotify);
/**
* Remove option(s) from the options[] array
* @param aOptions the option or optgroup being added
@ -484,9 +484,9 @@ protected:
* @param aInsertIndex the index to start adding options into the list at
* @param aDepth the depth of aOptions (1=direct child of select ...)
*/
nsresult InsertOptionsIntoListRecurse(nsIContent* aOptions,
int32_t* aInsertIndex,
int32_t aDepth);
void InsertOptionsIntoListRecurse(nsIContent* aOptions,
int32_t* aInsertIndex,
int32_t aDepth);
/**
* Remove option(s) from the options[] array (called by RemoveOptionsFromList)
* @param aOptions the option or optgroup being added