html: propagate foreign namespaces only when adding foreign content.

Pass tests10.dat, test 31: <div><svg><path><foreignObject><p></div>a | <html> | <head> | <body> | <div> | <svg svg> | <svg path> | <svg foreignObject> | <p> | "a" Also pass test 32: <!DOCTYPE html><svg><desc><div><svg><ul>a R=andybalholm CC=golang-dev https://golang.org/cl/5527064

html: propagate foreign namespaces only when adding foreign content.
aa033c20 · Nigel Tao · dcdc309c · aa033c20 · aa033c20
Commit aa033c20 authored Jan 11, 2012 by Nigel Tao
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

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

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
@@ -243,10 +243,9 @@ func (p *parser) addText(text string) {
 // addElement calls addChild with an element node.
 func (p *parser) addElement(tag string, attr []Attribute) {
 	p.addChild(&Node{
-		Type:      ElementNode,
-		Data:      tag,
-		Namespace: p.top().Namespace,
-		Attr:      attr,
+		Type: ElementNode,
+		Data: tag,
+		Attr: attr,
 	})
 }

@@ -1736,7 +1735,9 @@ func parseForeignContent(p *parser) bool {
 			panic("html: bad parser state: unexpected namespace")
 		}
 		adjustForeignAttributes(p.tok.Attr)
+		namespace := p.top().Namespace
 		p.addElement(p.tok.Data, p.tok.Attr)
+		p.top().Namespace = namespace
 	case EndTagToken:
 		for i := len(p.oe) - 1; i >= 0; i-- {
 			if p.oe[i].Namespace == "" {

--- 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", 31},
+		{"tests10.dat", 33},
 	}
 	for _, tf := range testFiles {
 		f, err := os.Open("testdata/webkit/" + tf.filename)