Skip to content

Implement circa 2021 spec change for fragment parsing in foreign content #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sideshowbarker merged 1 commit into from
Dec 30, 2025
+21 −13
Merged

Implement circa 2021 spec change for fragment parsing in foreign content #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/nu/validator/htmlparser/impl/TreeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1531,12 +1531,19 @@ public final void startTag(ElementName elementName,
if (!(group == FONT && !(attributes.contains(AttributeName.COLOR)
|| attributes.contains(AttributeName.FACE) || attributes.contains(AttributeName.SIZE)))) {
errHtmlStartTagInForeignContext(name);
if (!fragment) {
while (!isSpecialParentInForeign(stack[currentPtr])) {
popForeign(-1, -1);
}
// Pop until we reach an HTML namespace element,
// HTML integration point, or MathML text integration point.
// In fragment case, stop before popping the context element.
while (currentPtr > 0 && !isSpecialParentInForeign(stack[currentPtr])) {
popForeign(-1, -1);
}
if (currentPtr > 0 || isSpecialParentInForeign(stack[currentPtr])) {
// Popped to an HTML element or integration point
continue starttagloop;
} // else fall thru
}
// In fragment case with foreign context, fall through
// to let switch(mode) handle the token in HTML namespace
break;
}
// CPPONLY: MOZ_FALLTHROUGH;
default:
Expand Down Expand Up @@ -3220,6 +3227,11 @@ public final void endTag(ElementName elementName) throws SAXException {
for (;;) {
if (eltPos == 0) {
assert fragment: "We can get this close to the root of the stack in foreign content only in the fragment case.";
// For </p> and </br>, continue to mode handling
// which will create implied start tags
if (group == P || group == BR) {
break; // break from inner loop, continue to switch(mode)
}
break endtagloop;
}
if (stack[eltPos].name == name) {
Expand Down Expand Up @@ -3564,12 +3576,10 @@ public final void endTag(ElementName elementName) throws SAXException {
eltPos = findLastInButtonScope("p");
if (eltPos == TreeBuilder.NOT_FOUND_ON_STACK) {
errNoElementToCloseButEndTagSeen("p");
// XXX Can the 'in foreign' case happen anymore?
if (isInForeign()) {
errHtmlStartTagInForeignContext(name);
// Check for currentPtr for the fragment
// case.
while (currentPtr >= 0 && stack[currentPtr].ns != "http://www.w3.org/1999/xhtml") {
// Pop foreign elements, but keep context element in fragment case
while (currentPtr > 0 && stack[currentPtr].ns != "http://www.w3.org/1999/xhtml") {
pop();
}
}
Expand Down Expand Up @@ -3650,11 +3660,9 @@ public final void endTag(ElementName elementName) throws SAXException {
case BR:
errEndTagBr();
if (isInForeign()) {
// XXX can this happen anymore?
errHtmlStartTagInForeignContext(name);
// Check for currentPtr for the fragment
// case.
while (currentPtr >= 0 && stack[currentPtr].ns != "http://www.w3.org/1999/xhtml") {
// Pop foreign elements, but keep context element in fragment case
while (currentPtr > 0 && stack[currentPtr].ns != "http://www.w3.org/1999/xhtml") {
pop();
}
}
Expand Down