html: parse <frameset> inside body

Pass tests6.dat, test 47: <param><frameset></frameset> | <html> | <head> | <frameset> Also pass remaining tests in tests6.dat. R=nigeltao CC=golang-dev https://golang.org/cl/5489136

html: parse <frameset> inside body
Pass tests6.dat, test 47: <param><frameset></frameset> | <html> | <head> | <frameset> Also pass remaining tests in tests6.dat. R=nigeltao CC=golang-dev https://golang.org/cl/5489136
99fed2be · Andrew Balholm · Nigel Tao · 7ccd505d · 99fed2be · 99fed2be
Commit 99fed2be authored Jan 04, 2012 by Andrew Balholm Committed by Nigel Tao Jan 04, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

src/pkg/html/parse.go src/pkg/html/parse.go +13 -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
@@ -749,6 +749,19 @@ func inBodyIM(p *parser) bool {
 					copyAttributes(body, p.tok)
 				}
 			}
+		case "frameset":
+			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].Data != "body" {
+				// Ignore the token.
+				return true
+			}
+			body := p.oe[1]
+			if body.Parent != nil {
+				body.Parent.Remove(body)
+			}
+			p.oe = p.oe[:1]
+			p.addElement(p.tok.Data, p.tok.Attr)
+			p.im = inFramesetIM
+			return true
 		case "base", "basefont", "bgsound", "command", "link", "meta", "noframes", "script", "style", "title":
 			return inHeadIM(p)
 		case "image":

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -183,7 +183,7 @@ func TestParser(t *testing.T) {
 		{"tests3.dat", -1},
 		{"tests4.dat", -1},
 		{"tests5.dat", -1},
-		{"tests6.dat", 47},
+		{"tests6.dat", -1},
 		{"tests10.dat", 30},
 	}
 	for _, tf := range testFiles {