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 545 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 | 556 |
557 recalcSectionsIfNeeded(); | 557 recalcSectionsIfNeeded(); |
558 // FIXME: We should do this recalc lazily in borderStart/borderEnd so that we | 558 // FIXME: We should do this recalc lazily in borderStart/borderEnd so that we |
559 // don't have to make sure to call this before we call borderStart/borderEnd | 559 // don't have to make sure to call this before we call borderStart/borderEnd |
560 // to avoid getting a stale value. | 560 // to avoid getting a stale value. |
561 recalcBordersInRowDirection(); | 561 recalcBordersInRowDirection(); |
562 | 562 |
563 SubtreeLayoutScope layouter(*this); | 563 SubtreeLayoutScope layouter(*this); |
564 | 564 |
565 { | 565 { |
566 LayoutState state(*this, locationOffset()); | 566 LayoutState state(*this); |
567 LayoutUnit oldLogicalWidth = logicalWidth(); | 567 LayoutUnit oldLogicalWidth = logicalWidth(); |
568 LayoutUnit oldLogicalHeight = logicalHeight(); | 568 LayoutUnit oldLogicalHeight = logicalHeight(); |
569 | 569 |
570 setLogicalHeight(LayoutUnit()); | 570 setLogicalHeight(LayoutUnit()); |
571 updateLogicalWidth(); | 571 updateLogicalWidth(); |
572 | 572 |
573 if (logicalWidth() != oldLogicalWidth) { | 573 if (logicalWidth() != oldLogicalWidth) { |
574 for (unsigned i = 0; i < m_captions.size(); i++) | 574 for (unsigned i = 0; i < m_captions.size(); i++) |
575 layouter.setNeedsLayout(m_captions[i], | 575 layouter.setNeedsLayout(m_captions[i], |
576 LayoutInvalidationReason::TableChanged); | 576 LayoutInvalidationReason::TableChanged); |
(...skipping 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1691 } | 1691 } |
1692 | 1692 |
1693 LayoutUnit LayoutTable::paddingRight() const { | 1693 LayoutUnit LayoutTable::paddingRight() const { |
1694 if (collapseBorders()) | 1694 if (collapseBorders()) |
1695 return LayoutUnit(); | 1695 return LayoutUnit(); |
1696 | 1696 |
1697 return LayoutBlock::paddingRight(); | 1697 return LayoutBlock::paddingRight(); |
1698 } | 1698 } |
1699 | 1699 |
1700 } // namespace blink | 1700 } // namespace blink |
OLD | NEW |