| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 break; | 154 break; |
| 155 } | 155 } |
| 156 // Fall through. | 156 // Fall through. |
| 157 case EDisplay::kTableRowGroup: | 157 case EDisplay::kTableRowGroup: |
| 158 resetSectionPointerIfNotBefore(m_firstBody, beforeChild); | 158 resetSectionPointerIfNotBefore(m_firstBody, beforeChild); |
| 159 if (!m_firstBody) | 159 if (!m_firstBody) |
| 160 m_firstBody = toLayoutTableSection(child); | 160 m_firstBody = toLayoutTableSection(child); |
| 161 wrapInAnonymousSection = false; | 161 wrapInAnonymousSection = false; |
| 162 break; | 162 break; |
| 163 default: | 163 default: |
| 164 ASSERT_NOT_REACHED(); | 164 NOTREACHED(); |
| 165 } | 165 } |
| 166 } else { | 166 } else { |
| 167 wrapInAnonymousSection = true; | 167 wrapInAnonymousSection = true; |
| 168 } | 168 } |
| 169 | 169 |
| 170 if (child->isTableSection()) | 170 if (child->isTableSection()) |
| 171 setNeedsSectionRecalc(); | 171 setNeedsSectionRecalc(); |
| 172 | 172 |
| 173 if (!wrapInAnonymousSection) { | 173 if (!wrapInAnonymousSection) { |
| 174 if (beforeChild && beforeChild->parent() != this) | 174 if (beforeChild && beforeChild->parent() != this) |
| (...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 400 borders = borderAndPadding; | 400 borders = borderAndPadding; |
| 401 } | 401 } |
| 402 computedLogicalHeight = LayoutUnit(styleLogicalHeight.value() - borders); | 402 computedLogicalHeight = LayoutUnit(styleLogicalHeight.value() - borders); |
| 403 } else if (styleLogicalHeight.isPercentOrCalc()) { | 403 } else if (styleLogicalHeight.isPercentOrCalc()) { |
| 404 computedLogicalHeight = computePercentageLogicalHeight(styleLogicalHeight); | 404 computedLogicalHeight = computePercentageLogicalHeight(styleLogicalHeight); |
| 405 } else if (styleLogicalHeight.isIntrinsic()) { | 405 } else if (styleLogicalHeight.isIntrinsic()) { |
| 406 computedLogicalHeight = computeIntrinsicLogicalContentHeightUsing( | 406 computedLogicalHeight = computeIntrinsicLogicalContentHeightUsing( |
| 407 styleLogicalHeight, logicalHeight() - borderAndPadding, | 407 styleLogicalHeight, logicalHeight() - borderAndPadding, |
| 408 borderAndPadding); | 408 borderAndPadding); |
| 409 } else { | 409 } else { |
| 410 ASSERT_NOT_REACHED(); | 410 NOTREACHED(); |
| 411 } | 411 } |
| 412 return computedLogicalHeight.clampNegativeToZero(); | 412 return computedLogicalHeight.clampNegativeToZero(); |
| 413 } | 413 } |
| 414 | 414 |
| 415 void LayoutTable::layoutCaption(LayoutTableCaption& caption, | 415 void LayoutTable::layoutCaption(LayoutTableCaption& caption, |
| 416 SubtreeLayoutScope& layouter) { | 416 SubtreeLayoutScope& layouter) { |
| 417 if (!caption.needsLayout()) | 417 if (!caption.needsLayout()) |
| 418 markChildForPaginationRelayoutIfNeeded(caption, layouter); | 418 markChildForPaginationRelayoutIfNeeded(caption, layouter); |
| 419 if (caption.needsLayout()) { | 419 if (caption.needsLayout()) { |
| 420 // The margins may not be available but ensure the caption is at least | 420 // The margins may not be available but ensure the caption is at least |
| (...skipping 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1711 } | 1711 } |
| 1712 | 1712 |
| 1713 LayoutUnit LayoutTable::paddingRight() const { | 1713 LayoutUnit LayoutTable::paddingRight() const { |
| 1714 if (collapseBorders()) | 1714 if (collapseBorders()) |
| 1715 return LayoutUnit(); | 1715 return LayoutUnit(); |
| 1716 | 1716 |
| 1717 return LayoutBlock::paddingRight(); | 1717 return LayoutBlock::paddingRight(); |
| 1718 } | 1718 } |
| 1719 | 1719 |
| 1720 } // namespace blink | 1720 } // namespace blink |
| OLD | NEW |