| 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 1146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1157 | 1157 |
| 1158 unsigned totalRows = m_grid.size(); | 1158 unsigned totalRows = m_grid.size(); |
| 1159 unsigned totalCols = table()->columns().size(); | 1159 unsigned totalCols = table()->columns().size(); |
| 1160 | 1160 |
| 1161 if (!totalRows || !totalCols) | 1161 if (!totalRows || !totalCols) |
| 1162 return; | 1162 return; |
| 1163 | 1163 |
| 1164 LayoutPoint adjustedPaintOffset = paintOffset + location(); | 1164 LayoutPoint adjustedPaintOffset = paintOffset + location(); |
| 1165 | 1165 |
| 1166 PaintPhase phase = paintInfo.phase; | 1166 PaintPhase phase = paintInfo.phase; |
| 1167 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset); | 1167 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset, ForceCont
entsClip); |
| 1168 paintObject(paintInfo, adjustedPaintOffset); | 1168 paintObject(paintInfo, adjustedPaintOffset); |
| 1169 if (pushedClip) | 1169 if (pushedClip) |
| 1170 popContentsClip(paintInfo, phase, adjustedPaintOffset); | 1170 popContentsClip(paintInfo, phase, adjustedPaintOffset); |
| 1171 | 1171 |
| 1172 if ((phase == PaintPhaseOutline || phase == PaintPhaseSelfOutline) && style(
)->visibility() == VISIBLE) | 1172 if ((phase == PaintPhaseOutline || phase == PaintPhaseSelfOutline) && style(
)->visibility() == VISIBLE) |
| 1173 paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size())); | 1173 paintOutline(paintInfo, LayoutRect(adjustedPaintOffset, size())); |
| 1174 } | 1174 } |
| 1175 | 1175 |
| 1176 static inline bool compareCellPositions(RenderTableCell* elem1, RenderTableCell*
elem2) | 1176 static inline bool compareCellPositions(RenderTableCell* elem1, RenderTableCell*
elem2) |
| 1177 { | 1177 { |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1675 if (!style()->isLeftToRightDirection()) | 1675 if (!style()->isLeftToRightDirection()) |
| 1676 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); | 1676 cellLocation.setX(table()->columnPositions()[table()->numEffCols()] - ta
ble()->columnPositions()[table()->colToEffCol(cell->col() + cell->colSpan())] +
horizontalBorderSpacing); |
| 1677 else | 1677 else |
| 1678 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); | 1678 cellLocation.setX(table()->columnPositions()[effectiveColumn] + horizont
alBorderSpacing); |
| 1679 | 1679 |
| 1680 cell->setLogicalLocation(cellLocation); | 1680 cell->setLogicalLocation(cellLocation); |
| 1681 view()->addLayoutDelta(oldCellLocation - cell->location()); | 1681 view()->addLayoutDelta(oldCellLocation - cell->location()); |
| 1682 } | 1682 } |
| 1683 | 1683 |
| 1684 } // namespace WebCore | 1684 } // namespace WebCore |
| OLD | NEW |