| 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 bcd4f9a58e7be98c44a59e9fd0214f768f94368d..7bf0853a519e8b1624795aa8c3d4bc6e4341e2ac 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutTableSection.cpp
|
| @@ -259,8 +259,9 @@ void LayoutTableSection::addCell(LayoutTableCell* cell, LayoutTableRow* row) {
|
| // <TR><TD colspan="2">5
|
| // </TABLE>
|
| unsigned nCols = numCols(insertionRow);
|
| - while (m_cCol < nCols && (cellAt(insertionRow, m_cCol).hasCells() ||
|
| - cellAt(insertionRow, m_cCol).inColSpan))
|
| + while (m_cCol < nCols &&
|
| + (cellAt(insertionRow, m_cCol).hasCells() ||
|
| + cellAt(insertionRow, m_cCol).inColSpan))
|
| m_cCol++;
|
|
|
| updateLogicalHeightForCell(m_grid[insertionRow], cell);
|
| @@ -588,9 +589,9 @@ unsigned LayoutTableSection::calcRowHeightHavingOnlySpanningCells(
|
| unsigned extraHeightRequired =
|
| cell->logicalHeightForRowSizing() - totalRowspanCellHeight;
|
|
|
| - rowHeight =
|
| - std::max(rowHeight, extraHeightRequired /
|
| - spanningCellsRowsCountHavingZeroHeight);
|
| + rowHeight = std::max(
|
| + rowHeight,
|
| + extraHeightRequired / spanningCellsRowsCountHavingZeroHeight);
|
| }
|
| }
|
|
|
| @@ -811,9 +812,9 @@ void LayoutTableSection::updateBaselineForCell(LayoutTableCell* cell,
|
| cell->logicalHeightForRowSizing() - baselinePosition);
|
| cellStartRowBaselineDescent = baselineDescent;
|
| }
|
| - m_rowPos[row + 1] =
|
| - std::max<int>(m_rowPos[row + 1], m_rowPos[row] + m_grid[row].baseline +
|
| - cellStartRowBaselineDescent);
|
| + m_rowPos[row + 1] = std::max<int>(
|
| + m_rowPos[row + 1],
|
| + m_rowPos[row] + m_grid[row].baseline + cellStartRowBaselineDescent);
|
| }
|
| }
|
|
|
|
|