Changeset 156278 in webkit

Timestamp:

Sep 23, 2013, 10:43:04 AM (11 years ago)

Author:

Antti Koivisto

Message:

Remove RenderObjectChildList
​https://bugs.webkit.org/show_bug.cgi?id=121771

Reviewed by Darin Adler.

Most RenderElement subclasses have m_children member (>90% of instances on typical page). It is not worth optimising
for memory for the few cases that don't (RenderImage, RenderLineBreak mostly) in expense of performance.

This patch moves child handling to RenderElement. This gets rid of virtual children() calls and simplifies the code.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (1 diff)
• Target.pri (modified) (2 diffs)
• WebCore.vcxproj/WebCore.vcxproj (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (7 diffs)
• rendering/AutoTableLayout.cpp (modified) (2 diffs)
• rendering/RenderBlock.cpp (modified) (16 diffs)
• rendering/RenderBlock.h (modified) (4 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (9 diffs)
• rendering/RenderElement.h (modified) (4 diffs)
• rendering/RenderEmbeddedObject.cpp (modified) (1 diff)
• rendering/RenderEmbeddedObject.h (modified) (3 diffs)
• rendering/RenderFrameSet.h (modified) (3 diffs)
• rendering/RenderInline.cpp (modified) (8 diffs)
• rendering/RenderInline.h (modified) (3 diffs)
• rendering/RenderLayerModelObject.cpp (modified) (1 diff)
• rendering/RenderLineBreak.h (modified) (1 diff)
• rendering/RenderListMarker.h (modified) (1 diff)
• rendering/RenderMedia.cpp (modified) (1 diff)
• rendering/RenderMedia.h (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (3 diffs)
• rendering/RenderObject.h (modified) (4 diffs)
• rendering/RenderObjectChildList.cpp (deleted)
• rendering/RenderObjectChildList.h (deleted)
• rendering/RenderReplaced.h (modified) (1 diff)
• rendering/RenderReplica.h (modified) (1 diff)
• rendering/RenderRubyBase.cpp (modified) (2 diffs)
• rendering/RenderTableCol.h (modified) (2 diffs)
• rendering/RenderTableRow.h (modified) (3 diffs)
• rendering/RenderTableSection.h (modified) (3 diffs)
• rendering/RenderText.h (modified) (1 diff)
• rendering/RenderingAllInOne.cpp (modified) (1 diff)
• rendering/mathml/RenderMathMLOperator.cpp (modified) (1 diff)
• rendering/svg/RenderSVGContainer.h (modified) (3 diffs)
• rendering/svg/RenderSVGGradientStop.h (modified) (1 diff)
• rendering/svg/RenderSVGImage.h (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• rendering/svg/RenderSVGRoot.h (modified) (2 diffs)
• rendering/svg/RenderSVGShape.h (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -2179 +2179 @@
     rendering/RenderNamedFlowThread.cpp
     rendering/RenderObject.cpp
-    rendering/RenderObjectChildList.cpp
     rendering/RenderProgress.cpp
     rendering/RenderQuote.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-23  Antti Koivisto  <antti@apple.com>
+
+        Remove RenderObjectChildList
+        https://bugs.webkit.org/show_bug.cgi?id=121771
+
+        Reviewed by Darin Adler.
+
+        Most RenderElement subclasses have m_children member (>90% of instances on typical page). It is not worth optimising
+        for memory for the few cases that don't (RenderImage, RenderLineBreak mostly) in expense of performance.
+        
+        This patch moves child handling to RenderElement. This gets rid of virtual children() calls and simplifies the code.
+
 2013-09-23  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4505 +4505 @@
         Source/WebCore/rendering/RenderNamedFlowThread.cpp \
         Source/WebCore/rendering/RenderNamedFlowThread.h \
-        Source/WebCore/rendering/RenderObjectChildList.cpp \
-        Source/WebCore/rendering/RenderObjectChildList.h \
         Source/WebCore/rendering/RenderObject.cpp \
         Source/WebCore/rendering/RenderObject.h \

trunk/Source/WebCore/Target.pri

@@ -1195 +1195 @@
     rendering/RenderNamedFlowThread.cpp \
     rendering/RenderObject.cpp \
-    rendering/RenderObjectChildList.cpp \
     rendering/RenderProgress.cpp \
     rendering/RenderQuote.cpp \
@@ -2462 +2461 @@
     rendering/RenderMeter.h \
     rendering/RenderMultiColumnBlock.h \
-    rendering/RenderObjectChildList.h \
     rendering/RenderObject.h \
     rendering/RenderProgress.h \

trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

@@ -10240 +10240 @@
     <ClCompile Include="..\rendering\RenderNamedFlowThread.cpp" />
     <ClCompile Include="..\rendering\RenderObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\rendering\RenderObjectChildList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -20006 +19992 @@
     <ClInclude Include="..\rendering\RenderNamedFlowThread.h" />
     <ClInclude Include="..\rendering\RenderObject.h" />
-    <ClInclude Include="..\rendering\RenderObjectChildList.h" />
     <ClInclude Include="..\rendering\RenderProgress.h" />
     <ClInclude Include="..\rendering\RenderQuote.h" />

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4769 +4769 @@
                 BC2CBF4E140F1ABD003879BE /* JSWebGLContextEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2CBF4B140F1A65003879BE /* JSWebGLContextEvent.h */; };
                 BC2CBF7B140F1D58003879BE /* JSWebGLContextEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2CBF7A140F1D58003879BE /* JSWebGLContextEvent.cpp */; };
-                BC2CC8DF0F32881000A9DF26 /* RenderObjectChildList.h in Headers */ = {isa = PBXBuildFile; fileRef = BC2CC8DE0F32881000A9DF26 /* RenderObjectChildList.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 BC2ED5550C6B9BD300920BFF /* JSElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2ED5540C6B9BD300920BFF /* JSElementCustom.cpp */; };
                 BC2ED6BC0C6BD2F000920BFF /* JSAttrCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */; };
@@ -4889 +4888 @@
                 BC60DB490D2A3D1E00B9918F /* JSXPathException.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */; };
                 BC60DB4A0D2A3D1E00B9918F /* JSXPathException.h in Headers */ = {isa = PBXBuildFile; fileRef = BC60DB480D2A3D1E00B9918F /* JSXPathException.h */; };
-                BC60EFB70F33A0E700812A93 /* RenderObjectChildList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC60EFB60F33A0E700812A93 /* RenderObjectChildList.cpp */; };
                 BC64640911D7F304006455B0 /* DOMStringMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC64640711D7F304006455B0 /* DOMStringMap.cpp */; };
                 BC64640A11D7F304006455B0 /* DOMStringMap.h in Headers */ = {isa = PBXBuildFile; fileRef = BC64640811D7F304006455B0 /* DOMStringMap.h */; };
@@ -11632 +11630 @@
                 BC2CBF4B140F1A65003879BE /* JSWebGLContextEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebGLContextEvent.h; sourceTree = "<group>"; };
                 BC2CBF7A140F1D58003879BE /* JSWebGLContextEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebGLContextEvent.cpp; sourceTree = "<group>"; };
-                BC2CC8DE0F32881000A9DF26 /* RenderObjectChildList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectChildList.h; sourceTree = "<group>"; };
                 BC2ED5540C6B9BD300920BFF /* JSElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSElementCustom.cpp; sourceTree = "<group>"; };
                 BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSAttrCustom.cpp; sourceTree = "<group>"; };
@@ -11761 +11758 @@
                 BC60DB470D2A3D1E00B9918F /* JSXPathException.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathException.cpp; sourceTree = "<group>"; };
                 BC60DB480D2A3D1E00B9918F /* JSXPathException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSXPathException.h; sourceTree = "<group>"; };
-                BC60EFB60F33A0E700812A93 /* RenderObjectChildList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderObjectChildList.cpp; sourceTree = "<group>"; };
                 BC64640711D7F304006455B0 /* DOMStringMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMStringMap.cpp; sourceTree = "<group>"; };
                 BC64640811D7F304006455B0 /* DOMStringMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMStringMap.h; sourceTree = "<group>"; };
@@ -20632 +20628 @@
                                 BCEA4840097D93020094C9E4 /* RenderObject.cpp */,
                                 BCEA4841097D93020094C9E4 /* RenderObject.h */,
-                                BC60EFB60F33A0E700812A93 /* RenderObjectChildList.cpp */,
-                                BC2CC8DE0F32881000A9DF26 /* RenderObjectChildList.h */,
                                 BCFA930710333193007B25D1 /* RenderOverflow.h */,
                                 A43BF59A1149292800C643CA /* RenderProgress.cpp */,
@@ -23777 +23771 @@
                                 BC85F23D151915E000BC17BE /* RenderNamedFlowThread.h in Headers */,
                                 BCEA4880097D93020094C9E4 /* RenderObject.h in Headers */,
-                                BC2CC8DF0F32881000A9DF26 /* RenderObjectChildList.h in Headers */,
                                 BCFA930810333193007B25D1 /* RenderOverflow.h in Headers */,
                                 A43BF59D1149292800C643CA /* RenderProgress.h in Headers */,
@@ -26997 +26990 @@
                                 1A3FF9C315265359002288A1 /* RenderNamedFlowThread.cpp in Sources */,
                                 BCEA487F097D93020094C9E4 /* RenderObject.cpp in Sources */,
-                                BC60EFB70F33A0E700812A93 /* RenderObjectChildList.cpp in Sources */,
                                 A43BF59C1149292800C643CA /* RenderProgress.cpp in Sources */,
                                 5A574F24131DB93900471B88 /* RenderQuote.cpp in Sources */,

trunk/Source/WebCore/rendering/AutoTableLayout.cpp

@@ -50 +50 @@
     RenderTableCell* maxContributor = 0;
 
-    for (RenderObject* child = m_table->children()->firstChild(); child; child = child->nextSibling()) {
+    for (RenderObject* child = m_table->firstChild(); child; child = child->nextSibling()) {
         if (child->isRenderTableCol()){
             // RenderTableCols don't have the concept of preferred logical width, but we need to clear their dirty bits
@@ -66 +66 @@
                     continue;
 
-                bool cellHasContent = cell->children()->firstChild() || cell->style()->hasBorder() || cell->style()->hasPadding();
+                bool cellHasContent = cell->firstChild() || cell->style()->hasBorder() || cell->style()->hasPadding();
                 if (cellHasContent)
                     columnLayout.emptyCellsOnly = false;

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -85 +85 @@
 struct SameSizeAsRenderBlock : public RenderBox {
     void* pointers[2];
-    RenderObjectChildList children;
     RenderLineBoxList lineBoxes;
     uint32_t bitfields;
@@ -214 +213 @@
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise.
-    children()->destroyLeftoverChildren();
+    destroyLeftoverChildren();
 
     // Destroy our continuation before anything other than anonymous children.
@@ -469 +468 @@
         // Create a new block of the correct type.
         RenderBlock* newBox = newChildHasColumnSpan ? createAnonymousColumnSpanBlock() : createAnonymousColumnsBlock();
-        children()->appendChildNode(this, newBox);
+        insertChildInternal(newBox, nullptr, NotifyChildren);
         newBox->addChildIgnoringAnonymousColumnBlocks(newChild, 0);
         return;
@@ -492 +491 @@
     // Create a new anonymous box of the appropriate type.
     RenderBlock* newBox = newChildHasColumnSpan ? createAnonymousColumnSpanBlock() : createAnonymousColumnsBlock();
-    children()->insertChildNode(this, newBox, newBeforeChild);
+    insertChildInternal(newBox, newBeforeChild, NotifyChildren);
     newBox->addChildIgnoringAnonymousColumnBlocks(newChild, 0);
     return;
@@ -609 +608 @@
 
     // Now we are at the columns block level. We need to put the clone into the toBlock.
-    toBlock->children()->appendChildNode(toBlock, cloneBlock);
+    toBlock->insertChildInternal(cloneBlock, nullptr, NotifyChildren);
 
     // Now take all the children after currChild and remove them from the fromBlock
@@ -644 +643 @@
     RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();
     if (madeNewBeforeBlock)
-        block->children()->insertChildNode(block, pre, boxFirst);
-    block->children()->insertChildNode(block, newBlockBox, boxFirst);
-    block->children()->insertChildNode(block, post, boxFirst);
+        block->insertChildInternal(pre, boxFirst, NotifyChildren);
+    block->insertChildInternal(newBlockBox, boxFirst, NotifyChildren);
+    block->insertChildInternal(post, boxFirst, NotifyChildren);
     block->setChildrenInline(false);
     
@@ -696 +695 @@
     RenderObject* boxFirst = block->firstChild();
     if (pre)
-        block->children()->insertChildNode(block, pre, boxFirst);
-    block->children()->insertChildNode(block, newBlockBox, boxFirst);
+        block->insertChildInternal(pre, boxFirst, NotifyChildren);
+    block->insertChildInternal(newBlockBox, boxFirst, NotifyChildren);
     if (post)
-        block->children()->insertChildNode(block, post, boxFirst);
+        block->insertChildInternal(post, boxFirst, NotifyChildren);
     block->setChildrenInline(false);
     
@@ -1006 +1005 @@
 
         RenderBlock* block = createAnonymousBlock();
-        children()->insertChildNode(this, block, inlineRunStart);
+        insertChildInternal(block, inlineRunStart, NotifyChildren);
         moveChildrenTo(block, inlineRunStart, child);
     }
@@ -1026 +1025 @@
         return;
     
-    RenderObject* firstAnChild = child->m_children.firstChild();
-    RenderObject* lastAnChild = child->m_children.lastChild();
+    RenderObject* firstAnChild = child->firstChild();
+    RenderObject* lastAnChild = child->lastChild();
     if (firstAnChild) {
         RenderObject* o = firstAnChild;
@@ -1041 +1040 @@
             child->nextSibling()->setPreviousSibling(lastAnChild);
             
-        if (child == m_children.firstChild())
-            m_children.setFirstChild(firstAnChild);
-        if (child == m_children.lastChild())
-            m_children.setLastChild(lastAnChild);
+        if (child == firstChild())
+            setFirstChild(firstAnChild);
+        if (child == lastChild())
+            setLastChild(lastAnChild);
     } else {
-        if (child == m_children.firstChild())
-            m_children.setFirstChild(child->nextSibling());
-        if (child == m_children.lastChild())
-            m_children.setLastChild(child->previousSibling());
+        if (child == firstChild())
+            setFirstChild(child->nextSibling());
+        if (child == lastChild())
+            setLastChild(child->previousSibling());
 
         if (child->previousSibling())
@@ -1057 +1056 @@
     }
 
-    child->children()->setFirstChild(0);
+    child->setFirstChild(0);
     child->m_next = 0;
 
@@ -1095 +1094 @@
 }
 
-void RenderBlock::collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child)
+void RenderBlock::collapseAnonymousBoxChild(RenderBlock* parent, RenderBlock* child)
 {
     parent->setNeedsLayoutAndPrefWidthsRecalc();
@@ -1103 +1102 @@
     RenderFlowThread* childFlowThread = child->flowThreadContainingBlock();
     CurrentRenderFlowThreadMaintainer flowThreadMaintainer(childFlowThread);
-    
-    RenderBlock* anonBlock = toRenderBlock(parent->children()->removeChildNode(parent, child, child->hasLayer()));
-    anonBlock->moveAllChildrenTo(parent, nextSibling, child->hasLayer());
+
+    parent->removeChildInternal(child, child->hasLayer() ? NotifyChildren : DontNotifyChildren);
+    child->moveAllChildrenTo(parent, nextSibling, child->hasLayer());
     // Delete the now-empty block's lines and nuke it.
-    anonBlock->deleteLineBoxTree();
+    child->deleteLineBoxTree();
     if (childFlowThread && childFlowThread->isRenderNamedFlowThread())
-        toRenderNamedFlowThread(childFlowThread)->removeFlowChildInfo(anonBlock);
-    anonBlock->destroy();
+        toRenderNamedFlowThread(childFlowThread)->removeFlowChildInfo(child);
+    child->destroy();
 }
 
@@ -1189 +1188 @@
             bool inlineChildrenBlockHasLayer = inlineChildrenBlock->hasLayer();
             inlineChildrenBlock->setStyle(newStyle);
-            children()->removeChildNode(this, inlineChildrenBlock, inlineChildrenBlockHasLayer);
+            removeChildInternal(inlineChildrenBlock, inlineChildrenBlockHasLayer ? NotifyChildren : DontNotifyChildren);
             
             // Now just put the inlineChildrenBlock inside the blockChildrenBlock.
-            blockChildrenBlock->children()->insertChildNode(blockChildrenBlock, inlineChildrenBlock, prev == inlineChildrenBlock ? blockChildrenBlock->firstChild() : 0,
-                                                            inlineChildrenBlockHasLayer || blockChildrenBlock->hasLayer());
+            RenderObject* beforeChild = prev == inlineChildrenBlock ? blockChildrenBlock->firstChild() : nullptr;
+            blockChildrenBlock->insertChildInternal(inlineChildrenBlock, beforeChild,
+                (inlineChildrenBlockHasLayer || blockChildrenBlock->hasLayer()) ? NotifyChildren : DontNotifyChildren);
             next->setNeedsLayoutAndPrefWidthsRecalc();
             
@@ -1221 +1221 @@
         // box.  We can go ahead and pull the content right back up into our
         // box.
-        collapseAnonymousBoxChild(this, child);
+        collapseAnonymousBoxChild(this, toRenderBlock(child));
     } else if (((prev && prev->isAnonymousBlock()) || (next && next->isAnonymousBlock())) && canCollapseAnonymousBlockChild()) {
         // It's possible that the removal has knocked us down to a single anonymous
@@ -5846 +5846 @@
         // To prevent removal of single anonymous block in RenderBlock::removeChild and causing
         // |nextSibling| to go stale, we remove the old first letter using removeChildNode first.
-        firstLetterContainer->children()->removeChildNode(firstLetterContainer, firstLetter);
+        firstLetterContainer->removeChildInternal(firstLetter, NotifyChildren);
         firstLetter->destroy();
         firstLetter = newFirstLetter;

trunk/Source/WebCore/rendering/RenderBlock.h

@@ -105 +105 @@
     static RenderBlock* createAnonymous(Document&);
 
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE FINAL { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE FINAL { return &m_children; }
-
     bool beingDestroyed() const { return m_beingDestroyed; }
 
@@ -293 +287 @@
     RenderBlock* createAnonymousColumnsBlock() const { return createAnonymousColumnsWithParentRenderer(this); }
     RenderBlock* createAnonymousColumnSpanBlock() const { return createAnonymousColumnSpanWithParentRenderer(this); }
-    static void collapseAnonymousBoxChild(RenderBlock* parent, RenderObject* child);
+    static void collapseAnonymousBoxChild(RenderBlock* parent, RenderBlock* child);
 
     virtual RenderBox* createAnonymousBoxWithSameTypeAs(const RenderObject* parent) const OVERRIDE;
@@ -572 +566 @@
     virtual bool isRenderBlock() const OVERRIDE FINAL { return true; }
     virtual bool isInlineBlockOrInlineTable() const OVERRIDE FINAL { return isInline() && isReplaced(); }
+    virtual bool canHaveChildren() const OVERRIDE { return true; }
 
     void makeChildrenNonInline(RenderObject* insertionPoint = 0);
@@ -879 +874 @@
     OwnPtr<RenderBlockRareData> m_rareData;
 
-    RenderObjectChildList m_children;
     RenderLineBoxList m_lineBoxes;   // All of the root line boxes created for this block flow.  For example, <div>Hello<br>world.</div> will have two total lines for the <div>.
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4645 +4645 @@
             // See for example RenderTableCell:clippedOverflowRectForRepaint.
             markBoxForRelayoutAfterSplit(parentBox);
-            parentBox->children()->insertChildNode(parentBox, postBox, boxToSplit->nextSibling());
+            parentBox->insertChildInternal(postBox, boxToSplit->nextSibling(), NotifyChildren);
             boxToSplit->moveChildrenTo(postBox, beforeChild, 0, true);
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2782 +2782 @@
         // Takes care of adding the new child correctly if toBlock and fromBlock
         // have different kind of children (block vs inline).
-        toBoxModelObject->addChild(children()->removeChildNode(this, child), beforeChild);
-    } else
-        toBoxModelObject->children()->insertChildNode(toBoxModelObject, children()->removeChildNode(this, child, fullRemoveInsert), beforeChild, fullRemoveInsert);
+        removeChildInternal(child, NotifyChildren);
+        toBoxModelObject->addChild(child, beforeChild);
+    } else {
+        NotifyChildrenType notifyType = fullRemoveInsert ? NotifyChildren : DontNotifyChildren;
+        removeChildInternal(child, notifyType);
+        toBoxModelObject->insertChildInternal(child, beforeChild, notifyType);
+    }
 }
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -26 +26 @@
 #include "RenderElement.h"
 
+#include "AXObjectCache.h"
 #include "ContentData.h"
+#include "RenderCounter.h"
 #include "RenderDeprecatedFlexibleBox.h"
 #include "RenderFlexibleBox.h"
@@ -33 +35 @@
 #include "RenderImageResourceStyleImage.h"
 #include "RenderLayer.h"
+#include "RenderLineBreak.h"
 #include "RenderListItem.h"
 #include "RenderMultiColumnBlock.h"
@@ -43 +46 @@
 #include "RenderTableRow.h"
 #include "RenderText.h"
+#include "RenderView.h"
 #include "SVGRenderSupport.h"
 
@@ -49 +53 @@
 RenderElement::RenderElement(Element* element)
     : RenderObject(element)
+    , m_firstChild(nullptr)
+    , m_lastChild(nullptr)
 {
 }
@@ -137 +143 @@
 void RenderElement::addChild(RenderObject* newChild, RenderObject* beforeChild)
 {
-    ASSERT(children());
-    RenderObjectChildList& children = *this->children();
-
     bool needsTable = false;
 
@@ -157 +160 @@
     if (needsTable) {
         RenderTable* table;
-        RenderObject* afterChild = beforeChild ? beforeChild->previousSibling() : children.lastChild();
+        RenderObject* afterChild = beforeChild ? beforeChild->previousSibling() : m_lastChild;
         if (afterChild && afterChild->isAnonymous() && afterChild->isTable() && !afterChild->isBeforeContent())
             table = toRenderTable(afterChild);
@@ -166 +169 @@
         table->addChild(newChild);
     } else
-        children.insertChildNode(this, newChild, beforeChild);
+        insertChildInternal(newChild, beforeChild, NotifyChildren);
 
     if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE)
@@ -189 +192 @@
 void RenderElement::removeChild(RenderObject* oldChild)
 {
-    ASSERT(children());
-    children()->removeChildNode(this, oldChild);
+    removeChildInternal(oldChild, NotifyChildren);
+}
+
+void RenderElement::destroyLeftoverChildren()
+{
+    while (m_firstChild) {
+        if (m_firstChild->isListMarker() || (m_firstChild->style()->styleType() == FIRST_LETTER && !m_firstChild->isText()))
+            m_firstChild->removeFromParent(); // List markers are owned by their enclosing list and so don't get destroyed by this container. Similarly, first letters are destroyed by their remaining text fragment.
+        else if (m_firstChild->isRunIn() && m_firstChild->node()) {
+            m_firstChild->node()->setRenderer(0);
+            m_firstChild->node()->setNeedsStyleRecalc();
+            m_firstChild->destroy();
+        } else {
+            // Destroy any anonymous children remaining in the render tree, as well as implicit (shadow) DOM elements like those used in the engine-based text fields.
+            if (m_firstChild->node())
+                m_firstChild->node()->setRenderer(0);
+            m_firstChild->destroy();
+        }
+    }
+}
+
+void RenderElement::insertChildInternal(RenderObject* newChild, RenderObject* beforeChild, NotifyChildrenType notifyChildren)
+{
+    ASSERT(canHaveChildren() || canHaveGeneratedChildren());
+    ASSERT(!newChild->parent());
+    ASSERT(!isRenderBlockFlow() || (!newChild->isTableSection() && !newChild->isTableRow() && !newChild->isTableCell()));
+
+    while (beforeChild && beforeChild->parent() && beforeChild->parent() != this)
+        beforeChild = beforeChild->parent();
+
+    // This should never happen, but if it does prevent render tree corruption
+    // where child->parent() ends up being owner but child->nextSibling()->parent()
+    // is not owner.
+    if (beforeChild && beforeChild->parent() != this) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+
+    newChild->setParent(this);
+
+    if (m_firstChild == beforeChild)
+        m_firstChild = newChild;
+
+    if (beforeChild) {
+        RenderObject* previousSibling = beforeChild->previousSibling();
+        if (previousSibling)
+            previousSibling->setNextSibling(newChild);
+        newChild->setPreviousSibling(previousSibling);
+        newChild->setNextSibling(beforeChild);
+        beforeChild->setPreviousSibling(newChild);
+    } else {
+        if (lastChild())
+            lastChild()->setNextSibling(newChild);
+        newChild->setPreviousSibling(lastChild());
+        m_lastChild = newChild;
+    }
+
+    if (!documentBeingDestroyed()) {
+        if (notifyChildren == NotifyChildren)
+            newChild->insertedIntoTree();
+        RenderCounter::rendererSubtreeAttached(newChild);
+    }
+
+    newChild->setNeedsLayoutAndPrefWidthsRecalc();
+    setPreferredLogicalWidthsDirty(true);
+    if (!normalChildNeedsLayout())
+        setChildNeedsLayout(true); // We may supply the static position for an absolute positioned child.
+
+    if (AXObjectCache* cache = document().axObjectCache())
+        cache->childrenChanged(this);
+}
+
+void RenderElement::removeChildInternal(RenderObject* oldChild, NotifyChildrenType notifyChildren)
+{
+    ASSERT(canHaveChildren() || canHaveGeneratedChildren());
+    ASSERT(oldChild->parent() == this);
+
+    if (oldChild->isFloatingOrOutOfFlowPositioned())
+        toRenderBox(oldChild)->removeFloatingOrPositionedChildFromBlockLists();
+
+    // So that we'll get the appropriate dirty bit set (either that a normal flow child got yanked or
+    // that a positioned child got yanked). We also repaint, so that the area exposed when the child
+    // disappears gets repainted properly.
+    if (!documentBeingDestroyed() && notifyChildren == NotifyChildren && oldChild->everHadLayout()) {
+        oldChild->setNeedsLayoutAndPrefWidthsRecalc();
+        // We only repaint |oldChild| if we have a RenderLayer as its visual overflow may not be tracked by its parent.
+        if (oldChild->isBody())
+            view().repaintRootContents();
+        else
+            oldChild->repaint();
+    }
+
+    // If we have a line box wrapper, delete it.
+    if (oldChild->isBox())
+        toRenderBox(oldChild)->deleteLineBoxWrapper();
+    else if (oldChild->isLineBreak())
+        toRenderLineBreak(oldChild)->deleteInlineBoxWrapper();
+
+    // If oldChild is the start or end of the selection, then clear the selection to
+    // avoid problems of invalid pointers.
+    // FIXME: The FrameSelection should be responsible for this when it
+    // is notified of DOM mutations.
+    if (!documentBeingDestroyed() && oldChild->isSelectionBorder())
+        view().clearSelection();
+
+    if (!documentBeingDestroyed() && notifyChildren == NotifyChildren)
+        oldChild->willBeRemovedFromTree();
+
+    // WARNING: There should be no code running between willBeRemovedFromTree and the actual removal below.
+    // This is needed to avoid race conditions where willBeRemovedFromTree would dirty the tree's structure
+    // and the code running here would force an untimely rebuilding, leaving |oldChild| dangling.
+
+    if (oldChild->previousSibling())
+        oldChild->previousSibling()->setNextSibling(oldChild->nextSibling());
+    if (oldChild->nextSibling())
+        oldChild->nextSibling()->setPreviousSibling(oldChild->previousSibling());
+
+    if (m_firstChild == oldChild)
+        m_firstChild = oldChild->nextSibling();
+    if (m_lastChild == oldChild)
+        m_lastChild = oldChild->previousSibling();
+
+    oldChild->setPreviousSibling(0);
+    oldChild->setNextSibling(0);
+    oldChild->setParent(0);
+
+    // rendererRemovedFromTree walks the whole subtree. We can improve performance
+    // by skipping this step when destroying the entire tree.
+    if (!documentBeingDestroyed())
+        RenderCounter::rendererRemovedFromTree(oldChild);
+
+    if (AXObjectCache* cache = document().existingAXObjectCache())
+        cache->childrenChanged(this);
 }
 
@@ -347 +481 @@
 }
 
-
-}
+void RenderElement::willBeDestroyed()
+{
+    destroyLeftoverChildren();
+
+    RenderObject::willBeDestroyed();
+}
+
+}

trunk/Source/WebCore/rendering/RenderElement.h

@@ -39 +39 @@
     Element* generatingElement() const { return toElement(RenderObject::generatingNode()); }
 
+    virtual RenderObject* firstChild() const FINAL { return m_firstChild; }
+    virtual RenderObject* lastChild() const FINAL { return m_lastChild; }
+
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true; }
     virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0);
@@ -52 +55 @@
     RenderLayer* findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, bool checkParent = true);
 
+    enum NotifyChildrenType { NotifyChildren, DontNotifyChildren };
+    void insertChildInternal(RenderObject*, RenderObject* beforeChild, NotifyChildrenType);
+    void removeChildInternal(RenderObject*, NotifyChildrenType);
+
 protected:
     explicit RenderElement(Element*);
@@ -60 +67 @@
     LayoutUnit minimumValueForLength(const Length&, LayoutUnit maximumValue, bool roundPercentages = false) const;
 
+    void setFirstChild(RenderObject* child) { m_firstChild = child; }
+    void setLastChild(RenderObject* child) { m_lastChild = child; }
+    void destroyLeftoverChildren();
+
     virtual void insertedIntoTree() OVERRIDE;
     virtual void willBeRemovedFromTree() OVERRIDE;
+    virtual void willBeDestroyed() OVERRIDE;
 
 private:
@@ -68 +80 @@
     void generatingNode() const WTF_DELETED_FUNCTION;
     void isText() const WTF_DELETED_FUNCTION;
+
+    RenderObject* m_firstChild;
+    RenderObject* m_lastChild;
 };
 

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -495 +495 @@
 
     // This code copied from RenderMedia::layout().
-    RenderObject* child = m_children.firstChild();
+    RenderObject* child = firstChild();
 
     if (!child)

trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

@@ -73 +73 @@
     virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE;
 
-    virtual const RenderObjectChildList* children() const OVERRIDE FINAL { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE FINAL { return &m_children; }
-
 protected:
     virtual void layout() OVERRIDE;
@@ -104 +101 @@
 
     virtual bool canHaveChildren() const OVERRIDE FINAL;
-    
     virtual bool canHaveWidget() const { return true; }
 
@@ -115 +111 @@
     bool m_unavailablePluginIndicatorIsPressed;
     bool m_mouseDownWasInUnavailablePluginIndicator;
-    RenderObjectChildList m_children;
     String m_unavailabilityDescription;
 };

trunk/Source/WebCore/rendering/RenderFrameSet.h

@@ -61 +61 @@
     HTMLFrameSetElement& frameSetElement() const;
 
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE { return &m_children; }
-
     FrameEdgeInfo edgeInfo() const;
 
@@ -103 +97 @@
     virtual void layout() OVERRIDE;
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
+    virtual bool canHaveChildren() const OVERRIDE { return true; }
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
     virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const OVERRIDE;
@@ -125 +120 @@
     void paintColumnBorder(const PaintInfo&, const IntRect&);
 
-    RenderObjectChildList m_children;
-
     GridAxis m_rows;
     GridAxis m_cols;

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -82 +82 @@
     // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will
     // properly dirty line boxes that they are removed from.  Effects that do :before/:after only on hover could crash otherwise.
-    children()->destroyLeftoverChildren();
+    destroyLeftoverChildren();
 
     // Destroy our continuation before anything other than anonymous children.
@@ -367 +367 @@
         RenderObject* tmp = o;
         o = tmp->nextSibling();
-        cloneInline->addChildIgnoringContinuation(children()->removeChildNode(this, tmp), 0);
+        removeChildInternal(tmp, NotifyChildren);
+        cloneInline->addChildIgnoringContinuation(tmp, 0);
         tmp->setNeedsLayoutAndPrefWidthsRecalc();
     }
@@ -408 +409 @@
                 RenderObject* tmp = o;
                 o = tmp->nextSibling();
-                cloneInline->addChildIgnoringContinuation(inlineCurr->children()->removeChildNode(curr, tmp), 0);
+                inlineCurr->removeChildInternal(tmp, NotifyChildren);
+                cloneInline->addChildIgnoringContinuation(tmp, 0);
                 tmp->setNeedsLayoutAndPrefWidthsRecalc();
             }
@@ -420 +422 @@
 
     // Now we are at the block level. We need to put the clone into the toBlock.
-    toBlock->children()->appendChildNode(toBlock, cloneInline);
+    toBlock->insertChildInternal(cloneInline, nullptr, NotifyChildren);
 
     // Now take all the children after currChild and remove them from the fromBlock
@@ -428 +430 @@
         RenderObject* tmp = o;
         o = tmp->nextSibling();
-        toBlock->children()->appendChildNode(toBlock, fromBlock->children()->removeChildNode(fromBlock, tmp));
+        fromBlock->removeChildInternal(tmp, NotifyChildren);
+        toBlock->insertChildInternal(tmp, nullptr, NotifyChildren);
     }
 }
@@ -458 +461 @@
     RenderObject* boxFirst = madeNewBeforeBlock ? block->firstChild() : pre->nextSibling();
     if (madeNewBeforeBlock)
-        block->children()->insertChildNode(block, pre, boxFirst);
-    block->children()->insertChildNode(block, newBlockBox, boxFirst);
-    block->children()->insertChildNode(block, post, boxFirst);
+        block->insertChildInternal(pre, boxFirst, NotifyChildren);
+    block->insertChildInternal(newBlockBox, boxFirst, NotifyChildren);
+    block->insertChildInternal(post, boxFirst, NotifyChildren);
     block->setChildrenInline(false);
     
@@ -468 +471 @@
             RenderObject* no = o;
             o = no->nextSibling();
-            pre->children()->appendChildNode(pre, block->children()->removeChildNode(block, no));
+            block->removeChildInternal(no, NotifyChildren);
+            pre->insertChildInternal(no, nullptr, NotifyChildren);
             no->setNeedsLayoutAndPrefWidthsRecalc();
         }
@@ -1262 +1266 @@
     setContinuation(newBox);
     RenderObject* beforeChild = child->nextSibling();
-    children()->removeChildNode(this, child);
+    removeChildInternal(child, NotifyChildren);
     splitFlow(beforeChild, newBox, child, oldContinuation);
 }

trunk/Source/WebCore/rendering/RenderInline.h

@@ -37 +37 @@
 
     static RenderInline* createAnonymous(Document&);
-
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
 
     virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) OVERRIDE;
@@ -100 +97 @@
 
 private:
-    virtual const RenderObjectChildList* children() const OVERRIDE FINAL { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE FINAL { return &m_children; }
-
     virtual const char* renderName() const OVERRIDE;
 
     virtual bool isRenderInline() const OVERRIDE FINAL { return true; }
+    virtual bool canHaveChildren() const OVERRIDE FINAL { return true; }
 
     LayoutRect culledInlineVisualOverflowBoundingBox() const;
@@ -179 +174 @@
     RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
 
-    RenderObjectChildList m_children;
     RenderLineBoxList m_lineBoxes;   // All of the line boxes created for this inline flow.  For example, <i>Hello<br>world.</i> will have two <i> line boxes.
 

trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp

@@ -82 +82 @@
 
     // RenderObject::willBeDestroyed calls back to destroyLayer() for layer destruction
-    RenderObject::willBeDestroyed();
+    RenderElement::willBeDestroyed();
 }
 

trunk/Source/WebCore/rendering/RenderLineBreak.h

@@ -54 +54 @@
 private:
     void node() const WTF_DELETED_FUNCTION;
+
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
 
     virtual VisiblePosition positionForPoint(const LayoutPoint&) OVERRIDE;

trunk/Source/WebCore/rendering/RenderListMarker.h

@@ -56 +56 @@
 
     virtual bool isListMarker() const { return true; }
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
 
     virtual void paint(PaintInfo&, const LayoutPoint&);

trunk/Source/WebCore/rendering/RenderMedia.cpp

@@ -59 +59 @@
     RenderImage::layout();
 
-    RenderBox* controlsRenderer = toRenderBox(m_children.firstChild());
+    RenderBox* controlsRenderer = toRenderBox(firstChild());
     if (!controlsRenderer)
         return;

trunk/Source/WebCore/rendering/RenderMedia.h

@@ -42 +42 @@
     HTMLMediaElement& mediaElement() const { return toHTMLMediaElement(nodeForNonAnonymous()); }
 
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE FINAL { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE FINAL { return &m_children; }
-
 protected:
     virtual void layout();
@@ -62 +56 @@
 
     virtual bool requiresForcedStyleRecalcPropagation() const OVERRIDE FINAL { return true; }
-
-    RenderObjectChildList m_children;
 };
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1664 +1664 @@
             // An anonymous block must be made to wrap this inline.
             RenderBlock* block = toRenderBlock(parent())->createAnonymousBlock();
-            RenderObjectChildList* childlist = parent()->children();
-            childlist->insertChildNode(parent(), block, this);
-            block->children()->appendChildNode(block, childlist->removeChildNode(parent(), this));
+            parent()->insertChildInternal(block, this, RenderElement::NotifyChildren);
+            parent()->removeChildInternal(this, RenderElement::NotifyChildren);
+            block->insertChildInternal(this, nullptr, RenderElement::NotifyChildren);
         }
     }
@@ -2411 +2411 @@
 void RenderObject::willBeDestroyed()
 {
-    // Destroy any leftover anonymous children.
-    RenderObjectChildList* children = this->children();
-    if (children)
-        children->destroyLeftoverChildren();
-
     // If this renderer is being autoscrolled, stop the autoscroll timer
     
@@ -2521 +2516 @@
 void RenderObject::removeFromRenderFlowThreadRecursive(RenderFlowThread* renderFlowThread)
 {
-    if (const RenderObjectChildList* children = this->children()) {
-        for (RenderObject* child = children->firstChild(); child; child = child->nextSibling())
-            child->removeFromRenderFlowThreadRecursive(renderFlowThread);
-    }
-    
+    for (RenderObject* child = firstChild(); child; child = child->nextSibling())
+        child->removeFromRenderFlowThreadRecursive(renderFlowThread);
+
     RenderFlowThread* localFlowThread = renderFlowThread;
     if (flowThreadState() == InsideInFlowThread)

trunk/Source/WebCore/rendering/RenderObject.h

@@ -33 +33 @@
 #include "LayoutRect.h"
 #include "PaintPhase.h"
-#include "RenderObjectChildList.h"
 #include "RenderStyle.h"
 #include "ScrollBehavior.h"
@@ -148 +147 @@
     friend class RenderBlock;
     friend class RenderBlockFlow;
+    friend class RenderElement;
     friend class RenderLayer;
-    friend class RenderObjectChildList;
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
@@ -167 +166 @@
 
     // FIXME: These should be renamed slowFirstChild, slowLastChild, etc.
-    // to discourage their use. The virtual call to children inside these
-    // can be slow for hot code paths.
-    // Derived classes like RenderBlock override these non-virtual
-    // functions to make them fast when we already have a more specific pointer type.
-    RenderObject* firstChild() const
-    {
-        if (const RenderObjectChildList* children = this->children())
-            return children->firstChild();
-        return 0;
-    }
-    RenderObject* lastChild() const
-    {
-        if (const RenderObjectChildList* children = this->children())
-            return children->lastChild();
-        return 0;
-    }
-
-    virtual RenderObjectChildList* children() { return 0; }
-    virtual const RenderObjectChildList* children() const { return 0; }
+    // to discourage their use.
+    virtual RenderObject* firstChild() const { return nullptr; }
+    virtual RenderObject* lastChild() const { return nullptr; }
 
     RenderObject* nextInPreOrder() const;
@@ -271 +254 @@
     // RenderObject tree manipulation
     //////////////////////////////////////////
-    virtual bool canHaveChildren() const { return children(); }
+    virtual bool canHaveChildren() const = 0;
     virtual bool canHaveGeneratedChildren() const;
     virtual bool createsAnonymousWrapper() const { return false; }

trunk/Source/WebCore/rendering/RenderReplaced.h

@@ -73 +73 @@
     virtual const char* renderName() const OVERRIDE { return "RenderReplaced"; }
 
-    virtual bool canHaveChildren() const { return false; }
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
 
     virtual void computePreferredLogicalWidths() OVERRIDE FINAL;

trunk/Source/WebCore/rendering/RenderReplica.h

@@ -51 +51 @@
     RenderReplica();
 
-    virtual bool isReplica() const { return true; }
-    virtual void computePreferredLogicalWidths();
+    virtual bool isReplica() const OVERRIDE { return true; }
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
+    virtual void computePreferredLogicalWidths() OVERRIDE;
 
 };

trunk/Source/WebCore/rendering/RenderRubyBase.cpp

@@ -99 +99 @@
         else {
             toBlock = toBase->createAnonymousBlock();
-            toBase->children()->appendChildNode(toBase, toBlock);
+            toBase->insertChildInternal(toBlock, nullptr, NotifyChildren);
         }
     }
@@ -124 +124 @@
         RenderBlock* anonBlockHere = toRenderBlock(firstChildHere);
         RenderBlock* anonBlockThere = toRenderBlock(lastChildThere);
-        anonBlockHere->moveAllChildrenTo(anonBlockThere, anonBlockThere->children());
+        anonBlockHere->moveAllChildrenTo(anonBlockThere, true);
         anonBlockHere->deleteLineBoxTree();
         anonBlockHere->destroy();

trunk/Source/WebCore/rendering/RenderTableCol.h

@@ -38 +38 @@
     explicit RenderTableCol(Element&);
     Element& element() const { return toElement(nodeForNonAnonymous()); }
-
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE { return &m_children; }
 
     void clearPreferredLogicalWidthsDirtyBits();
@@ -98 +92 @@
     RenderTable* table() const;
 
-    RenderObjectChildList m_children;
     unsigned m_span;
 };

trunk/Source/WebCore/rendering/RenderTableRow.h

@@ -36 +36 @@
 public:
     explicit RenderTableRow(Element*);
-
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE { return &m_children; }
 
     RenderTableSection* section() const { return toRenderTableSection(parent()); }
@@ -96 +90 @@
     virtual bool isTableRow() const OVERRIDE { return true; }
 
+    virtual bool canHaveChildren() const OVERRIDE { return true; }
     virtual void willBeRemovedFromTree() OVERRIDE;
 
@@ -110 +105 @@
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
-    RenderObjectChildList m_children;
     unsigned m_rowIndex : 31;
 };

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -66 +66 @@
     virtual ~RenderTableSection();
 
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE { return &m_children; }
-
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE;
 
@@ -205 +199 @@
     virtual const char* renderName() const OVERRIDE { return (isAnonymous() || isPseudoElement()) ? "RenderTableSection (anonymous)" : "RenderTableSection"; }
 
+    virtual bool canHaveChildren() const OVERRIDE { return true; }
+
     virtual bool isTableSection() const OVERRIDE { return true; }
 
@@ -242 +238 @@
 
     void setLogicalPositionForCell(RenderTableCell*, unsigned effectiveColumn) const;
-
-    RenderObjectChildList m_children;
 
     Vector<RowStruct> m_grid;

trunk/Source/WebCore/rendering/RenderText.h

@@ -159 +159 @@
 
 private:
+    virtual bool canHaveChildren() const OVERRIDE FINAL { return false; }
+
     void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
 

trunk/Source/WebCore/rendering/RenderingAllInOne.cpp

@@ -85 +85 @@
 #include "RenderMultiColumnSet.cpp"
 #include "RenderObject.cpp"
-#include "RenderObjectChildList.cpp"
 #include "RenderProgress.cpp"
 #include "RenderQuote.cpp"

trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.cpp

@@ -140 +140 @@
 
     // Destroy our current children
-    children()->destroyLeftoverChildren();
+    destroyLeftoverChildren();
 
     // Since we share a node with our children, destroying our children may set our node's

trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h

@@ -36 +36 @@
     virtual ~RenderSVGContainer();
 
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE FINAL { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE FINAL { return &m_children; }
-
     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
     virtual void setNeedsBoundariesUpdate() OVERRIDE FINAL { m_needsBoundariesUpdate = true; }
@@ -53 +47 @@
     virtual bool isSVGContainer() const OVERRIDE FINAL { return true; }
     virtual const char* renderName() const OVERRIDE { return "RenderSVGContainer"; }
+
+    virtual bool canHaveChildren() const OVERRIDE FINAL { return true; }
 
     virtual void layout() OVERRIDE;
@@ -80 +76 @@
 
 private:
-    RenderObjectChildList m_children;
     FloatRect m_objectBoundingBox;
     bool m_objectBoundingBoxValid;

trunk/Source/WebCore/rendering/svg/RenderSVGGradientStop.h

@@ -54 +54 @@
 
 private:
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
+
     SVGGradientElement* gradientElement() const;
 };

trunk/Source/WebCore/rendering/svg/RenderSVGImage.h

@@ -60 +60 @@
     virtual const char* renderName() const { return "RenderSVGImage"; }
     virtual bool isSVGImage() const OVERRIDE { return true; }
+    virtual bool canHaveChildren() const OVERRIDE { return false; }
 
     virtual const AffineTransform& localToParentTransform() const { return m_localTransform; }

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -96 +96 @@
 {
     SVGResourcesCache::clientDestroyed(this);
-    RenderObject::willBeDestroyed();
+    RenderElement::willBeDestroyed();
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

@@ -46 +46 @@
 
     virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio, bool& isPercentageIntrinsicSize) const OVERRIDE;
-
-    RenderObject* firstChild() const { return m_children.firstChild(); }
-    RenderObject* lastChild() const { return m_children.lastChild(); }
-
-    virtual const RenderObjectChildList* children() const OVERRIDE { return &m_children; }
-    virtual RenderObjectChildList* children() OVERRIDE { return &m_children; }
 
     bool isLayoutSizeChanged() const { return m_isLayoutSizeChanged; }
@@ -116 +110 @@
     void buildLocalToBorderBoxTransform();
 
-    RenderObjectChildList m_children;
     IntSize m_containerSize;
     FloatRect m_objectBoundingBox;

trunk/Source/WebCore/rendering/svg/RenderSVGShape.h

@@ -116 +116 @@
 
     virtual bool isSVGShape() const OVERRIDE FINAL { return true; }
+    virtual bool canHaveChildren() const OVERRIDE FINAL { return false; }
     virtual const char* renderName() const { return "RenderSVGShape"; }