| Index: third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp b/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| index 1a448119fae779bd37859db310f81c04a513c052..f43e1eeb279507fbf53cbb7ade8bf17d1ebee0f5 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| @@ -123,8 +123,12 @@ void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase,
|
| anonBlockHere->deleteLineBoxTree();
|
| anonBlockHere->destroy();
|
| }
|
| - // Move all remaining children normally.
|
| - moveChildrenTo(toBase, firstChild(), beforeChild);
|
| + // Move all remaining children normally. If moving all children, include our
|
| + // float list.
|
| + if (!beforeChild)
|
| + moveAllChildrenIncludingFloatsTo(toBase, toBase->hasLayer() || hasLayer());
|
| + else
|
| + moveChildrenTo(toBase, firstChild(), beforeChild, toBase->children());
|
| }
|
|
|
| ETextAlign LayoutRubyBase::textAlignmentForLine(
|
|
|