html: in foreign content, check for HTML integration points in breakout

elements. Pass tests10.dat, test 33: <!DOCTYPE html><svg><desc><svg><ul>a | <!DOCTYPE html> | <html> | <head> | <body> | <svg svg> | <svg desc> | <svg svg> | <ul> | "a" Also pass test 34: <!DOCTYPE html><p><svg><desc><p> R=andybalholm, dsymonds CC=golang-dev https://golang.org/cl/5536048

html: in foreign content, check for HTML integration points in breakout
b4829c1d · Nigel Tao · d4fe9c6a · b4829c1d · b4829c1d
Commit b4829c1d authored Jan 19, 2012 by Nigel Tao
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/pkg/html/parse.go src/pkg/html/parse.go +2 -2

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
@@ -1713,8 +1713,8 @@ func parseForeignContent(p *parser) bool {
 		}
 		if breakout[p.tok.Data] {
 			for i := len(p.oe) - 1; i >= 0; i-- {
-				// TODO: HTML, MathML integration points.
-				if p.oe[i].Namespace == "" {
+				// TODO: MathML integration points.
+				if p.oe[i].Namespace == "" || htmlIntegrationPoint(p.oe[i]) {
 					p.oe = p.oe[:i+1]
 					break
 				}

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