Title: [95421] branches/chromium/874
- Revision
- 95421
- Author
- infe...@chromium.org
- Date
- 2011-09-19 09:38:24 -0700 (Mon, 19 Sep 2011)
Log Message
Merge 95306
BUG=96665
Review URL: http://codereview.chromium.org/7948001
Modified Paths
Diff
Modified: branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat (95420 => 95421)
--- branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat 2011-09-19 16:35:44 UTC (rev 95420)
+++ branches/chromium/874/LayoutTests/html5lib/resources/webkit02.dat 2011-09-19 16:38:24 UTC (rev 95421)
@@ -102,3 +102,25 @@
| <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/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (95420 => 95421)
--- branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-09-19 16:35:44 UTC (rev 95420)
+++ branches/chromium/874/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2011-09-19 16:38:24 UTC (rev 95421)
@@ -1665,7 +1665,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())
@@ -1675,7 +1675,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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
