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

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

Issue 2653113002: Clear out the float-lists from a ruby base when moving its children (Closed)
Patch Set: Created 3 years, 11 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/LayoutTests/fast/block/float/rubybase-children-moved-crash-2-expected.txt ('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 18d3e2f717d20593acc17ad81a96683db5d08c5d..1a082a529732ddc00c7c0e3ff36f94f5d20640b1 100644
--- a/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutRubyBase.cpp
@@ -126,10 +126,12 @@ void LayoutRubyBase::moveBlockChildren(LayoutRubyBase* toBase,
}
// Move all remaining children normally. If moving all children, include our
// float list.
- if (!beforeChild)
+ if (!beforeChild) {
moveAllChildrenIncludingFloatsTo(toBase, toBase->hasLayer() || hasLayer());
- else
+ } else {
moveChildrenTo(toBase, firstChild(), beforeChild);
+ removeFloatingObjectsFromDescendants();
+ }
}
ETextAlign LayoutRubyBase::textAlignmentForLine(
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/float/rubybase-children-moved-crash-2-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698