Chromium Code Reviews| Index: Source/core/rendering/RenderTableSection.cpp |
| diff --git a/Source/core/rendering/RenderTableSection.cpp b/Source/core/rendering/RenderTableSection.cpp |
| index 282e7fa45ab0745dbbfa2c5ae61cf3c6524ae5f8..63aef3bc06be4bb7e70222e6c14331018cecf9b8 100644 |
| --- a/Source/core/rendering/RenderTableSection.cpp |
| +++ b/Source/core/rendering/RenderTableSection.cpp |
| @@ -413,8 +413,14 @@ void RenderTableSection::distributeRowSpanHeightToRows(SpanningRenderTableCells& |
| int originalBeforePosition = m_rowPos[rowIndex + rowSpan]; |
| + // When 2 spanning cells are ending at same row index then while extra height distribution of first spanning |
| + // cell updates position of the last row so getting the original position of the last row in second spanning |
| + // cell need to reduce the height changed by first spanning cell. |
| + if ((rowIndex + rowSpan) == (lastRowIndex + lastRowSpan)) |
|
Julien - ping for review
2013/08/08 16:42:02
The parentheses are unneeded due to operator prece
|
| + originalBeforePosition -= extraHeightToPropagate; |
| + |
| if (extraHeightToPropagate) { |
| - for (unsigned row = lastRowIndex + lastRowSpan; row <= rowIndex + rowSpan; row++) |
| + for (unsigned row = lastRowIndex + lastRowSpan + 1; row <= rowIndex + rowSpan; row++) |
| m_rowPos[row] += extraHeightToPropagate; |
| } |
| @@ -455,12 +461,11 @@ void RenderTableSection::distributeRowSpanHeightToRows(SpanningRenderTableCells& |
| // Getting total changed height in the table |
| extraHeightToPropagate = m_rowPos[rowIndex + rowSpan] - originalBeforePosition; |
| - m_rowPos[rowIndex + rowSpan] -= extraHeightToPropagate; |
| } |
| if (extraHeightToPropagate) { |
| // Apply changed height by rowSpan cells to rows present at the end of the table |
| - for (unsigned row = lastRowIndex + lastRowSpan; row <= m_grid.size(); row++) |
| + for (unsigned row = lastRowIndex + lastRowSpan + 1; row <= m_grid.size(); row++) |
| m_rowPos[row] += extraHeightToPropagate; |
| } |
| } |