exp/html: allow frameset if body contains whitespace

If the body of an HTML document contains text, the <frameset> tag is ignored. But not if the text is only whitespace. Pass 4 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6442043

exp/html: allow frameset if body contains whitespace
If the body of an HTML document contains text, the <frameset> tag is ignored. But not if the text is only whitespace. Pass 4 additional tests. R=nigeltao CC=golang-dev https://golang.org/cl/6442043
4d225196 · Andrew Balholm · Nigel Tao · 3e980e24 · 4d225196 · 4d225196
Commit 4d225196 authored Jul 25, 2012 by Andrew Balholm Committed by Nigel Tao Jul 25, 2012
3 changed files
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -725,7 +725,10 @@ func inBodyIM(p *parser) bool {
 		}
 		p.reconstructActiveFormattingElements()
 		p.addText(d)
-		p.framesetOK = false
+		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
+			// There were non-whitespace characters inserted.
+			p.framesetOK = false
+		}
 	case StartTagToken:
 		switch p.tok.DataAtom {
 		case a.Html:

--- a/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
+++ b/src/pkg/exp/html/testlogs/plain-text-unsafe.dat.log
 PASS "FOO&#x000D;ZOO"
 PASS "<html>\x00<frameset></frameset>"
-FAIL "<html> \x00 <frameset></frameset>"
+PASS "<html> \x00 <frameset></frameset>"
 PASS "<html>a\x00a<frameset></frameset>"
 PASS "<html>\x00\x00<frameset></frameset>"
-FAIL "<html>\x00\n <frameset></frameset>"
+PASS "<html>\x00\n <frameset></frameset>"
 FAIL "<html><select>\x00"
 PASS "\x00"
 PASS "<body>\x00"

--- a/src/pkg/exp/html/testlogs/tests19.dat.log
+++ b/src/pkg/exp/html/testlogs/tests19.dat.log
@@ -45,7 +45,7 @@ PASS "<html><frameset></frameset></html><!doctype html>"
 PASS "<!doctype html><body><frameset>"
 PASS "<!doctype html><p><frameset><frame>"
 PASS "<!doctype html><p>a<frameset>"
-FAIL "<!doctype html><p> <frameset><frame>"
+PASS "<!doctype html><p> <frameset><frame>"
 PASS "<!doctype html><pre><frameset>"
 PASS "<!doctype html><listing><frameset>"
 PASS "<!doctype html><li><frameset>"
@@ -72,7 +72,7 @@ PASS "<!doctype html><iframe></iframe><frameset>"
 PASS "<!doctype html><select></select><frameset>"
 PASS "<!doctype html><svg></svg><frameset><frame>"
 PASS "<!doctype html><math></math><frameset><frame>"
-FAIL "<!doctype html><svg><foreignObject><div> <frameset><frame>"
+PASS "<!doctype html><svg><foreignObject><div> <frameset><frame>"
 PASS "<!doctype html><svg>a</svg><frameset><frame>"
 PASS "<!doctype html><svg> </svg><frameset><frame>"
 PASS "<html>aaa<frameset></frameset>"