| 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 3a27e22ddb8910d6f4dacd15bd9623418553bd1d..829402df48b1c39d2aa6c3340bc5ac5c1ac2580f 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
|
| @@ -124,8 +124,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(
|
|
|