| 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 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 section->computeOverflowFromCells(); | 411 section->computeOverflowFromCells(); |
| 412 section->updateLayerTransformAfterLayout(); | 412 section->updateLayerTransformAfterLayout(); |
| 413 section->addVisualEffectOverflow(); | 413 section->addVisualEffectOverflow(); |
| 414 } | 414 } |
| 415 } | 415 } |
| 416 | 416 |
| 417 bool LayoutTable::recalcChildOverflowAfterStyleChange() | 417 bool LayoutTable::recalcChildOverflowAfterStyleChange() |
| 418 { | 418 { |
| 419 ASSERT(childNeedsOverflowRecalcAfterStyleChange()); | 419 ASSERT(childNeedsOverflowRecalcAfterStyleChange()); |
| 420 clearChildNeedsOverflowRecalcAfterStyleChange(); | 420 clearChildNeedsOverflowRecalcAfterStyleChange(); |
| 421 |
| 422 // If the table needs layout the sections we keep pointers to may have gone
away and |
| 423 // overflow will get recalculated anyway so return early. |
| 424 if (needsLayout()) |
| 425 return false; |
| 426 |
| 421 bool childrenOverflowChanged = false; | 427 bool childrenOverflowChanged = false; |
| 422 for (LayoutTableSection* section = topSection(); section; section = sectionB
elow(section)) { | 428 for (LayoutTableSection* section = topSection(); section; section = sectionB
elow(section)) { |
| 423 if (!section->childNeedsOverflowRecalcAfterStyleChange()) | 429 if (!section->childNeedsOverflowRecalcAfterStyleChange()) |
| 424 continue; | 430 continue; |
| 425 childrenOverflowChanged |= section->recalcChildOverflowAfterStyleChange(
); | 431 childrenOverflowChanged |= section->recalcChildOverflowAfterStyleChange(
); |
| 426 } | 432 } |
| 427 return childrenOverflowChanged; | 433 return childrenOverflowChanged; |
| 428 } | 434 } |
| 429 | 435 |
| 430 void LayoutTable::layout() | 436 void LayoutTable::layout() |
| (...skipping 1043 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1474 | 1480 |
| 1475 LayoutUnit LayoutTable::paddingRight() const | 1481 LayoutUnit LayoutTable::paddingRight() const |
| 1476 { | 1482 { |
| 1477 if (collapseBorders()) | 1483 if (collapseBorders()) |
| 1478 return LayoutUnit(); | 1484 return LayoutUnit(); |
| 1479 | 1485 |
| 1480 return LayoutBlock::paddingRight(); | 1486 return LayoutBlock::paddingRight(); |
| 1481 } | 1487 } |
| 1482 | 1488 |
| 1483 } // namespace blink | 1489 } // namespace blink |
| OLD | NEW |