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

WebCore/rendering/RenderRubyRun.cpp

Index: WebCore/rendering/RenderRubyRun.cpp
===================================================================
--- WebCore/rendering/RenderRubyRun.cpp	(revision 37095)
+++ WebCore/rendering/RenderRubyRun.cpp	(working copy)
@@ -148,7 +148,7 @@
             RenderRubyRun* newRun = staticCreateRubyRun(ruby);
             ruby->addChild(newRun, this);
             newRun->addChild(child);
-            rubyBaseSafe()->splitToLeft(newRun->rubyBaseSafe(), beforeChild);
+            rubyBaseSafe()->moveChildren(newRun->rubyBaseSafe(), beforeChild);
         }
     } else {
         // child is not a text -> insert it into the base
@@ -170,7 +170,11 @@
             // Ruby run without a base can happen only at the first run.
             RenderRubyRun* rightRun = static_cast<RenderRubyRun*>(rightNeighbour);
             ASSERT(rightRun->hasRubyBase());
-            base->mergeWithRight(rightRun->rubyBaseSafe());
+            RenderRubyBase* rightBase = rightRun->rubyBaseSafe();
+            // Collect all children in a single base, then swap the bases.
+            rightBase->moveChildren(base);
+            moveChildTo(rightRun, rightRun->children(), base);
+            rightRun->moveChildTo(this, children(), rightBase);
             // The now empty ruby base will be removed below.
         }
     }