| OLD | NEW |
| 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 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1160 row_layout_object->SetLogicalLocation(LayoutPoint(0, row_pos_[r])); | 1160 row_layout_object->SetLogicalLocation(LayoutPoint(0, row_pos_[r])); |
| 1161 row_layout_object->SetLogicalWidth(LogicalWidth()); | 1161 row_layout_object->SetLogicalWidth(LogicalWidth()); |
| 1162 LayoutUnit row_logical_height(row_pos_[r + 1] - row_pos_[r] - vspacing); | 1162 LayoutUnit row_logical_height(row_pos_[r + 1] - row_pos_[r] - vspacing); |
| 1163 if (state.IsPaginated() && r + 1 < total_rows) { | 1163 if (state.IsPaginated() && r + 1 < total_rows) { |
| 1164 // If the next row has a pagination strut, we need to subtract it. It | 1164 // If the next row has a pagination strut, we need to subtract it. It |
| 1165 // should not be included in this row's height. | 1165 // should not be included in this row's height. |
| 1166 if (LayoutTableRow* next_row_object = grid_[r + 1].row_layout_object) | 1166 if (LayoutTableRow* next_row_object = grid_[r + 1].row_layout_object) |
| 1167 row_logical_height -= next_row_object->PaginationStrut(); | 1167 row_logical_height -= next_row_object->PaginationStrut(); |
| 1168 } | 1168 } |
| 1169 row_layout_object->SetLogicalHeight(row_logical_height); | 1169 row_layout_object->SetLogicalHeight(row_logical_height); |
| 1170 row_layout_object->UpdateLayerTransformAfterLayout(); | 1170 row_layout_object->UpdateAfterLayout(); |
| 1171 } | 1171 } |
| 1172 } | 1172 } |
| 1173 | 1173 |
| 1174 // Vertically align and flex the cells in each row. | 1174 // Vertically align and flex the cells in each row. |
| 1175 for (unsigned r = 0; r < total_rows; r++) { | 1175 for (unsigned r = 0; r < total_rows; r++) { |
| 1176 LayoutTableRow* row_layout_object = grid_[r].row_layout_object; | 1176 LayoutTableRow* row_layout_object = grid_[r].row_layout_object; |
| 1177 | 1177 |
| 1178 unsigned n_cols = NumCols(r); | 1178 unsigned n_cols = NumCols(r); |
| 1179 for (unsigned c = 0; c < n_cols; c++) { | 1179 for (unsigned c = 0; c < n_cols; c++) { |
| 1180 LayoutTableCell* cell = OriginatingCellAt(r, c); | 1180 LayoutTableCell* cell = OriginatingCellAt(r, c); |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2166 bool LayoutTableSection::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() | 2166 bool LayoutTableSection::PaintedOutputOfObjectHasNoEffectRegardlessOfSize() |
| 2167 const { | 2167 const { |
| 2168 // LayoutTableSection paints background from columns. | 2168 // LayoutTableSection paints background from columns. |
| 2169 if (Table()->HasColElements()) | 2169 if (Table()->HasColElements()) |
| 2170 return false; | 2170 return false; |
| 2171 return LayoutTableBoxComponent:: | 2171 return LayoutTableBoxComponent:: |
| 2172 PaintedOutputOfObjectHasNoEffectRegardlessOfSize(); | 2172 PaintedOutputOfObjectHasNoEffectRegardlessOfSize(); |
| 2173 } | 2173 } |
| 2174 | 2174 |
| 2175 } // namespace blink | 2175 } // namespace blink |
| OLD | NEW |