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

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

Issue 2434543004: Specified row height should be applied during initial section layout. (Closed)
Patch Set: Code review. Created 4 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
« no previous file with comments | « third_party/WebKit/LayoutTests/fragmentation/table-row-with-specified-height.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 25fb70ab90f774205c1b74dae700f9f6112bb61c..7586ee7266b54949e7ef25b59c22ed8cee6c79cc 100644
--- a/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
@@ -1965,6 +1965,7 @@ void LayoutTableSection::relayoutCellIfFlexed(LayoutTableCell& cell,
int LayoutTableSection::logicalHeightForRow(
const LayoutTableRow& rowObject) const {
unsigned rowIndex = rowObject.rowIndex();
+ DCHECK(rowIndex < m_grid.size());
int logicalHeight = 0;
const Row& row = m_grid[rowIndex].row;
unsigned cols = row.size();
@@ -1980,6 +1981,12 @@ int LayoutTableSection::logicalHeightForRow(
std::max(logicalHeight, cell->logicalHeightForRowSizing());
}
}
+
+ if (m_grid[rowIndex].logicalHeight.isSpecified()) {
+ LayoutUnit specifiedLogicalHeight =
+ minimumValueForLength(m_grid[rowIndex].logicalHeight, LayoutUnit());
+ logicalHeight = std::max(logicalHeight, specifiedLogicalHeight.toInt());
+ }
return logicalHeight;
}
« no previous file with comments | « third_party/WebKit/LayoutTests/fragmentation/table-row-with-specified-height.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698