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

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

Issue 263083009: [New Multicolumn] Make fast/multicol/overflow-content.html pass in the new implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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
Index: Source/core/rendering/RenderMultiColumnSet.cpp
diff --git a/Source/core/rendering/RenderMultiColumnSet.cpp b/Source/core/rendering/RenderMultiColumnSet.cpp
index 01711123b4832c8d39ff2a6cd0ea71dad9bf1853..12608b6cd8289f77aca34ba0cfdffb0376d21e4f 100644
--- a/Source/core/rendering/RenderMultiColumnSet.cpp
+++ b/Source/core/rendering/RenderMultiColumnSet.cpp
@@ -118,17 +118,16 @@ unsigned RenderMultiColumnSet::findRunWithTallestColumns() const
void RenderMultiColumnSet::distributeImplicitBreaks()
{
- unsigned breakCount = forcedBreaksCount();
-
#ifndef NDEBUG
// There should be no implicit breaks assumed at this point.
- for (unsigned i = 0; i < breakCount; i++)
+ for (unsigned i = 0; i < forcedBreaksCount(); i++)
ASSERT(!m_contentRuns[i].assumedImplicitBreaks());
#endif // NDEBUG
- // There will always be at least one break, since the flow thread reports a "forced break" at
- // end of content.
- ASSERT(breakCount >= 1);
+ // Insert a final content run to encompass all content. This will include overflow if this is
+ // the last set.
+ addForcedBreak(logicalBottomInFlowThread());
Julien - ping for review 2014/05/07 00:55:17 Doesn't this make the call to applyBreakAfterConte
Julien - ping for review 2014/05/07 01:01:11 Forget this comment, I missed that this change had
+ unsigned breakCount = forcedBreaksCount();
// If there is room for more breaks (to reach the used value of column-count), imagine that we
// insert implicit breaks at suitable locations. At any given time, the content run with the
« Source/core/rendering/RenderBlock.cpp ('K') | « Source/core/rendering/RenderMultiColumnSet.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698