| 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 Apple Inc. All rights
reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 | 593 |
| 594 ASSERT(!needsLayout()); | 594 ASSERT(!needsLayout()); |
| 595 | 595 |
| 596 statePusher.pop(); | 596 statePusher.pop(); |
| 597 | 597 |
| 598 return m_rowPos[m_grid.size()]; | 598 return m_rowPos[m_grid.size()]; |
| 599 } | 599 } |
| 600 | 600 |
| 601 void RenderTableSection::layout() | 601 void RenderTableSection::layout() |
| 602 { | 602 { |
| 603 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 604 ASSERT(needsLayout()); | 603 ASSERT(needsLayout()); |
| 605 ASSERT(!needsCellRecalc()); | 604 ASSERT(!needsCellRecalc()); |
| 606 ASSERT(!table()->needsSectionRecalc()); | 605 ASSERT(!table()->needsSectionRecalc()); |
| 607 | 606 |
| 608 // addChild may over-grow m_grid but we don't want to throw away the memory
too early as addChild | 607 // addChild may over-grow m_grid but we don't want to throw away the memory
too early as addChild |
| 609 // can be called in a loop (e.g during parsing). Doing it now ensures we hav
e a stable-enough structure. | 608 // can be called in a loop (e.g during parsing). Doing it now ensures we hav
e a stable-enough structure. |
| 610 m_grid.shrinkToFit(); | 609 m_grid.shrinkToFit(); |
| 611 | 610 |
| 612 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i
sFlippedBlocksWritingMode()); | 611 LayoutStateMaintainer statePusher(view(), this, locationOffset(), style()->i
sFlippedBlocksWritingMode()); |
| 613 | 612 |
| (...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1684 if (!style()->isLeftToRightDirection()) | 1683 if (!style()->isLeftToRightDirection()) |
| 1685 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); | 1684 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); |
| 1686 else | 1685 else |
| 1687 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); | 1686 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); |
| 1688 | 1687 |
| 1689 cell->setLogicalLocation(cellLocation); | 1688 cell->setLogicalLocation(cellLocation); |
| 1690 view()->addLayoutDelta(oldCellLocation - cell->location()); | 1689 view()->addLayoutDelta(oldCellLocation - cell->location()); |
| 1691 } | 1690 } |
| 1692 | 1691 |
| 1693 } // namespace WebCore | 1692 } // namespace WebCore |
| OLD | NEW |