| 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 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 } | 388 } |
| 389 | 389 |
| 390 void LayoutTableCell::setOverrideLogicalContentHeightFromRowHeight( | 390 void LayoutTableCell::setOverrideLogicalContentHeightFromRowHeight( |
| 391 LayoutUnit rowHeight) { | 391 LayoutUnit rowHeight) { |
| 392 clearIntrinsicPadding(); | 392 clearIntrinsicPadding(); |
| 393 setOverrideLogicalContentHeight( | 393 setOverrideLogicalContentHeight( |
| 394 (rowHeight - collapsedBorderAndCSSPaddingLogicalHeight()) | 394 (rowHeight - collapsedBorderAndCSSPaddingLogicalHeight()) |
| 395 .clampNegativeToZero()); | 395 .clampNegativeToZero()); |
| 396 } | 396 } |
| 397 | 397 |
| 398 LayoutSize LayoutTableCell::offsetFromContainer(const LayoutObject* o) const { | 398 LayoutSize LayoutTableCell::offsetFromContainer(const LayoutObject* o, |
| 399 bool ignoreSticky) const { |
| 399 ASSERT(o == container()); | 400 ASSERT(o == container()); |
| 400 | 401 |
| 401 LayoutSize offset = LayoutBlockFlow::offsetFromContainer(o); | 402 LayoutSize offset = LayoutBlockFlow::offsetFromContainer(o); |
| 402 if (parent()) | 403 if (parent()) |
| 403 offset -= parentBox()->locationOffset(); | 404 offset -= parentBox()->locationOffset(); |
| 404 | 405 |
| 405 return offset; | 406 return offset; |
| 406 } | 407 } |
| 407 | 408 |
| 408 LayoutRect LayoutTableCell::localVisualRect() const { | 409 LayoutRect LayoutTableCell::localVisualRect() const { |
| (...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1492 } | 1493 } |
| 1493 | 1494 |
| 1494 bool LayoutTableCell::hasLineIfEmpty() const { | 1495 bool LayoutTableCell::hasLineIfEmpty() const { |
| 1495 if (node() && hasEditableStyle(*node())) | 1496 if (node() && hasEditableStyle(*node())) |
| 1496 return true; | 1497 return true; |
| 1497 | 1498 |
| 1498 return LayoutBlock::hasLineIfEmpty(); | 1499 return LayoutBlock::hasLineIfEmpty(); |
| 1499 } | 1500 } |
| 1500 | 1501 |
| 1501 } // namespace blink | 1502 } // namespace blink |
| OLD | NEW |