html: don't run "adoption agency" on elements that aren't in scope.

Pass tests1.dat, test 55: <!DOCTYPE html><font><table></font></table></font> | <!DOCTYPE html> | <html> | <head> | <body> | <font> | <table> Also pass tests through test 69: <DIV> abc <B> def <I> ghi <P> jkl R=nigeltao CC=golang-dev https://golang.org/cl/5309074

html: don't run "adoption agency" on elements that aren't in scope.
03f163c7 · Andrew Balholm · Nigel Tao · 0e81e508 · 03f163c7 · 03f163c7
Commit 03f163c7 authored Oct 28, 2011 by Andrew Balholm Committed by Nigel Tao Oct 28, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

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

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
@@ -675,6 +675,10 @@ func (p *parser) inBodyEndTagFormatting(tag string) {
 			p.afe.remove(formattingElement)
 			return
 		}
+		if !p.elementInScope(defaultScopeStopTags, tag) {
+			// Ignore the tag.
+			return
+		}

 		// Steps 5-6. Find the furthest block.
 		var furthestBlock *Node

--- a/src/pkg/html/parse_test.go
+++ b/src/pkg/html/parse_test.go
@@ -132,7 +132,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 < 55; i++ {
+		for i := 0; i < 70; i++ {
 			// Parse the #data section.
 			b, err := ioutil.ReadAll(<-rc)
 			if err != nil {