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

Bug 1134280 - Get rid of Tag() - patch 1 - Is{HTML,XUL,MathML,SVG}Element and IsAnyOf{HTML,XUL,MathML,SVG}Elements, r=smaug

Browse Source
This commit is contained in:
Andrea Marchesini
2015-03-03 11:08:59 +00:00
parent 6af4c4603d
commit 6b10d5e43e
190 changed files with 786 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dom/html/HTMLSelectElement.cpp
View File

@@ -350,7 +350,7 @@ HTMLSelectElement::InsertOptionsIntoListRecurse(nsIContent* aOptions,
}
// Recurse down into optgroups
if (aOptions->IsHTML(nsGkAtoms::optgroup)) {
if (aOptions->IsHTMLElement(nsGkAtoms::optgroup)) {
mOptGroupCount++;
for (nsIContent* child = aOptions->GetFirstChild();
@@ -391,7 +391,7 @@ HTMLSelectElement::RemoveOptionsFromListRecurse(nsIContent* aOptions,
}
// Recurse down deeper for options
if (mOptGroupCount && aOptions->IsHTML(nsGkAtoms::optgroup)) {
if (mOptGroupCount && aOptions->IsHTMLElement(nsGkAtoms::optgroup)) {
mOptGroupCount--;
for (nsIContent* child = aOptions->GetFirstChild();
@@ -1135,7 +1135,7 @@ HTMLSelectElement::IsOptionDisabled(HTMLOptionElement* aOption)
node;
node = node->GetParentElement()) {
// If we reached the select element, we're done
if (node->IsHTML(nsGkAtoms::select)) {
if (node->IsHTMLElement(nsGkAtoms::select)) {
return false;
}
@@ -1792,7 +1792,7 @@ AddOptionsRecurse(nsIContent* aRoot, HTMLOptionsCollection* aArray)
HTMLOptionElement* opt = HTMLOptionElement::FromContent(cur);
if (opt) {
aArray->AppendOption(opt);
} else if (cur->IsHTML(nsGkAtoms::optgroup)) {
} else if (cur->IsHTMLElement(nsGkAtoms::optgroup)) {
AddOptionsRecurse(cur, aArray);
}
}
@@ -1873,7 +1873,7 @@ VerifyOptionsRecurse(nsIContent* aRoot, int32_t& aIndex,
if (opt) {
NS_ASSERTION(opt == aArray->ItemAsOption(aIndex++),
"Options collection broken");
} else if (cur->IsHTML(nsGkAtoms::optgroup)) {
} else if (cur->IsHTMLElement(nsGkAtoms::optgroup)) {
VerifyOptionsRecurse(cur, aIndex, aArray);
}
}