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. All r
ights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013 Apple Inc. All r
ights 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 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
697 int RenderTableSection::calcRowLogicalHeight() | 697 int RenderTableSection::calcRowLogicalHeight() |
698 { | 698 { |
699 #if ENABLE(ASSERT) | 699 #if ENABLE(ASSERT) |
700 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this); | 700 SetLayoutNeededForbiddenScope layoutForbiddenScope(*this); |
701 #endif | 701 #endif |
702 | 702 |
703 ASSERT(!needsLayout()); | 703 ASSERT(!needsLayout()); |
704 | 704 |
705 RenderTableCell* cell; | 705 RenderTableCell* cell; |
706 | 706 |
707 // FIXME: This shouldn't use the same constructor as RenderView. | 707 // We may have to forcefully lay out cells here, in which case we need a lay
out |
708 LayoutState state(*this); | 708 // state. Technically, we should also push state for the row, but since rows
don't push a |
| 709 // coordinate transform, that's not necessary. |
| 710 LayoutState state(*this, locationOffset()); |
709 | 711 |
710 m_rowPos.resize(m_grid.size() + 1); | 712 m_rowPos.resize(m_grid.size() + 1); |
711 | 713 |
712 // We ignore the border-spacing on any non-top section as it is already incl
uded in the previous section's last row position. | 714 // We ignore the border-spacing on any non-top section as it is already incl
uded in the previous section's last row position. |
713 if (this == table()->topSection()) | 715 if (this == table()->topSection()) |
714 m_rowPos[0] = table()->vBorderSpacing(); | 716 m_rowPos[0] = table()->vBorderSpacing(); |
715 else | 717 else |
716 m_rowPos[0] = 0; | 718 m_rowPos[0] = 0; |
717 | 719 |
718 SpanningRenderTableCells rowSpanCells; | 720 SpanningRenderTableCells rowSpanCells; |
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1613 // FIXME: The table's direction should determine our row's direction, not th
e section's (see bug 96691). | 1615 // FIXME: The table's direction should determine our row's direction, not th
e section's (see bug 96691). |
1614 if (!style()->isLeftToRightDirection()) | 1616 if (!style()->isLeftToRightDirection()) |
1615 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); | 1617 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); |
1616 else | 1618 else |
1617 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); | 1619 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); |
1618 | 1620 |
1619 cell->setLogicalLocation(cellLocation); | 1621 cell->setLogicalLocation(cellLocation); |
1620 } | 1622 } |
1621 | 1623 |
1622 } // namespace blink | 1624 } // namespace blink |
OLD | NEW |