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

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

Issue 1602773005: Respect break-inside:avoid on table rows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated Created 4 years, 9 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/LayoutTableCell.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
index bc62253984249840a2d113bff033d44650651947..0a038436f51203c325ac63f977a3b614a53f7ec8 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableCell.cpp
@@ -1003,4 +1003,14 @@ bool LayoutTableCell::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localR
return LayoutBlockFlow::backgroundIsKnownToBeOpaqueInRect(localRect);
}
+LayoutUnit LayoutTableCell::calculatePaginationStrutToFitContent(LayoutUnit offset, LayoutUnit strutToNextPage, LayoutUnit contentLogicalHeight) const
+{
+ // If break-inside:avoid/forbid is set on a cell we should avoid setting a strut on lines unless the cell is taller than the page,
mstensho (USE GERRIT) 2016/03/29 09:57:46 "forbid" is not a valid value. Also, you're checki
rhogan 2016/03/29 19:04:36 Reflecting my loose-grasp of the break-inside valu
mstensho (USE GERRIT) 2016/03/31 09:55:04 OK, which test? Should be fairly easy to convert i
rhogan 2016/04/03 14:56:41 Now covered by: LayoutTests/fast/multicol/single-l
+ // in which case we've no choice but to allow it. This special-casing is needed because cells don't propagate struts like normal
+ // layout blocks - the struts are managed directly by the section when it lays out rows and cells.
+ LayoutUnit pageLogicalHeight = pageLogicalHeightForOffset(offset);
+ if (toLayoutBox(parent())->getPaginationBreakability() != AllowAnyBreaks && table()->vBorderSpacing() + logicalHeight() + contentLogicalHeight < pageLogicalHeight)
+ return LayoutUnit();
+ return LayoutBox::calculatePaginationStrutToFitContent(offset, strutToNextPage, contentLogicalHeight);
mstensho (USE GERRIT) 2016/03/29 09:57:46 Please use LayoutBlockFlow:: (super class)
+}
} // namespace blink
mstensho (USE GERRIT) 2016/03/29 09:57:46 Please re-add the blank line before this.

Powered by Google App Engine
This is Rietveld 408576698