| 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, 2009, 2013 Apple Inc. All rights
reserved. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2013 Apple Inc. All rights
reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 if (!styleWidth.isAuto()) | 139 if (!styleWidth.isAuto()) |
| 140 return styleWidth; | 140 return styleWidth; |
| 141 if (LayoutTableCol* firstColumn = table()->colElementAtAbsoluteColumn(ab
soluteColumnIndex()).innermostColOrColGroup()) | 141 if (LayoutTableCol* firstColumn = table()->colElementAtAbsoluteColumn(ab
soluteColumnIndex()).innermostColOrColGroup()) |
| 142 return logicalWidthFromColumns(firstColumn, styleWidth); | 142 return logicalWidthFromColumns(firstColumn, styleWidth); |
| 143 return styleWidth; | 143 return styleWidth; |
| 144 } | 144 } |
| 145 | 145 |
| 146 int logicalHeightFromStyle() const | 146 int logicalHeightFromStyle() const |
| 147 { | 147 { |
| 148 Length height = style()->logicalHeight(); | 148 Length height = style()->logicalHeight(); |
| 149 int styleLogicalHeight = height.isIntrinsicOrAuto() ? LayoutUnit() : val
ueForLength(height, LayoutUnit()); | 149 int styleLogicalHeight = height.isIntrinsicOrAuto() ? 0 : valueForLength
(height, LayoutUnit()).toInt(); |
| 150 | 150 |
| 151 // In strict mode, box-sizing: content-box do the right thing and actual
ly add in the border and padding. | 151 // In strict mode, box-sizing: content-box do the right thing and actual
ly add in the border and padding. |
| 152 // Call computedCSSPadding* directly to avoid including implicitPadding. | 152 // Call computedCSSPadding* directly to avoid including implicitPadding. |
| 153 if (!document().inQuirksMode() && style()->boxSizing() != BoxSizingBorde
rBox) | 153 if (!document().inQuirksMode() && style()->boxSizing() != BoxSizingBorde
rBox) |
| 154 styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddi
ngAfter()).floor() + borderBefore() + borderAfter(); | 154 styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddi
ngAfter()).floor() + borderBefore() + borderAfter(); |
| 155 return styleLogicalHeight; | 155 return styleLogicalHeight; |
| 156 } | 156 } |
| 157 | 157 |
| 158 int logicalHeightForRowSizing() const | 158 int logicalHeightForRowSizing() const |
| 159 { | 159 { |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 } | 387 } |
| 388 | 388 |
| 389 inline LayoutTableCell* LayoutTableRow::lastCell() const | 389 inline LayoutTableCell* LayoutTableRow::lastCell() const |
| 390 { | 390 { |
| 391 return toLayoutTableCell(lastChild()); | 391 return toLayoutTableCell(lastChild()); |
| 392 } | 392 } |
| 393 | 393 |
| 394 } // namespace blink | 394 } // namespace blink |
| 395 | 395 |
| 396 #endif // LayoutTableCell_h | 396 #endif // LayoutTableCell_h |
| OLD | NEW |