| 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 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1051 rowHeightIncreaseForPagination = std::max<int>(rowHeightIncr
easeForPagination, oldLogicalHeight - rHeight); | 1051 rowHeightIncreaseForPagination = std::max<int>(rowHeightIncr
easeForPagination, oldLogicalHeight - rHeight); |
| 1052 cell->setLogicalHeight(rHeight); | 1052 cell->setLogicalHeight(rHeight); |
| 1053 cell->computeOverflow(oldLogicalHeight, false); | 1053 cell->computeOverflow(oldLogicalHeight, false); |
| 1054 } | 1054 } |
| 1055 | 1055 |
| 1056 LayoutSize childOffset(cell->location() - oldCellRect.location()); | 1056 LayoutSize childOffset(cell->location() - oldCellRect.location()); |
| 1057 if (childOffset.width() || childOffset.height()) { | 1057 if (childOffset.width() || childOffset.height()) { |
| 1058 // If the child moved, we have to issue paint invalidations to i
t as well as any floating/positioned | 1058 // If the child moved, we have to issue paint invalidations to i
t as well as any floating/positioned |
| 1059 // descendants. An exception is if we need a layout. In this cas
e, we know we're going to | 1059 // descendants. An exception is if we need a layout. In this cas
e, we know we're going to |
| 1060 // issue paint invalidations ourselves (and the child) anyway. | 1060 // issue paint invalidations ourselves (and the child) anyway. |
| 1061 if (!table()->selfNeedsLayout() && cell->checkForPaintInvalidati
on()) | 1061 if (!table()->selfNeedsLayout()) |
| 1062 cell->setMayNeedPaintInvalidation(true); | 1062 cell->setMayNeedPaintInvalidation(true); |
| 1063 } | 1063 } |
| 1064 } | 1064 } |
| 1065 if (rowHeightIncreaseForPagination) { | 1065 if (rowHeightIncreaseForPagination) { |
| 1066 for (unsigned rowIndex = r + 1; rowIndex <= totalRows; rowIndex++) | 1066 for (unsigned rowIndex = r + 1; rowIndex <= totalRows; rowIndex++) |
| 1067 m_rowPos[rowIndex] += rowHeightIncreaseForPagination; | 1067 m_rowPos[rowIndex] += rowHeightIncreaseForPagination; |
| 1068 for (unsigned c = 0; c < nEffCols; ++c) { | 1068 for (unsigned c = 0; c < nEffCols; ++c) { |
| 1069 WillBeHeapVector<RawPtrWillBeMember<RenderTableCell>, 1>& cells
= cellAt(r, c).cells; | 1069 WillBeHeapVector<RawPtrWillBeMember<RenderTableCell>, 1>& cells
= cellAt(r, c).cells; |
| 1070 for (size_t i = 0; i < cells.size(); ++i) { | 1070 for (size_t i = 0; i < cells.size(); ++i) { |
| 1071 LayoutUnit oldLogicalHeight = cells[i]->logicalHeight(); | 1071 LayoutUnit oldLogicalHeight = cells[i]->logicalHeight(); |
| (...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1610 // FIXME: The table's direction should determine our row's direction, not th
e section's (see bug 96691). | 1610 // FIXME: The table's direction should determine our row's direction, not th
e section's (see bug 96691). |
| 1611 if (!style()->isLeftToRightDirection()) | 1611 if (!style()->isLeftToRightDirection()) |
| 1612 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); | 1612 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); |
| 1613 else | 1613 else |
| 1614 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); | 1614 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); |
| 1615 | 1615 |
| 1616 cell->setLogicalLocation(cellLocation); | 1616 cell->setLogicalLocation(cellLocation); |
| 1617 } | 1617 } |
| 1618 | 1618 |
| 1619 } // namespace blink | 1619 } // namespace blink |
| OLD | NEW |