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

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

Issue 47923009: Table rows are incorrectly collapsed in case of hidden cells and rowspans. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
Index: Source/core/rendering/RenderTableSection.cpp
diff --git a/Source/core/rendering/RenderTableSection.cpp b/Source/core/rendering/RenderTableSection.cpp
index db5577a5ee73a23a31087ede0ce0427546e5471d..5fa44e29358ea09b5f5845e9a0d0bf5eb92884d7 100644
--- a/Source/core/rendering/RenderTableSection.cpp
+++ b/Source/core/rendering/RenderTableSection.cpp
@@ -544,7 +544,17 @@ void RenderTableSection::distributeRowSpanHeightToRows(SpanningRenderTableCells&
if (spanningRowsHeight.rowWithOnlySpanningCells)
updateRowsHeightHavingOnlySpanningCells(cell, spanningRowsHeight);
- if (!spanningRowsHeight.totalRowsHeight || spanningRowsHeight.spanningCellHeightIgnoringBorderSpacing <= spanningRowsHeight.totalRowsHeight) {
+
+ if (!spanningRowsHeight.totalRowsHeight && spanningRowsHeight.spanningCellHeightIgnoringBorderSpacing) {
+ if (spanningRowsHeight.spanningCellHeightIgnoringBorderSpacing) {
Julien - ping for review 2013/10/30 18:12:44 This 'if' is unneeded: to get into this branch, yo
suchit.agrawal 2013/10/31 13:43:02 Previous condition is wrong. Forgot to remove it f
+ spanningRowsHeight.totalRowsHeight = spanningRowsHeight.spanningCellHeightIgnoringBorderSpacing + borderSpacingForRow(rowIndex + rowSpan -1);
Julien - ping for review 2013/10/30 18:12:44 Please add a comment about what this line is suppo
suchit.agrawal 2013/10/31 13:43:02 spanningRowsHeight.totalRowsHeight change is not r
+ m_rowPos[rowIndex + rowSpan] += spanningRowsHeight.totalRowsHeight;
+ }
+ extraHeightToPropagate = m_rowPos[rowIndex + rowSpan] - originalBeforePosition;
+ continue;
+ }
+
+ if (spanningRowsHeight.spanningCellHeightIgnoringBorderSpacing <= spanningRowsHeight.totalRowsHeight) {
extraHeightToPropagate = m_rowPos[rowIndex + rowSpan] - originalBeforePosition;
continue;
}

Powered by Google App Engine
This is Rietveld 408576698