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 Apple Inc. All r
ights reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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 559 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
570 return; | 570 return; |
571 | 571 |
572 // We don't paint our own background, but we do let the kids paint their bac
kgrounds. | 572 // We don't paint our own background, but we do let the kids paint their bac
kgrounds. |
573 if (paintPhase == PaintPhaseChildBlockBackgrounds) | 573 if (paintPhase == PaintPhaseChildBlockBackgrounds) |
574 paintPhase = PaintPhaseChildBlockBackground; | 574 paintPhase = PaintPhaseChildBlockBackground; |
575 | 575 |
576 PaintInfo info(paintInfo); | 576 PaintInfo info(paintInfo); |
577 info.phase = paintPhase; | 577 info.phase = paintPhase; |
578 info.updatePaintingRootForChildren(this); | 578 info.updatePaintingRootForChildren(this); |
579 | 579 |
| 580 IntPoint alignedOffset = roundedIntPoint(paintOffset); |
| 581 |
580 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) { | 582 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) { |
581 if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (ch
ild->isTableSection() || child->isTableCaption())) { | 583 if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (ch
ild->isTableSection() || child->isTableCaption())) { |
582 LayoutPoint childPoint = flipForWritingModeForChild(toRenderBox(chil
d), paintOffset); | 584 LayoutPoint childPoint = flipForWritingModeForChild(toRenderBox(chil
d), alignedOffset); |
583 child->paint(info, childPoint); | 585 child->paint(info, childPoint); |
584 } | 586 } |
585 } | 587 } |
586 | 588 |
587 if (collapseBorders() && paintPhase == PaintPhaseChildBlockBackground && sty
le()->visibility() == VISIBLE) { | 589 if (collapseBorders() && paintPhase == PaintPhaseChildBlockBackground && sty
le()->visibility() == VISIBLE) { |
588 recalcCollapsedBorders(); | 590 recalcCollapsedBorders(); |
589 // Using our cached sorted styles, we then do individual passes, | 591 // Using our cached sorted styles, we then do individual passes, |
590 // painting each style of border from lowest precedence to highest prece
dence. | 592 // painting each style of border from lowest precedence to highest prece
dence. |
591 info.phase = PaintPhaseCollapsedTableBorders; | 593 info.phase = PaintPhaseCollapsedTableBorders; |
592 size_t count = m_collapsedBorders.size(); | 594 size_t count = m_collapsedBorders.size(); |
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1323 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const | 1325 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const |
1324 { | 1326 { |
1325 ASSERT(cell->isFirstOrLastCellInRow()); | 1327 ASSERT(cell->isFirstOrLastCellInRow()); |
1326 if (cell->section()->hasSameDirectionAsTable()) | 1328 if (cell->section()->hasSameDirectionAsTable()) |
1327 return style()->borderEnd(); | 1329 return style()->borderEnd(); |
1328 | 1330 |
1329 return style()->borderStart(); | 1331 return style()->borderStart(); |
1330 } | 1332 } |
1331 | 1333 |
1332 } | 1334 } |
OLD | NEW |