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; |
} |