KotJohansson/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:30:27 +00:00
Code Issues Projects Releases Wiki Activity

Revert "backout bug 1134280 for fixing yandex search "Read more" link"

Browse Source 
This reverts commit 980f33daef.
This commit is contained in:
Roy Tam
2019-04-18 22:23:06 +08:00
parent 980f33daef
commit 01ed5ad3ac
249 changed files with 1850 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/html/HTMLSelectElement.cpp
+5 -5
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();
@@ -1136,7 +1136,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;
}
@@ -1801,7 +1801,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);
}
}
@@ -1882,7 +1882,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);
}
}