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

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

Issue 25687002: Add support for the column-fill property. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Put changes to problematic files (for the bots) back in. Created 7 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 | « Source/core/page/UseCounter.cpp ('k') | Source/core/rendering/RenderMultiColumnBlock.h » ('j') | 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 24f3f026f6c14b1e10536b4590f4c9f3dfa0b941..c5658c36751ff2f6c6c896eaf30523379bea4b87 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -6474,8 +6474,13 @@ void RenderBlock::adjustLinePositionForPagination(RootInlineBox* lineBox, Layout
lineBox->setPaginationStrut(remainingLogicalHeight);
lineBox->setIsFirstAfterPageBreak(true);
}
- } else if (remainingLogicalHeight == pageLogicalHeight && lineBox != firstRootBox())
- lineBox->setIsFirstAfterPageBreak(true);
+ } else if (remainingLogicalHeight == pageLogicalHeight) {
+ // We're at the very top of a page or column.
+ if (lineBox != firstRootBox())
+ lineBox->setIsFirstAfterPageBreak(true);
+ if (lineBox != firstRootBox() || offsetFromLogicalTopOfFirstPage())
+ setPageBreak(logicalOffset, lineHeight);
+ }
}
bool RenderBlock::lineWidthForPaginatedLineChanged(RootInlineBox* rootBox, LayoutUnit lineDelta, RenderFlowThread* flowThread) const
« no previous file with comments | « Source/core/page/UseCounter.cpp ('k') | Source/core/rendering/RenderMultiColumnBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698