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

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

Issue 1573133002: Need to examine the *bottom* of fragmented content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Slim down the patch; back out columnSetAtBlockOffset() changes. This was already broken prior to th… Created 4 years, 11 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 859ad0c4e5a03b93d16804b6c2338f3745f8c2b6..ba5ebf66f3fa45393c115bdf7106e81abc8fbab1 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
@@ -721,7 +721,7 @@ LayoutUnit LayoutBlockFlow::adjustBlockChildForPagination(LayoutUnit logicalTop,
}
}
- paginatedContentWasLaidOut(newLogicalTop);
+ paginatedContentWasLaidOut(newLogicalTop + child.logicalHeight());
// Similar to how we apply clearance. Go ahead and boost height() to be the place where we're going to position the child.
setLogicalHeight(logicalHeight() + (newLogicalTop - logicalTop));
@@ -781,7 +781,7 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La
// 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);
+ paginatedContentWasLaidOut(newLogicalOffset + lineHeight);
// Moving to a different page or column may mean that its height is different.
pageLogicalHeight = pageLogicalHeightForOffset(newLogicalOffset);
if (lineHeight > pageLogicalHeight) {
@@ -842,7 +842,7 @@ void LayoutBlockFlow::adjustLinePositionForPagination(RootInlineBox& lineBox, La
}
}
- paginatedContentWasLaidOut(logicalOffset);
+ paginatedContentWasLaidOut(logicalOffset + lineHeight);
}
LayoutUnit LayoutBlockFlow::adjustForUnsplittableChild(LayoutBox& child, LayoutUnit logicalOffset) const
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlock.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698