| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 if (!styleWidth.isAuto()) | 96 if (!styleWidth.isAuto()) |
| 97 return styleWidth; | 97 return styleWidth; |
| 98 if (LayoutTableCol* firstColumn = table()->colElement(col())) | 98 if (LayoutTableCol* firstColumn = table()->colElement(col())) |
| 99 return logicalWidthFromColumns(firstColumn, styleWidth); | 99 return logicalWidthFromColumns(firstColumn, styleWidth); |
| 100 return styleWidth; | 100 return styleWidth; |
| 101 } | 101 } |
| 102 | 102 |
| 103 int logicalHeightFromStyle() const | 103 int logicalHeightFromStyle() const |
| 104 { | 104 { |
| 105 Length height = style()->logicalHeight(); | 105 Length height = style()->logicalHeight(); |
| 106 int styleLogicalHeight = height.isIntrinsic() ? LayoutUnit() : valueForL
ength(height, LayoutUnit()); | 106 int styleLogicalHeight = height.isIntrinsicOrAuto() ? LayoutUnit() : val
ueForLength(height, LayoutUnit()); |
| 107 | 107 |
| 108 // In strict mode, box-sizing: content-box do the right thing and actual
ly add in the border and padding. | 108 // In strict mode, box-sizing: content-box do the right thing and actual
ly add in the border and padding. |
| 109 // Call computedCSSPadding* directly to avoid including implicitPadding. | 109 // Call computedCSSPadding* directly to avoid including implicitPadding. |
| 110 if (!document().inQuirksMode() && style()->boxSizing() != BORDER_BOX) | 110 if (!document().inQuirksMode() && style()->boxSizing() != BORDER_BOX) |
| 111 styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddi
ngAfter()).floor() + borderBefore() + borderAfter(); | 111 styleLogicalHeight += (computedCSSPaddingBefore() + computedCSSPaddi
ngAfter()).floor() + borderBefore() + borderAfter(); |
| 112 return styleLogicalHeight; | 112 return styleLogicalHeight; |
| 113 } | 113 } |
| 114 | 114 |
| 115 int logicalHeightForRowSizing() const | 115 int logicalHeightForRowSizing() const |
| 116 { | 116 { |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 | 311 |
| 312 inline LayoutTableCell* LayoutTableRow::lastCell() const | 312 inline LayoutTableCell* LayoutTableRow::lastCell() const |
| 313 { | 313 { |
| 314 ASSERT(children() == virtualChildren()); | 314 ASSERT(children() == virtualChildren()); |
| 315 return toLayoutTableCell(children()->lastChild()); | 315 return toLayoutTableCell(children()->lastChild()); |
| 316 } | 316 } |
| 317 | 317 |
| 318 } // namespace blink | 318 } // namespace blink |
| 319 | 319 |
| 320 #endif // LayoutTableCell_h | 320 #endif // LayoutTableCell_h |
| OLD | NEW |