Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1687)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp

Issue 2283413003: Copy float list of ruby base when merging it with a sibling (Closed)
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 961ee219899bf79fa864da09921560acecba8e6d..f6f69410f8e7337eee8925870f31460141cf141d 100644
--- a/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
@@ -123,8 +123,11 @@ void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* bef
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, false);
+ else
+ moveChildrenTo(toBase, firstChild(), beforeChild);
}
ETextAlign LayoutRubyBase::textAlignmentForLine(bool /* endsWithSoftBreak */) const
« no previous file with comments | « third_party/WebKit/Source/core/layout/FloatingObjects.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698