qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 21:14:47 -07:00
Code Releases Activity

html: parse the contents of <iframe> elements as raw text

Browse Source 
Pass tests5.dat, test 4:
<iframe> <!---> </iframe>x

| <html>
|   <head>
|   <body>
|     <iframe>
|       " <!---> "
|     "x"

Also pass tests through test 9:
<style> <!</-- </style>x

R=nigeltao
CC=golang-dev
https://golang.org/cl/5450044
This commit is contained in:
Andrew Balholm 2011-11-30 11:44:54 +11:00 committed by Nigel Tao
parent 72a2979ef0
commit e32f4ba77d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/html/parse_test.go
View File

@ -153,6 +153,8 @@ func TestParser(t *testing.T) {
{"tests1.dat", -1}, {"tests1.dat", -1},
{"tests2.dat", -1}, {"tests2.dat", -1},
{"tests3.dat", -1}, {"tests3.dat", -1},
// tests4.dat is fragment cases.
{"tests5.dat", 10},
} }
for _, tf := range testFiles { for _, tf := range testFiles {
f, err := os.Open("testdata/webkit/" + tf.filename) f, err := os.Open("testdata/webkit/" + tf.filename)

2
src/pkg/html/render.go
View File

@ -185,7 +185,7 @@ func render1(w writer, n *Node) error {
// Render any child nodes. // Render any child nodes.
switch n.Data { switch n.Data {
case "noembed", "noframes", "noscript", "plaintext", "script", "style": case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style":
for _, c := range n.Child { for _, c := range n.Child {
if c.Type != TextNode { if c.Type != TextNode {
return fmt.Errorf("html: raw text element <%s> has non-text child node", n.Data) return fmt.Errorf("html: raw text element <%s> has non-text child node", n.Data)

7
src/pkg/html/token.go
View File

@ -405,14 +405,13 @@ func (z *Tokenizer) readStartTag() TokenType {
break break
} }
} }
// Any "<noembed>", "<noframes>", "<noscript>", "<plaintext", "<script>", "<style>", // Several tags flag the tokenizer's next token as raw.
// "<textarea>" or "<title>" tag flags the tokenizer's next token as raw.
// The tag name lengths of these special cases ranges in [5, 9]. // The tag name lengths of these special cases ranges in [5, 9].
if x := z.data.end - z.data.start; 5 <= x && x <= 9 { if x := z.data.end - z.data.start; 5 <= x && x <= 9 {
switch z.buf[z.data.start] { switch z.buf[z.data.start] {
case 'n', 'p', 's', 't', 'N', 'P', 'S', 'T': case 'i', 'n', 'p', 's', 't', 'I', 'N', 'P', 'S', 'T':
switch s := strings.ToLower(string(z.buf[z.data.start:z.data.end])); s { switch s := strings.ToLower(string(z.buf[z.data.start:z.data.end])); s {
case "noembed", "noframes", "noscript", "plaintext", "script", "style", "textarea", "title": case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "textarea", "title":
z.rawTag = s z.rawTag = s
} }
} }