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

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

Issue 1396493005: Table rowspan cell's height resize when percent element present in the cell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/LayoutTableSection.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp b/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
index a8f3d7752261439945f7837105e2a34c4ed9fcd0..eff7bfb0d24318c606a1906c2b8299f4069c5dc6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
@@ -789,25 +789,21 @@ int LayoutTableSection::calcRowLogicalHeight()
rowSpanCells.append(cell);
lastRowSpanCell = cell;
-
- // Find out the baseline. The baseline is set on the first row in a rowSpan.
- updateBaselineForCell(cell, r, baselineDescent);
}
- continue;
}
- ASSERT(cell->rowSpan() == 1);
-
- if (cell->hasOverrideLogicalContentHeight()) {
+ if (cell->rowIndex() == r && cell->hasOverrideLogicalContentHeight()) {
cell->clearIntrinsicPadding();
cell->clearOverrideSize();
cell->forceChildLayout();
}
- m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r] + cell->logicalHeightForRowSizing());
+ if (cell->rowSpan() == 1)
+ m_rowPos[r + 1] = std::max(m_rowPos[r + 1], m_rowPos[r] + cell->logicalHeightForRowSizing());
- // Find out the baseline.
- updateBaselineForCell(cell, r, baselineDescent);
+ // Find out the baseline. The baseline is set on the first row in a rowSpan.
+ if (cell->rowIndex() == r)
+ updateBaselineForCell(cell, r, baselineDescent);
}
}
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/table/table-rowspan-cell-override-logical-content-height-reset-issue-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698