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

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

Issue 23351002: Crash when opening web page http://build.webkit.org/waterfall. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review comments addressed 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/fast/table/table-rowspan-crash-with-huge-rowspan-cells-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 d55550b194e2a47ede55dfeadeb3dbd0a2b987b9..339d9a0760adc0ec0766b1ebb8b43d083c87cc21 100644
--- a/Source/core/rendering/RenderTableSection.cpp
+++ b/Source/core/rendering/RenderTableSection.cpp
@@ -382,8 +382,12 @@ static bool compareRowSpanCellsInHeightDistributionOrder(const RenderTableCell*
if (cellRowIndex1 == cellRowIndex2 && cellRowSpan1 == cellRowSpan2)
return (cell2->logicalHeightForRowSizing() > cell1->logicalHeightForRowSizing());
+ else if (cellRowIndex2 >= cellRowIndex1 && (cellRowIndex2 + cellRowSpan2) <= (cellRowIndex1 + cellRowSpan1))
Julien - ping for review 2013/08/22 21:48:08 The else is not mandated as you return all the tim
suchit.agrawal 2013/08/23 13:37:26 Done.
+ return true;
+ else if (!(cellRowIndex1 >= cellRowIndex2 && (cellRowIndex1 + cellRowSpan1) <= (cellRowIndex2 + cellRowSpan2)))
+ return (cellRowIndex2 < cellRowIndex1);
- return (cellRowIndex2 >= cellRowIndex1 && (cellRowIndex2 + cellRowSpan2) <= (cellRowIndex1 + cellRowSpan1));
+ return false;
a.suchit 2013/08/22 10:26:17 I think now it is strict equality. We are sorting
Julien - ping for review 2013/08/22 21:48:08 I don't have your confidence and based on the fact
suchit.agrawal 2013/08/23 13:37:26 Sorry but last time, I don't have whole idea about
}
// Distribute rowSpan cell height in rows those comes in rowSpan cell based on the ratio of row's height if
« no previous file with comments | « LayoutTests/fast/table/table-rowspan-crash-with-huge-rowspan-cells-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698