Merge 95306

Source/WebCore/html/parser/HTMLTreeBuilder.cpp

Index: Source/WebCore/html/parser/HTMLTreeBuilder.cpp
===================================================================
--- Source/WebCore/html/parser/HTMLTreeBuilder.cpp	(revision 95420)
+++ Source/WebCore/html/parser/HTMLTreeBuilder.cpp	(working copy)
@@ -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.