html: properly close <marquee> elements.

Pass tests1.dat, test 80: <a href=a>aa<marquee>aa<a href=b>bb</marquee>aa | <html> | <head> | <body> | <a> | href="a" | "aa" | <marquee> | "aa" | <a> | href="b" | "bb" | "aa" Also pass tests through test 82: <!DOCTYPE html><spacer>foo R=nigeltao CC=golang-dev https://golang.org/cl/5319071

html: properly close <marquee> elements.
cf6a7121 · Andrew Balholm · Nigel Tao · 33f1d47b · cf6a7121 · cf6a7121
Commit cf6a7121 authored Nov 02, 2011 by Andrew Balholm Committed by Nigel Tao Nov 02, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

parse.go src/pkg/html/parse.go +4 -0

parse_test.go src/pkg/html/parse_test.go +1 -1

No files found.
--- a/src/pkg/html/parse.go
+++ b/src/pkg/html/parse.go
@@ -635,6 +635,10 @@ func inBodyIM(p *parser) (insertionMode, bool) {
 			p.inBodyEndTagFormatting(p.tok.Data)
 		case "address", "article", "aside", "blockquote", "button", "center", "details", "dir", "div", "dl", "fieldset", "figcaption", "figure", "footer", "header", "hgroup", "listing", "menu", "nav", "ol", "pre", "section", "summary", "ul":
 			p.popUntil(defaultScopeStopTags, p.tok.Data)
+		case "applet", "marquee", "object":
+			if p.popUntil(defaultScopeStopTags, p.tok.Data) {
+				p.clearActiveFormattingElements()
+			}
 		default:
 			p.inBodyEndTagOther(p.tok.Data)
 		}

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -133,7 +133,7 @@ func TestParser(t *testing.T) {
 		rc := make(chan io.Reader)
 		go readDat(filename, rc)
 		// TODO(nigeltao): Process all test cases, not just a subset.
-		for i := 0; i < 80; i++ {
+		for i := 0; i < 83; i++ {
 			// Parse the #data section.
 			b, err := ioutil.ReadAll(<-rc)
 			if err != nil {