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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutTableSection.cpp

Issue 2578403002: Changed EVerticalAlign to an enum class and renamed its members (Closed)
Patch Set: Created 4 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1997 Martin Jones (mjones@kde.org) 2 * Copyright (C) 1997 Martin Jones (mjones@kde.org)
3 * (C) 1997 Torben Weis (weis@kde.org) 3 * (C) 1997 Torben Weis (weis@kde.org)
4 * (C) 1998 Waldo Bastian (bastian@kde.org) 4 * (C) 1998 Waldo Bastian (bastian@kde.org)
5 * (C) 1999 Lars Knoll (knoll@kde.org) 5 * (C) 1999 Lars Knoll (knoll@kde.org)
6 * (C) 1999 Antti Koivisto (koivisto@kde.org) 6 * (C) 1999 Antti Koivisto (koivisto@kde.org)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc.
8 * All rights reserved. 8 * All rights reserved.
9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
10 * 10 *
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 SubtreeLayoutScope layouter(*cell); 1192 SubtreeLayoutScope layouter(*cell);
1193 EVerticalAlign cellVerticalAlign; 1193 EVerticalAlign cellVerticalAlign;
1194 // If the cell crosses a fragmentainer boundary, just align it at the 1194 // If the cell crosses a fragmentainer boundary, just align it at the
1195 // top. That's how it was laid out initially, before we knew the final 1195 // top. That's how it was laid out initially, before we knew the final
1196 // row height, and re-aligning it now could result in the cell being 1196 // row height, and re-aligning it now could result in the cell being
1197 // fragmented differently, which could change its height and thus violate 1197 // fragmented differently, which could change its height and thus violate
1198 // the requested alignment. Give up instead of risking circular 1198 // the requested alignment. Give up instead of risking circular
1199 // dependencies and unstable layout. 1199 // dependencies and unstable layout.
1200 if (state.isPaginated() && 1200 if (state.isPaginated() &&
1201 crossesPageBoundary(LayoutUnit(rowLogicalTop), LayoutUnit(rHeight))) 1201 crossesPageBoundary(LayoutUnit(rowLogicalTop), LayoutUnit(rHeight)))
1202 cellVerticalAlign = VerticalAlignTop; 1202 cellVerticalAlign = EVerticalAlign::Top;
1203 else 1203 else
1204 cellVerticalAlign = cell->style()->verticalAlign(); 1204 cellVerticalAlign = cell->style()->verticalAlign();
1205 cell->computeIntrinsicPadding(rHeight, cellVerticalAlign, layouter); 1205 cell->computeIntrinsicPadding(rHeight, cellVerticalAlign, layouter);
1206 1206
1207 LayoutRect oldCellRect = cell->frameRect(); 1207 LayoutRect oldCellRect = cell->frameRect();
1208 1208
1209 setLogicalPositionForCell(cell, c); 1209 setLogicalPositionForCell(cell, c);
1210 1210
1211 cell->layoutIfNeeded(); 1211 cell->layoutIfNeeded();
1212 1212
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
2084 // the header in all columns. 2084 // the header in all columns.
2085 // Note that this is in flow thread coordinates, not visual coordinates. The 2085 // Note that this is in flow thread coordinates, not visual coordinates. The
2086 // enclosing LayoutFlowThread will convert to visual coordinates. 2086 // enclosing LayoutFlowThread will convert to visual coordinates.
2087 if (table()->header() == this && isRepeatingHeaderGroup()) 2087 if (table()->header() == this && isRepeatingHeaderGroup())
2088 rect.setHeight(table()->logicalHeight()); 2088 rect.setHeight(table()->logicalHeight());
2089 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect, 2089 return LayoutTableBoxComponent::mapToVisualRectInAncestorSpace(ancestor, rect,
2090 flags); 2090 flags);
2091 } 2091 }
2092 2092
2093 } // namespace blink 2093 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698