OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserv
ed. |
7 * Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 7 * Copyright (C) 2013 Adobe Systems Incorporated. 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 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2548 | 2548 |
2549 // We need to stop here, since we don't want to increase the height of the t
able | 2549 // We need to stop here, since we don't want to increase the height of the t
able |
2550 // artificially. We're going to rely on this cell getting expanded to some
new | 2550 // artificially. We're going to rely on this cell getting expanded to some
new |
2551 // height, and then when we lay out again we'll use the calculation below. | 2551 // height, and then when we lay out again we'll use the calculation below. |
2552 if (isTableCell() && (h.isAuto() || h.isPercent())) { | 2552 if (isTableCell() && (h.isAuto() || h.isPercent())) { |
2553 if (hasOverrideHeight()) | 2553 if (hasOverrideHeight()) |
2554 return overrideLogicalContentHeight(); | 2554 return overrideLogicalContentHeight(); |
2555 return logicalHeight() - borderAndPaddingLogicalHeight(); | 2555 return logicalHeight() - borderAndPaddingLogicalHeight(); |
2556 } | 2556 } |
2557 | 2557 |
2558 if (h.isPercent() && isOutOfFlowPositioned() && !isRenderFlowThread()) { | 2558 if (h.isPercent() && isOutOfFlowPositioned()) { |
2559 // FIXME: This is wrong if the containingBlock has a perpendicular writi
ng mode. | 2559 // FIXME: This is wrong if the containingBlock has a perpendicular writi
ng mode. |
2560 LayoutUnit availableHeight = containingBlockLogicalHeightForPositioned(c
ontainingBlock()); | 2560 LayoutUnit availableHeight = containingBlockLogicalHeightForPositioned(c
ontainingBlock()); |
2561 return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(h, avail
ableHeight)); | 2561 return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(h, avail
ableHeight)); |
2562 } | 2562 } |
2563 | 2563 |
2564 LayoutUnit heightIncludingScrollbar = computeContentAndScrollbarLogicalHeigh
tUsing(h, -1); | 2564 LayoutUnit heightIncludingScrollbar = computeContentAndScrollbarLogicalHeigh
tUsing(h, -1); |
2565 if (heightIncludingScrollbar != -1) | 2565 if (heightIncludingScrollbar != -1) |
2566 return std::max<LayoutUnit>(0, adjustContentBoxLogicalHeightForBoxSizing
(heightIncludingScrollbar) - scrollbarLogicalHeight()); | 2566 return std::max<LayoutUnit>(0, adjustContentBoxLogicalHeightForBoxSizing
(heightIncludingScrollbar) - scrollbarLogicalHeight()); |
2567 | 2567 |
2568 // FIXME: Check logicalTop/logicalBottom here to correctly handle vertical w
riting-mode. | 2568 // FIXME: Check logicalTop/logicalBottom here to correctly handle vertical w
riting-mode. |
(...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4440 | 4440 |
4441 setLogicalTop(oldLogicalTop); | 4441 setLogicalTop(oldLogicalTop); |
4442 setLogicalWidth(oldLogicalWidth); | 4442 setLogicalWidth(oldLogicalWidth); |
4443 setMarginLeft(oldMarginLeft); | 4443 setMarginLeft(oldMarginLeft); |
4444 setMarginRight(oldMarginRight); | 4444 setMarginRight(oldMarginRight); |
4445 | 4445 |
4446 return borderBox; | 4446 return borderBox; |
4447 } | 4447 } |
4448 | 4448 |
4449 } // namespace blink | 4449 } // namespace blink |
OLD | NEW |