Index: WebCore/rendering/RenderBlock.h |
=================================================================== |
--- WebCore/rendering/RenderBlock.h (revision 37094) |
+++ WebCore/rendering/RenderBlock.h (working copy) |
@@ -142,6 +142,8 @@ |
protected: |
void moveChildTo(RenderObject* to, RenderObjectChildList* toChildList, RenderObject* child); |
void moveChildTo(RenderObject* to, RenderObjectChildList* toChildList, RenderObject* beforeChild, RenderObject* child); |
+ void moveAllChildrenTo(RenderObject* to, RenderObjectChildList* toChildList); |
+ void moveAllChildrenTo(RenderObject* to, RenderObjectChildList* toChildList, RenderObject* beforeChild); |
int maxTopPosMargin() const { return m_maxMargin ? m_maxMargin->m_topPos : MaxMargin::topPosDefault(this); } |
int maxTopNegMargin() const { return m_maxMargin ? m_maxMargin->m_topNeg : MaxMargin::topNegDefault(this); } |
@@ -516,6 +518,10 @@ |
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>. |
mutable int m_lineHeight; |
+ |
+ // RenderRubyBase objects need to be able to split and merge, moving their children around |
+ // (calling moveChildTo, moveAllChildrenTo, and makeChildrenNonInline). |
+ friend class RenderRubyBase; |
}; |
inline RenderBlock* toRenderBlock(RenderObject* object) |