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, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc.
All rights reserved. |
8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
9 * | 9 * |
10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 if (RenderTableSection* section = firstBody()) | 382 if (RenderTableSection* section = firstBody()) |
383 extraLogicalHeight -= section->distributeExtraLogicalHeightToRows(extraL
ogicalHeight); | 383 extraLogicalHeight -= section->distributeExtraLogicalHeightToRows(extraL
ogicalHeight); |
384 | 384 |
385 // FIXME: We really would like to enable this ASSERT to ensure that all the
extra space has been distributed. | 385 // FIXME: We really would like to enable this ASSERT to ensure that all the
extra space has been distributed. |
386 // However our current distribution algorithm does not round properly and th
us we can have some remaining height. | 386 // However our current distribution algorithm does not round properly and th
us we can have some remaining height. |
387 // ASSERT(!topSection() || !extraLogicalHeight); | 387 // ASSERT(!topSection() || !extraLogicalHeight); |
388 } | 388 } |
389 | 389 |
390 void RenderTable::simplifiedNormalFlowLayout() | 390 void RenderTable::simplifiedNormalFlowLayout() |
391 { | 391 { |
| 392 // FIXME: We should walk through the items in the tree in tree order to do t
he layout here |
| 393 // instead of walking through individual parts of the tree. crbug.com/442737 |
| 394 for (auto& caption : m_captions) |
| 395 caption->layoutIfNeeded(); |
| 396 |
392 for (RenderTableSection* section = topSection(); section; section = sectionB
elow(section)) { | 397 for (RenderTableSection* section = topSection(); section; section = sectionB
elow(section)) { |
393 section->layoutIfNeeded(); | 398 section->layoutIfNeeded(); |
394 section->computeOverflowFromCells(); | 399 section->computeOverflowFromCells(); |
395 } | 400 } |
396 } | 401 } |
397 | 402 |
398 void RenderTable::layout() | 403 void RenderTable::layout() |
399 { | 404 { |
400 ASSERT(needsLayout()); | 405 ASSERT(needsLayout()); |
401 | 406 |
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1344 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const | 1349 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const |
1345 { | 1350 { |
1346 ASSERT(cell->isFirstOrLastCellInRow()); | 1351 ASSERT(cell->isFirstOrLastCellInRow()); |
1347 if (hasSameDirectionAs(cell->row())) | 1352 if (hasSameDirectionAs(cell->row())) |
1348 return style()->borderEnd(); | 1353 return style()->borderEnd(); |
1349 | 1354 |
1350 return style()->borderStart(); | 1355 return style()->borderStart(); |
1351 } | 1356 } |
1352 | 1357 |
1353 } | 1358 } |
OLD | NEW |