| 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, 2013 Apple Inc. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. |
| 8 * All rights reserved. | 8 * All rights reserved. |
| 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 9 * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 10 * | 10 * |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 796 collapsed_borders_.clear(); | 796 collapsed_borders_.clear(); |
| 797 for (LayoutObject* section = FirstChild(); section; | 797 for (LayoutObject* section = FirstChild(); section; |
| 798 section = section->NextSibling()) { | 798 section = section->NextSibling()) { |
| 799 if (!section->IsTableSection()) | 799 if (!section->IsTableSection()) |
| 800 continue; | 800 continue; |
| 801 for (LayoutTableRow* row = ToLayoutTableSection(section)->FirstRow(); row; | 801 for (LayoutTableRow* row = ToLayoutTableSection(section)->FirstRow(); row; |
| 802 row = row->NextRow()) { | 802 row = row->NextRow()) { |
| 803 for (LayoutTableCell* cell = row->FirstCell(); cell; | 803 for (LayoutTableCell* cell = row->FirstCell(); cell; |
| 804 cell = cell->NextCell()) { | 804 cell = cell->NextCell()) { |
| 805 DCHECK_EQ(cell->Table(), this); | 805 DCHECK_EQ(cell->Table(), this); |
| 806 cell->CollectBorderValues(collapsed_borders_); | 806 cell->CollectCollapsedBorderValues(collapsed_borders_); |
| 807 } | 807 } |
| 808 } | 808 } |
| 809 } | 809 } |
| 810 LayoutTableCell::SortBorderValues(collapsed_borders_); | 810 LayoutTableCell::SortCollapsedBorderValues(collapsed_borders_); |
| 811 } | 811 } |
| 812 | 812 |
| 813 void LayoutTable::AddOverflowFromChildren() { | 813 void LayoutTable::AddOverflowFromChildren() { |
| 814 // Add overflow from borders. | 814 // Add overflow from borders. |
| 815 // Technically it's odd that we are incorporating the borders into layout | 815 // Technically it's odd that we are incorporating the borders into layout |
| 816 // overflow, which is only supposed to be about overflow from our | 816 // overflow, which is only supposed to be about overflow from our |
| 817 // descendant objects, but since tables don't support overflow:auto, this | 817 // descendant objects, but since tables don't support overflow:auto, this |
| 818 // works out fine. | 818 // works out fine. |
| 819 if (CollapseBorders()) { | 819 if (CollapseBorders()) { |
| 820 LayoutUnit right_border_overflow = | 820 LayoutUnit right_border_overflow = |
| (...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1740 } | 1740 } |
| 1741 | 1741 |
| 1742 LayoutUnit LayoutTable::PaddingRight() const { | 1742 LayoutUnit LayoutTable::PaddingRight() const { |
| 1743 if (CollapseBorders()) | 1743 if (CollapseBorders()) |
| 1744 return LayoutUnit(); | 1744 return LayoutUnit(); |
| 1745 | 1745 |
| 1746 return LayoutBlock::PaddingRight(); | 1746 return LayoutBlock::PaddingRight(); |
| 1747 } | 1747 } |
| 1748 | 1748 |
| 1749 } // namespace blink | 1749 } // namespace blink |
| OLD | NEW |