exp/html: when ignoring <textarea> tag, switch tokenizer out of raw text mode

Pass 1 additional test.

R=nigeltao
CC=golang-dev
https://golang.org/cl/6459060

diff --git a/src/pkg/exp/html/parse.go b/src/pkg/exp/html/parse.go
index be33245600b2cad188a81339f44f999b48187565..03c007e1cd6771173e9a397fdfe3e15e0584153b 100644 (file)
--- a/src/pkg/exp/html/parse.go
+++ b/src/pkg/exp/html/parse.go
@@ -1618,6 +1618,8 @@ func inSelectIM(p *parser) bool {
                                return false
                        }
                        // Ignore the token.
+                       // In order to properly ignore <textarea>, we need to change the tokenizer mode.
+                       p.tokenizer.rawTag = ""
                        return true
                case a.Script:
                        return inHeadIM(p)

diff --git a/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log b/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
index f34bb783ac148f4b30b9fa3b493ee72c942a470d..d3df267de9bb25933c9c646f4c03015225b42984 100644 (file)
--- a/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
+++ b/src/pkg/exp/html/testlogs/tests_innerHTML_1.dat.log
@@ -79,7 +79,7 @@ PASS "<table><td><td>"
 PASS "</select><option>"
 PASS "<input><option>"
 PASS "<keygen><option>"
-FAIL "<textarea><option>"
+PASS "<textarea><option>"
 FAIL "</html><!--abc-->"
 PASS "</frameset><frame>"
 PASS ""