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

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

Issue 1710843003: Ability to return the height of fragmentainer groups that don't yet exist. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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: 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 e9d007419042c786cccfc583a3b5e339e3730c45..468ccc3017aade902d0d3643e4f84b8f2a66fd45 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -768,10 +768,6 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La
if (remainingLogicalHeight < lineHeight || (shouldBreakAtLineToAvoidWidow() && lineBreakToAvoidWidow() == lineIndex)) {
LayoutUnit paginationStrut = calculatePaginationStrutToFitContent(logicalOffset, remainingLogicalHeight, lineHeight);
LayoutUnit newLogicalOffset = logicalOffset + paginationStrut;
- // The new offset may require us to insert a new row for columns (fragmentainer group).
- // Give the multicol machinery an opportunity to do so (before checking the height of a
- // column that wouldn't have existed yet otherwise).
- paginatedContentWasLaidOut(newLogicalOffset + lineHeight);
// Moving to a different page or column may mean that its height is different.
pageLogicalHeight = pageLogicalHeightForOffset(newLogicalOffset);
if (lineHeight > pageLogicalHeight) {
@@ -779,6 +775,7 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La
// TODO(mstensho): Get rid of this. This is just utter weirdness, but the other browsers
// also do something slightly similar, although in much more specific cases than we do here,
// and printing Google Docs depends on it.
+ paginatedContentWasLaidOut(logicalOffset + lineHeight);
return;
}
@@ -802,6 +799,7 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La
lineBox.setPaginationStrut(paginationStrut);
lineBox.setIsFirstAfterPageBreak(true);
}
+ paginatedContentWasLaidOut(newLogicalOffset + lineHeight);
return;
}

Powered by Google App Engine
This is Rietveld 408576698