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

WebCore/rendering/RenderRubyBase.h

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 public:
     RenderRubyBase(Node*);
     virtual ~RenderRubyBase();
 
     virtual const char* renderName() const { return "RenderRubyBase (anonymous)"; }
 
     virtual bool isRubyBase() const { return true; }
 
     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
 
 #endif // RenderRubyBase_h