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

Unified Diff: Source/core/rendering/RenderTableSection.cpp

Issue 21909002: Crash when inner and outer spanning cells end indexes are same. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 4 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 | « LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderTableSection.cpp
diff --git a/Source/core/rendering/RenderTableSection.cpp b/Source/core/rendering/RenderTableSection.cpp
index 7bd443359e355938b2044e683827cb9af469f036..282e7fa45ab0745dbbfa2c5ae61cf3c6524ae5f8 100644
--- a/Source/core/rendering/RenderTableSection.cpp
+++ b/Source/core/rendering/RenderTableSection.cpp
@@ -414,7 +414,7 @@ void RenderTableSection::distributeRowSpanHeightToRows(SpanningRenderTableCells&
int originalBeforePosition = m_rowPos[rowIndex + rowSpan];
if (extraHeightToPropagate) {
- for (unsigned row = lastRowIndex + lastRowSpan + 1; row <= rowIndex + rowSpan; row++)
+ for (unsigned row = lastRowIndex + lastRowSpan; row <= rowIndex + rowSpan; row++)
m_rowPos[row] += extraHeightToPropagate;
}
@@ -455,11 +455,12 @@ 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 + 1; row <= m_grid.size(); row++)
+ for (unsigned row = lastRowIndex + lastRowSpan; row <= m_grid.size(); row++)
m_rowPos[row] += extraHeightToPropagate;
}
}
« no previous file with comments | « LayoutTests/platform/win/tables/mozilla/bugs/bug7714-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698