| 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 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 476 | 476 |
| 477 LayoutUnit totalSectionLogicalHeight; | 477 LayoutUnit totalSectionLogicalHeight; |
| 478 LayoutUnit oldTableLogicalTop; | 478 LayoutUnit oldTableLogicalTop; |
| 479 for (unsigned i = 0; i < m_captions.size(); i++) | 479 for (unsigned i = 0; i < m_captions.size(); i++) |
| 480 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i]
->marginBefore() + m_captions[i]->marginAfter(); | 480 oldTableLogicalTop += m_captions[i]->logicalHeight() + m_captions[i]
->marginBefore() + m_captions[i]->marginAfter(); |
| 481 | 481 |
| 482 bool collapsing = collapseBorders(); | 482 bool collapsing = collapseBorders(); |
| 483 | 483 |
| 484 for (LayoutObject* child = firstChild(); child; child = child->nextSibli
ng()) { | 484 for (LayoutObject* child = firstChild(); child; child = child->nextSibli
ng()) { |
| 485 if (!child->needsLayout() && child->isBox()) | 485 if (!child->needsLayout() && child->isBox()) |
| 486 toLayoutBox(child)->markForPaginationRelayoutIfNeeded(layouter); | 486 markChildForPaginationRelayoutIfNeeded(*toLayoutBox(child), layo
uter); |
| 487 if (child->isTableSection()) { | 487 if (child->isTableSection()) { |
| 488 LayoutTableSection* section = toLayoutTableSection(child); | 488 LayoutTableSection* section = toLayoutTableSection(child); |
| 489 if (m_columnLogicalWidthChanged) | 489 if (m_columnLogicalWidthChanged) |
| 490 layouter.setChildNeedsLayout(section); | 490 layouter.setChildNeedsLayout(section); |
| 491 section->layoutIfNeeded(); | 491 section->layoutIfNeeded(); |
| 492 totalSectionLogicalHeight += section->calcRowLogicalHeight(); | 492 totalSectionLogicalHeight += section->calcRowLogicalHeight(); |
| 493 if (collapsing) | 493 if (collapsing) |
| 494 section->recalcOuterBorder(); | 494 section->recalcOuterBorder(); |
| 495 ASSERT(!section->needsLayout()); | 495 ASSERT(!section->needsLayout()); |
| 496 } else if (child->isLayoutTableCol()) { | 496 } else if (child->isLayoutTableCol()) { |
| (...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1488 | 1488 |
| 1489 LayoutUnit LayoutTable::paddingRight() const | 1489 LayoutUnit LayoutTable::paddingRight() const |
| 1490 { | 1490 { |
| 1491 if (collapseBorders()) | 1491 if (collapseBorders()) |
| 1492 return LayoutUnit(); | 1492 return LayoutUnit(); |
| 1493 | 1493 |
| 1494 return LayoutBlock::paddingRight(); | 1494 return LayoutBlock::paddingRight(); |
| 1495 } | 1495 } |
| 1496 | 1496 |
| 1497 } // namespace blink | 1497 } // namespace blink |
| OLD | NEW |