Merge 67357

WebCore/html/parser/HTMLTreeBuilder.cpp

 /*
  * Copyright (C) 2010 Google, Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1578 matching lines @@
     for (; record; record = record->next()) {
         if (record->element() == formattingElement)
             return furthestBlock;
         if (isSpecialNode(record->element()))
             furthestBlock = record;
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
-// FIXME: This should have a whitty name.
-// FIXME: This must be implemented in many other places in WebCore.
-void HTMLTreeBuilder::reparentChildren(Element* oldParent, Element* newParent)
-{
-    Node* child = oldParent->firstChild();
-    while (child) {
-        Node* nextChild = child->nextSibling();
-        oldParent->parserRemoveChild(child);
-        newParent->parserAddChild(child);
-        if (newParent->attached() && !child->attached())
-            child->attach();
-        child = nextChild;
-    }
-}
-
 // http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#parsing-main-inbody
 void HTMLTreeBuilder::callTheAdoptionAgency(AtomicHTMLToken& token)
 {
     // The adoption agency algorithm is N^2.  We limit the number of iterations
     // to stop from hanging the whole browser.  This limit is copied from the
     // legacy tree builder and might need to be tweaked in the future.
     static const int adoptionAgencyIterationLimit = 10;
 
     for (int i = 0; i < adoptionAgencyIterationLimit; ++i) {
         // 1.
@@ skipping 72 matching lines @@
             || isTableBodyContextTag(commonAncestorTag))
             m_tree.fosterParent(lastNode->element());
         else {
             commonAncestor->parserAddChild(lastNode->element());
             if (lastNode->element()->parentElement()->attached() && !lastNode->element()->attached())
                 lastNode->element()->lazyAttach();
         }
         // 8
         RefPtr<Element> newElement = m_tree.createHTMLElementFromElementRecord(formattingElementRecord);
         // 9
-        reparentChildren(furthestBlock->element(), newElement.get());
+        newElement->takeAllChildrenFrom(furthestBlock->element());
         // 10
         Element* furthestBlockElement = furthestBlock->element();
         // FIXME: All this creation / parserAddChild / attach business should
         //        be in HTMLConstructionSite.  My guess is that steps 8--12
         //        should all be in some HTMLConstructionSite function.
         furthestBlockElement->parserAddChild(newElement);
         if (furthestBlockElement->attached() && !newElement->attached()) {
             // Notice that newElement might already be attached if, for example, one of the reparented
             // children is a style element, which attaches itself automatically.
             newElement->attach();
@@ skipping 1134 matching lines @@
         return false;
     // -0 -> 0
     if (!value)
         value = 0;
     if (out)
         *out = value;
     return true;
 }
 
 }