WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 216 matching lines @@
 bool RenderObject::isHTMLMarquee() const
 {
     return element() && element()->renderer() == this && element()->hasTagName(marqueeTag);
 }
 
 void RenderObject::addChild(RenderObject*, RenderObject*)
 {
     ASSERT_NOT_REACHED();
 }
 
-RenderObject* RenderObject::removeChildNode(RenderObject*, bool)
-{
-    ASSERT_NOT_REACHED();
-    return 0;
-}
-
 void RenderObject::removeChild(RenderObject*)
 {
     ASSERT_NOT_REACHED();
 }
 
-void RenderObject::moveChildNode(RenderObject*)
-{
-    ASSERT_NOT_REACHED();
-}
-
-void RenderObject::appendChildNode(RenderObject*, bool)
-{
-    ASSERT_NOT_REACHED();
-}
-
-void RenderObject::insertChildNode(RenderObject*, RenderObject*, bool)
-{
-    ASSERT_NOT_REACHED();
-}
-
 RenderObject* RenderObject::nextInPreOrder() const
 {
     if (RenderObject* o = firstChild())
         return o;
 
     return nextInPreOrderAfterChildren();
 }
 
 RenderObject* RenderObject::nextInPreOrderAfterChildren() const
 {
@@ skipping 1600 matching lines @@
 }
 
 void RenderObject::handleDynamicFloatPositionChange()
 {
     // We have gone from not affecting the inline status of the parent flow to suddenly
     // having an impact.  See if there is a mismatch between the parent flow's
     // childrenInline() state and our state.
     setInline(style()->isDisplayInlineType());
     if (isInline() != parent()->childrenInline()) {
         if (!isInline())
-            static_cast<RenderBox*>(parent())->childBecameNonInline(this);
+            toRenderBox(parent())->childBecameNonInline(this);
         else {
             // An anonymous block must be made to wrap this inline.
-            RenderBlock* box = createAnonymousBlock();
-            parent()->insertChildNode(box, this);
-            box->appendChildNode(parent()->removeChildNode(this));
+            RenderBlock* block = createAnonymousBlock();
+            RenderObjectChildList* childlist = parent()->virtualChildren();
+            childlist->insertChildNode(parent(), block, this);
+            block->children()->appendChildNode(block, childlist->removeChildNode(parent(), this));
         }
     }
 }
 
 void RenderObject::setAnimatableStyle(PassRefPtr<RenderStyle> style)
 {
     if (!isText() && style)
         setStyle(animation()->updateAnimations(this, style.get()));
     else
         setStyle(style);
@@ skipping 836 matching lines @@
 #ifndef NDEBUG
 
 void showTree(const WebCore::RenderObject* ro)
 {
     if (ro)
         ro->showTreeForThis();
 }
 
 #endif