Title: [104057] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104056 => 104057)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 19:47:55 UTC (rev 104056)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 19:51:32 UTC (rev 104057)
@@ -1,5 +1,18 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95306
+
+ 2011-09-16 James Simonsen <[email protected]>
+
+ Fix HTML5 parser's adoption agency algorithm to reparent correctly
+ https://bugs.webkit.org/show_bug.cgi?id=68147
+
+ Reviewed by Eric Seidel.
+
+ * html5lib/resources/webkit02.dat:
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95301
2011-09-16 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/LayoutTests/html5lib/resources/webkit02.dat (104056 => 104057)
--- branches/safari-534.54-branch/LayoutTests/html5lib/resources/webkit02.dat 2012-01-04 19:47:55 UTC (rev 104056)
+++ branches/safari-534.54-branch/LayoutTests/html5lib/resources/webkit02.dat 2012-01-04 19:51:32 UTC (rev 104057)
@@ -92,3 +92,35 @@
| <tr>
| <td>
| "A"
+
+#data
+<legend>test</legend>
+#errors
+#document
+| <html>
+| <head>
+| <body>
+| <legend>
+| "test"
+
+#data
+<b><em><dcell><postfield><postfield><postfield><postfield><missing_glyph><missing_glyph><missing_glyph><missing_glyph><hkern><aside></b></em>
+#errors
+#document-fragment
+div
+#document
+| <b>
+| <em>
+| <dcell>
+| <postfield>
+| <postfield>
+| <postfield>
+| <postfield>
+| <missing_glyph>
+| <missing_glyph>
+| <missing_glyph>
+| <missing_glyph>
+| <hkern>
+| <aside>
+| <em>
+| <b>
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104056 => 104057)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 19:47:55 UTC (rev 104056)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 19:51:32 UTC (rev 104057)
@@ -1,5 +1,19 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95306
+
+ 2011-09-16 James Simonsen <[email protected]>
+
+ Fix HTML5 parser's adoption agency algorithm to reparent correctly
+ https://bugs.webkit.org/show_bug.cgi?id=68147
+
+ Reviewed by Eric Seidel.
+
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::callTheAdoptionAgency):
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95301
2011-09-16 Abhishek Arya <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (104056 => 104057)
--- branches/safari-534.54-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2012-01-04 19:47:55 UTC (rev 104056)
+++ branches/safari-534.54-branch/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2012-01-04 19:51:32 UTC (rev 104057)
@@ -1646,7 +1646,7 @@
if (lastNode == furthestBlock)
bookmark.moveToAfter(nodeEntry);
// 6.6
- if (Element* parent = lastNode->element()->parentElement())
+ if (ContainerNode* parent = lastNode->element()->parentNode())
parent->parserRemoveChild(lastNode->element());
node->element()->parserAddChild(lastNode->element());
if (lastNode->element()->parentElement()->attached() && !lastNode->element()->attached())
@@ -1656,7 +1656,7 @@
}
// 7
const AtomicString& commonAncestorTag = commonAncestor->localName();
- if (Element* parent = lastNode->element()->parentElement())
+ if (ContainerNode* parent = lastNode->element()->parentNode())
parent->parserRemoveChild(lastNode->element());
// FIXME: If this moves to HTMLConstructionSite, this check should use
// causesFosterParenting(tagName) instead.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
