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

Unified Diff: Source/WebCore/rendering/RenderTableCell.cpp

Issue 13393017: Merge 145822 "REGRESSION(r145305) Performance: 1.3% mac-release-..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderTableCell.cpp
===================================================================
--- Source/WebCore/rendering/RenderTableCell.cpp (revision 147363)
+++ Source/WebCore/rendering/RenderTableCell.cpp (working copy)
@@ -251,7 +251,7 @@
// for layout (the padding required to push the contents of the cell down to the row's baseline) is included in our new height and baseline and makes both
// of them wrong. So if our content's intrinsic height has changed push the new content up into the intrinsic padding and relayout so that the rest of
// table and row layout can use the correct baseline and height for this cell.
- if (isBaselineAligned() && cellBaselinePosition() > section()->rowBaseline(rowIndex())) {
+ if (isBaselineAligned() && section()->rowBaseline(rowIndex()) && cellBaselinePosition() > section()->rowBaseline(rowIndex())) {
int newIntrinsicPaddingBefore = max<LayoutUnit>(0, intrinsicPaddingBefore() - max<LayoutUnit>(0, cellBaselinePosition() - oldCellBaseline));
setIntrinsicPaddingBefore(newIntrinsicPaddingBefore);
setNeedsLayout(true, MarkOnlyThis);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698