| 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 Apple Inc. | 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. |
| 8 * All rights reserved. | 8 * All rights reserved. |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 | 380 |
| 381 LayoutUnit LayoutTableCell::paddingAfter() const { | 381 LayoutUnit LayoutTableCell::paddingAfter() const { |
| 382 return LayoutUnit(computedCSSPaddingAfter().floor() + | 382 return LayoutUnit(computedCSSPaddingAfter().floor() + |
| 383 intrinsicPaddingAfter()); | 383 intrinsicPaddingAfter()); |
| 384 } | 384 } |
| 385 | 385 |
| 386 void LayoutTableCell::setOverrideLogicalContentHeightFromRowHeight( | 386 void LayoutTableCell::setOverrideLogicalContentHeightFromRowHeight( |
| 387 LayoutUnit rowHeight) { | 387 LayoutUnit rowHeight) { |
| 388 clearIntrinsicPadding(); | 388 clearIntrinsicPadding(); |
| 389 setOverrideLogicalContentHeight( | 389 setOverrideLogicalContentHeight( |
| 390 (rowHeight - borderAndPaddingLogicalHeight()).clampNegativeToZero()); | 390 (rowHeight - collapsedBorderAndCSSPaddingLogicalHeight()) |
| 391 .clampNegativeToZero()); |
| 391 } | 392 } |
| 392 | 393 |
| 393 LayoutSize LayoutTableCell::offsetFromContainer(const LayoutObject* o) const { | 394 LayoutSize LayoutTableCell::offsetFromContainer(const LayoutObject* o) const { |
| 394 ASSERT(o == container()); | 395 ASSERT(o == container()); |
| 395 | 396 |
| 396 LayoutSize offset = LayoutBlockFlow::offsetFromContainer(o); | 397 LayoutSize offset = LayoutBlockFlow::offsetFromContainer(o); |
| 397 if (parent()) | 398 if (parent()) |
| 398 offset -= parentBox()->locationOffset(); | 399 offset -= parentBox()->locationOffset(); |
| 399 | 400 |
| 400 return offset; | 401 return offset; |
| (...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1452 cb->adjustChildDebugRect(rect); | 1453 cb->adjustChildDebugRect(rect); |
| 1453 | 1454 |
| 1454 return rect; | 1455 return rect; |
| 1455 } | 1456 } |
| 1456 | 1457 |
| 1457 void LayoutTableCell::adjustChildDebugRect(LayoutRect& r) const { | 1458 void LayoutTableCell::adjustChildDebugRect(LayoutRect& r) const { |
| 1458 r.move(0, -intrinsicPaddingBefore()); | 1459 r.move(0, -intrinsicPaddingBefore()); |
| 1459 } | 1460 } |
| 1460 | 1461 |
| 1461 } // namespace blink | 1462 } // namespace blink |
| OLD | NEW |