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 714 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
725 oldLogicalHeight != logicalHeight(); | 725 oldLogicalHeight != logicalHeight(); |
726 layoutPositionedObjects(dimensionChanged); | 726 layoutPositionedObjects(dimensionChanged); |
727 | 727 |
728 updateLayerTransformAfterLayout(); | 728 updateLayerTransformAfterLayout(); |
729 | 729 |
730 // Layout was changed, so probably borders too. | 730 // Layout was changed, so probably borders too. |
731 invalidateCollapsedBorders(); | 731 invalidateCollapsedBorders(); |
732 | 732 |
733 computeOverflow(clientLogicalBottom()); | 733 computeOverflow(clientLogicalBottom()); |
734 updateAfterLayout(); | 734 updateAfterLayout(); |
| 735 |
| 736 if (state.pageLogicalHeight()) { |
| 737 m_blockOffsetToFirstRepeatableHeader = |
| 738 state.pageLogicalOffset(*this, LayoutUnit()); |
| 739 } |
735 } | 740 } |
736 | 741 |
737 // FIXME: This value isn't the intrinsic content logical height, but we need | 742 // FIXME: This value isn't the intrinsic content logical height, but we need |
738 // to update the value as its used by flexbox layout. crbug.com/367324 | 743 // to update the value as its used by flexbox layout. crbug.com/367324 |
739 setIntrinsicContentLogicalHeight(contentLogicalHeight()); | 744 setIntrinsicContentLogicalHeight(contentLogicalHeight()); |
740 | 745 |
741 if (view()->layoutState()->pageLogicalHeight()) | |
742 setPageLogicalOffset( | |
743 view()->layoutState()->pageLogicalOffset(*this, logicalTop())); | |
744 | |
745 m_columnLogicalWidthChanged = false; | 746 m_columnLogicalWidthChanged = false; |
746 clearNeedsLayout(); | 747 clearNeedsLayout(); |
747 } | 748 } |
748 | 749 |
749 void LayoutTable::invalidateCollapsedBorders() { | 750 void LayoutTable::invalidateCollapsedBorders() { |
750 m_collapsedBorders.clear(); | 751 m_collapsedBorders.clear(); |
751 if (!collapseBorders()) | 752 if (!collapseBorders()) |
752 return; | 753 return; |
753 | 754 |
754 m_collapsedBordersValid = false; | 755 m_collapsedBordersValid = false; |
(...skipping 936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1691 } | 1692 } |
1692 | 1693 |
1693 LayoutUnit LayoutTable::paddingRight() const { | 1694 LayoutUnit LayoutTable::paddingRight() const { |
1694 if (collapseBorders()) | 1695 if (collapseBorders()) |
1695 return LayoutUnit(); | 1696 return LayoutUnit(); |
1696 | 1697 |
1697 return LayoutBlock::paddingRight(); | 1698 return LayoutBlock::paddingRight(); |
1698 } | 1699 } |
1699 | 1700 |
1700 } // namespace blink | 1701 } // namespace blink |
OLD | NEW |