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

Bug 1250401 - HTMLOptionElement::GetSelect should not return an element if we have nested OptGroup elements, r=bz

Browse Source
This commit is contained in:
Andrea Marchesini
2016-03-03 09:03:44 +01:00
parent d004b449f6
commit e21269659b
3 changed files with 98 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
dom/html/HTMLOptionElement.cpp
View File

@@ -354,19 +354,17 @@ HTMLOptionElement::IntrinsicState() const
HTMLSelectElement*
HTMLOptionElement::GetSelect()
{
nsIContent* parent = this;
while ((parent = parent->GetParent()) &&
parent->IsHTMLElement()) {
HTMLSelectElement* select = HTMLSelectElement::FromContent(parent);
if (select) {
return select;
}
if (!parent->IsHTMLElement(nsGkAtoms::optgroup)) {
break;
}
nsIContent* parent = GetParent();
HTMLSelectElement* select = HTMLSelectElement::FromContentOrNull(parent);
if (select) {
return select;
}
return nullptr;
if (!parent->IsHTMLElement(nsGkAtoms::optgroup)) {
return nullptr;
}
return HTMLSelectElement::FromContentOrNull(parent->GetParent());
}
already_AddRefed<HTMLOptionElement>