| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 m_effectiveColumnPositions[0] = m_hSpacing; | 85 m_effectiveColumnPositions[0] = m_hSpacing; |
| 86 | 86 |
| 87 if (!m_tableLayout || style()->isFixedTableLayout() != oldFixedTableLayout) { | 87 if (!m_tableLayout || style()->isFixedTableLayout() != oldFixedTableLayout) { |
| 88 if (m_tableLayout) | 88 if (m_tableLayout) |
| 89 m_tableLayout->willChangeTableLayout(); | 89 m_tableLayout->willChangeTableLayout(); |
| 90 | 90 |
| 91 // According to the CSS2 spec, you only use fixed table layout if an | 91 // According to the CSS2 spec, you only use fixed table layout if an |
| 92 // explicit width is specified on the table. Auto width implies auto table | 92 // explicit width is specified on the table. Auto width implies auto table |
| 93 // layout. | 93 // layout. |
| 94 if (style()->isFixedTableLayout()) | 94 if (style()->isFixedTableLayout()) |
| 95 m_tableLayout = makeUnique<TableLayoutAlgorithmFixed>(this); | 95 m_tableLayout = WTF::makeUnique<TableLayoutAlgorithmFixed>(this); |
| 96 else | 96 else |
| 97 m_tableLayout = makeUnique<TableLayoutAlgorithmAuto>(this); | 97 m_tableLayout = WTF::makeUnique<TableLayoutAlgorithmAuto>(this); |
| 98 } | 98 } |
| 99 | 99 |
| 100 // If border was changed, invalidate collapsed borders cache. | 100 // If border was changed, invalidate collapsed borders cache. |
| 101 if (!needsLayout() && oldStyle && oldStyle->border() != style()->border()) | 101 if (!needsLayout() && oldStyle && oldStyle->border() != style()->border()) |
| 102 invalidateCollapsedBorders(); | 102 invalidateCollapsedBorders(); |
| 103 if (LayoutTableBoxComponent::doCellsHaveDirtyWidth(*this, *this, diff, | 103 if (LayoutTableBoxComponent::doCellsHaveDirtyWidth(*this, *this, diff, |
| 104 *oldStyle)) | 104 *oldStyle)) |
| 105 markAllCellsWidthsDirtyAndOrNeedsLayout(MarkDirtyAndNeedsLayout); | 105 markAllCellsWidthsDirtyAndOrNeedsLayout(MarkDirtyAndNeedsLayout); |
| 106 } | 106 } |
| 107 | 107 |
| (...skipping 1588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1696 } | 1696 } |
| 1697 | 1697 |
| 1698 LayoutUnit LayoutTable::paddingRight() const { | 1698 LayoutUnit LayoutTable::paddingRight() const { |
| 1699 if (collapseBorders()) | 1699 if (collapseBorders()) |
| 1700 return LayoutUnit(); | 1700 return LayoutUnit(); |
| 1701 | 1701 |
| 1702 return LayoutBlock::paddingRight(); | 1702 return LayoutBlock::paddingRight(); |
| 1703 } | 1703 } |
| 1704 | 1704 |
| 1705 } // namespace blink | 1705 } // namespace blink |
| OLD | NEW |