Merge 141198

Source/WebCore/html/parser/HTMLConstructionSite.cpp

Index: Source/WebCore/html/parser/HTMLConstructionSite.cpp
===================================================================
--- Source/WebCore/html/parser/HTMLConstructionSite.cpp	(revision 141792)
+++ Source/WebCore/html/parser/HTMLConstructionSite.cpp	(working copy)
@@ -392,9 +392,6 @@
         ASSERT(currentPosition <= characters.length());
         task.child = textNode.release();
 
-        if (task.parent->document() != task.child->document())
-            task.parent->document()->adoptNode(task.child, ASSERT_NO_EXCEPTION);
-
         executeTask(task);
     }
 }
@@ -490,7 +487,7 @@
     // When a node is to be foster parented, the last template element with no table element is below it in the stack of open elements is the foster parent element (NOT the template's parent!)
     HTMLElementStack::ElementRecord* lastTemplateElement = m_openElements.topmost(templateTag.localName());
     if (lastTemplateElement && !m_openElements.inTableScope(tableTag)) {
-        task.parent = toHTMLTemplateElement(lastTemplateElement->element())->content();
+        task.parent = lastTemplateElement->element();
         return;
     }
 
@@ -528,9 +525,6 @@
     task.child = node;
     ASSERT(task.parent);
 
-    if (task.parent->document() != task.child->document())
-        task.parent->document()->adoptNode(task.child, ASSERT_NO_EXCEPTION);
-
     m_attachmentQueue.append(task);
 }