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

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

Issue 2452993002: Clear floats when we make a ruby base's children inline (Closed)
Patch Set: Created 4 years, 2 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-made-inline-crash-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/LayoutBlockFlow.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
index eff4a92a2984d6d0e01a3bbd28dca308342cce72..a1805c0c980bd5aba80ae79968460c7d42948e7f 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -3128,6 +3128,12 @@ void LayoutBlockFlow::collapseAnonymousBlockChild(LayoutBlockFlow* child) {
LayoutInvalidationReason::ChildAnonymousBlockChanged);
child->moveAllChildrenTo(this, child->nextSibling(), child->hasLayer());
+ // If we make an object's children inline we are going to frustrate any future
+ // attempts to remove floats from its children's float-lists before the next
+ // layout happens so clear down all the floatlists now - they will be rebuilt
+ // at layout.
+ if (child->childrenInline())
+ removeFloatingObjectsFromDescendants();
setChildrenInline(child->childrenInline());
children()->removeChildNode(this, child, child->hasLayer());
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/float/rubybase-children-made-inline-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698