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

Bug 1469112: Use HTMLSlotElement::FromNode more consistently. r=smaug

Browse Source 
MozReview-Commit-ID: 1k8lVazP0lR
This commit is contained in:
Emilio Cobos Álvarez
2018-06-15 20:14:02 -07:00
parent 7eea076ffe
commit 8dd7ee1481
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dom/html/HTMLSlotElement.cpp
View File

@@ -130,15 +130,15 @@ FlattenAssignedNodes(HTMLSlotElement* aSlot, nsTArray<RefPtr<nsINode>>& aNodes)
// If assignedNodes is empty, use children of slot as fallback content.
if (assignedNodes.IsEmpty()) {
for (nsIContent* child = aSlot->AsContent()->GetFirstChild();
for (nsIContent* child = aSlot->GetFirstChild();
child;
child = child->GetNextSibling()) {
if (!child->IsSlotable()) {
continue;
}
if (child->IsHTMLElement(nsGkAtoms::slot)) {
FlattenAssignedNodes(HTMLSlotElement::FromNode(child), aNodes);
if (auto* slot = HTMLSlotElement::FromNode(child)) {
FlattenAssignedNodes(slot, aNodes);
} else {
aNodes.AppendElement(child);
}
@@ -146,11 +146,9 @@ FlattenAssignedNodes(HTMLSlotElement* aSlot, nsTArray<RefPtr<nsINode>>& aNodes)
return;
}
for (uint32_t i = 0; i < assignedNodes.Length(); i++) {
nsINode* assignedNode = assignedNodes[i];
if (assignedNode->IsHTMLElement(nsGkAtoms::slot)) {
FlattenAssignedNodes(
HTMLSlotElement::FromNode(assignedNode->AsContent()), aNodes);
for (const RefPtr<nsINode>& assignedNode : assignedNodes) {
if (auto* slot = HTMLSlotElement::FromNode(assignedNode)) {
FlattenAssignedNodes(slot, aNodes);
} else {
aNodes.AppendElement(assignedNode);
}