Merge 53525 - Bug 33266 WebCore::InlineFlowBox::determineSpacingForFlowBoxes...

WebCore/rendering/RenderRubyBase.h

Index: WebCore/rendering/RenderRubyBase.h
===================================================================
--- WebCore/rendering/RenderRubyBase.h	(revision 37094)
+++ WebCore/rendering/RenderRubyBase.h	(working copy)
@@ -46,8 +46,16 @@
 
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const;
 
-    void splitToLeft(RenderBlock* leftBase, RenderObject* beforeChild);
-    void mergeWithRight(RenderBlock* rightBase);
+private:
+    bool hasOnlyWrappedInlineChildren(RenderObject* beforeChild = 0) const;
+
+    void moveChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
+    void moveInlineChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
+    void moveBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
+    void mergeBlockChildren(RenderRubyBase* toBase, RenderObject* fromBeforeChild = 0);
+    
+    // Allow RenderRubyRun to manipulate the children within ruby bases.
+    friend class RenderRubyRun;
 };
 
 } // namespace WebCore