Title: [138315] trunk
- Revision
- 138315
- Author
- [email protected]
- Date
- 2012-12-20 16:09:20 -0800 (Thu, 20 Dec 2012)
Log Message
Properly process <template> end tags when in TemplateContentsMode
https://bugs.webkit.org/show_bug.cgi?id=105556
Reviewed by Eric Seidel.
Source/WebCore:
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processEndTag): Take care of the FIXME and just call
processTemplateEndTag() instead of incorrectly special-casing the end tag behavior in some cases.
LayoutTests:
* html5lib/resources/template.dat:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (138314 => 138315)
--- trunk/LayoutTests/ChangeLog 2012-12-21 00:04:40 UTC (rev 138314)
+++ trunk/LayoutTests/ChangeLog 2012-12-21 00:09:20 UTC (rev 138315)
@@ -1,3 +1,12 @@
+2012-12-20 Adam Klein <[email protected]>
+
+ Properly process <template> end tags when in TemplateContentsMode
+ https://bugs.webkit.org/show_bug.cgi?id=105556
+
+ Reviewed by Eric Seidel.
+
+ * html5lib/resources/template.dat:
+
2012-12-20 Emil A Eklund <[email protected]>
[flexbox] Fix handling of very large flex grow/shrink values
Modified: trunk/LayoutTests/html5lib/resources/template.dat (138314 => 138315)
--- trunk/LayoutTests/html5lib/resources/template.dat 2012-12-21 00:04:40 UTC (rev 138314)
+++ trunk/LayoutTests/html5lib/resources/template.dat 2012-12-21 00:09:20 UTC (rev 138315)
@@ -859,3 +859,19 @@
| <tbody>
| <tr>
| <tfoot>
+
+#data
+<body><template><template><b><template></template></template>text</template>
+#errors
+#document
+| <html>
+| <head>
+| <body>
+| <template>
+| #document-fragment
+| <template>
+| #document-fragment
+| <b>
+| <template>
+| #document-fragment
+| "text"
Modified: trunk/Source/WebCore/ChangeLog (138314 => 138315)
--- trunk/Source/WebCore/ChangeLog 2012-12-21 00:04:40 UTC (rev 138314)
+++ trunk/Source/WebCore/ChangeLog 2012-12-21 00:09:20 UTC (rev 138315)
@@ -1,3 +1,14 @@
+2012-12-20 Adam Klein <[email protected]>
+
+ Properly process <template> end tags when in TemplateContentsMode
+ https://bugs.webkit.org/show_bug.cgi?id=105556
+
+ Reviewed by Eric Seidel.
+
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processEndTag): Take care of the FIXME and just call
+ processTemplateEndTag() instead of incorrectly special-casing the end tag behavior in some cases.
+
2012-12-20 Kondapally Kalyan <[email protected]>
[EFL][WebGL][Wk2] Replace HAVE(GLX) checks with USE(GLX)
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (138314 => 138315)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2012-12-21 00:04:40 UTC (rev 138314)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2012-12-21 00:09:20 UTC (rev 138315)
@@ -2283,12 +2283,8 @@
break;
case TemplateContentsMode:
#if ENABLE(TEMPLATE_ELEMENT)
- // FIXME: https://www.w3.org/Bugs/Public/show_bug.cgi?id=19966
if (token->name() == templateTag) {
- ASSERT(m_tree.currentStackItem()->hasTagName(templateTag));
- m_tree.openElements()->pop();
- m_templateInsertionModes.removeLast();
- resetInsertionModeAppropriately();
+ processTemplateEndTag(token);
return;
}
setInsertionMode(InBodyMode);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
