| 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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 // Technically it's odd that we are incorporating the borders into layout ov
erflow, which is only supposed to be about overflow from our | 599 // Technically it's odd that we are incorporating the borders into layout ov
erflow, which is only supposed to be about overflow from our |
| 600 // descendant objects, but since tables don't support overflow:auto, this wo
rks out fine. | 600 // descendant objects, but since tables don't support overflow:auto, this wo
rks out fine. |
| 601 if (collapseBorders()) { | 601 if (collapseBorders()) { |
| 602 int rightBorderOverflow = width() + outerBorderRight() - borderRight(); | 602 int rightBorderOverflow = width() + outerBorderRight() - borderRight(); |
| 603 int leftBorderOverflow = borderLeft() - outerBorderLeft(); | 603 int leftBorderOverflow = borderLeft() - outerBorderLeft(); |
| 604 int bottomBorderOverflow = height() + outerBorderBottom() - borderBottom
(); | 604 int bottomBorderOverflow = height() + outerBorderBottom() - borderBottom
(); |
| 605 int topBorderOverflow = borderTop() - outerBorderTop(); | 605 int topBorderOverflow = borderTop() - outerBorderTop(); |
| 606 IntRect borderOverflowRect(leftBorderOverflow, topBorderOverflow, rightB
orderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow); | 606 IntRect borderOverflowRect(leftBorderOverflow, topBorderOverflow, rightB
orderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow); |
| 607 if (borderOverflowRect != pixelSnappedBorderBoxRect()) { | 607 if (borderOverflowRect != pixelSnappedBorderBoxRect()) { |
| 608 addLayoutOverflow(borderOverflowRect); | 608 addLayoutOverflow(borderOverflowRect); |
| 609 addVisualOverflow(borderOverflowRect); | 609 addVisualOverflow(borderOverflowRect, VisualOverflowNotClipped); |
| 610 } | 610 } |
| 611 } | 611 } |
| 612 | 612 |
| 613 // Add overflow from our caption. | 613 // Add overflow from our caption. |
| 614 for (unsigned i = 0; i < m_captions.size(); i++) | 614 for (unsigned i = 0; i < m_captions.size(); i++) |
| 615 addOverflowFromChild(m_captions[i]); | 615 addOverflowFromChild(m_captions[i]); |
| 616 | 616 |
| 617 // Add overflow from our sections. | 617 // Add overflow from our sections. |
| 618 for (RenderTableSection* section = topSection(); section; section = sectionB
elow(section)) | 618 for (RenderTableSection* section = topSection(); section; section = sectionB
elow(section)) |
| 619 addOverflowFromChild(section); | 619 addOverflowFromChild(section); |
| (...skipping 818 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1438 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const | 1438 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCel
l* cell) const |
| 1439 { | 1439 { |
| 1440 ASSERT(cell->isFirstOrLastCellInRow()); | 1440 ASSERT(cell->isFirstOrLastCellInRow()); |
| 1441 if (hasSameDirectionAs(cell->row())) | 1441 if (hasSameDirectionAs(cell->row())) |
| 1442 return style()->borderEnd(); | 1442 return style()->borderEnd(); |
| 1443 | 1443 |
| 1444 return style()->borderStart(); | 1444 return style()->borderStart(); |
| 1445 } | 1445 } |
| 1446 | 1446 |
| 1447 } | 1447 } |
| OLD | NEW |