html: move <link> element from after <head> into <head>

Pass tests1.dat, test 85: <head><meta></head><link> | <html> | <head> | <meta> | <link> | <body> R=nigeltao CC=golang-dev https://golang.org/cl/5297079

html: move <link> element from after <head> into <head>
46308d7d · Andrew Balholm · Nigel Tao · a7f1141d · 46308d7d · 46308d7d
Commit 46308d7d authored Nov 04, 2011 by Andrew Balholm Committed by Nigel Tao Nov 04, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

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

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
@@ -427,6 +427,7 @@ func beforeHeadIM(p *parser) (insertionMode, bool) {
 	}
 	if add || implied {
 		p.addElement("head", attr)
+		p.head = p.top()
 	}
 	return inHeadIM, !implied
 }
@@ -511,7 +512,9 @@ func afterHeadIM(p *parser) (insertionMode, bool) {
 		case "frameset":
 			// TODO.
 		case "base", "basefont", "bgsound", "link", "meta", "noframes", "script", "style", "title":
-			// TODO.
+			p.oe = append(p.oe, p.head)
+			defer p.oe.pop()
+			return useTheRulesFor(p, afterHeadIM, inHeadIM)
 		case "head":
 			// TODO.
 		default:

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -133,7 +133,7 @@ func TestParser(t *testing.T) {
 		rc := make(chan io.Reader)
 		go readDat(filename, rc)
 		// TODO(nigeltao): Process all test cases, not just a subset.
-		for i := 0; i < 85; i++ {
+		for i := 0; i < 86; i++ {
 			// Parse the #data section.
 			b, err := ioutil.ReadAll(<-rc)
 			if err != nil {