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

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 488183003: Multi-column properties in a flexbox hide its content (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Incorporated nits Created 6 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 | « LayoutTests/css3/flexbox/flexbox-with-multi-column-property-expected.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index 585f1adc2cf5cf7d7d02e1b68f4d7f4193f894b7..8ad96ce994430183b8c60b0fbde0088f8cc87826 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -3304,7 +3304,7 @@ bool RenderBlock::requiresColumns(int desiredColumnCount) const
return firstChild()
&& (desiredColumnCount != 1 || !style()->hasAutoColumnWidth() || isPaginated)
&& !firstChild()->isAnonymousColumnsBlock()
- && !firstChild()->isAnonymousColumnSpanBlock();
+ && !firstChild()->isAnonymousColumnSpanBlock() && !isFlexibleBoxIncludingDeprecated();
}
void RenderBlock::setDesiredColumnCountAndWidth(int count, LayoutUnit width)
« no previous file with comments | « LayoutTests/css3/flexbox/flexbox-with-multi-column-property-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698