html: remove special procedure for <template> in frameset im

See more details: https://bugs.chromium.org/p/chromium/issues/detail?id=829668 Updates golang/go#23071 Change-Id: Ib9c963269f814c3f21d3784754729df57dcc8f90 Reviewed-on: https://go-review.googlesource.com/123776 Run-TryBot: Kunpei Sakai <namusyaka@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Nigel Tao <nigeltao@golang.org>

html: remove special procedure for <template> in frameset im
See more details: https://bugs.chromium.org/p/chromium/issues/detail?id=829668 Updates golang/go#23071 Change-Id: Ib9c963269f814c3f21d3784754729df57dcc8f90 Reviewed-on: https://go-review.googlesource.com/123776 Run-TryBot: Kunpei Sakai <namusyaka@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Nigel Tao <nigeltao@golang.org>
aaf60122 · Kunpei Sakai · Nigel Tao · c3942689 · aaf60122 · aaf60122
Commit aaf60122 authored Jul 13, 2018 by Kunpei Sakai Committed by Nigel Tao Aug 16, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 18 deletions

parse.go html/parse.go +1 -12

template.dat html/testdata/webkit/template.dat +0 -6

No files found.
--- a/html/parse.go
+++ b/html/parse.go
@@ -1071,13 +1071,7 @@ func inBodyIM(p *parser) bool {
 				p.acknowledgeSelfClosingTag()
 			}
 			return true
-		case a.Frame:
-			// TODO: remove this divergence from the HTML5 spec.
-			if p.oe.contains(a.Template) {
-				p.addElement()
-				return true
-			}
-		case a.Caption, a.Col, a.Colgroup, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
+		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
 			// Ignore the token.
 		default:
 			p.reconstructActiveFormattingElements()
@@ -1925,11 +1919,6 @@ func inFramesetIM(p *parser) bool {
 			p.acknowledgeSelfClosingTag()
 		case a.Noframes:
 			return inHeadIM(p)
-		case a.Template:
-			// TODO: remove this divergence from the HTML5 spec.
-			//
-			// See https://bugs.chromium.org/p/chromium/issues/detail?id=829668
-			return inTemplateIM(p)
 		}
 	case EndTagToken:
 		switch p.tok.DataAtom {

--- a/html/testdata/webkit/template.dat
+++ b/html/testdata/webkit/template.dat
@@ -477,8 +477,6 @@
 | <html>
 |   <head>
 |   <frameset>
-|     <template>
-|       content
 |     <frame>

 #data
@@ -489,8 +487,6 @@
 |   <head>
 |     <template>
 |       content
-|         <frame>
-|         <frame>
 |   <body>

 #data
@@ -823,8 +819,6 @@
 |   <head>
 |     <template>
 |       content
-|         <frame>
-|         <frame>
 |   <body>

 #data