html: close <button> element before opening a new one

Pass tests6.dat, test 13: <button><button> | <html> | <head> | <body> | <button> | <button> Also pass tests through test 25: <table><colgroup>foo R=nigeltao CC=golang-dev https://golang.org/cl/5487072

html: close <button> element before opening a new one
e25a83d0 · Andrew Balholm · Nigel Tao · 3c638f28 · e25a83d0 · e25a83d0
Commit e25a83d0 authored Dec 14, 2011 by Andrew Balholm Committed by Nigel Tao Dec 14, 2011
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

src/pkg/html/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
@@ -734,6 +734,11 @@ func inBodyIM(p *parser) bool {
 		case "plaintext":
 			p.popUntil(buttonScopeStopTags, "p")
 			p.addElement(p.tok.Data, p.tok.Attr)
+		case "button":
+			p.popUntil(defaultScopeStopTags, "button")
+			p.reconstructActiveFormattingElements()
+			p.addElement(p.tok.Data, p.tok.Attr)
+			p.framesetOK = false
 		case "optgroup", "option":
 			if p.top().Data == "option" {
 				p.oe.pop()

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -172,7 +172,7 @@ func TestParser(t *testing.T) {
 		{"tests3.dat", -1},
 		{"tests4.dat", -1},
 		{"tests5.dat", -1},
-		{"tests6.dat", 13},
+		{"tests6.dat", 26},
 	}
 	for _, tf := range testFiles {
 		f, err := os.Open("testdata/webkit/" + tf.filename)