| 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 2379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2390 | 2390 |
| 2391 LayoutUnit LayoutBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heig
htType, const Length& height, LayoutUnit intrinsicContentHeight) const | 2391 LayoutUnit LayoutBox::computeContentAndScrollbarLogicalHeightUsing(SizeType heig
htType, const Length& height, LayoutUnit intrinsicContentHeight) const |
| 2392 { | 2392 { |
| 2393 if (height.isAuto()) | 2393 if (height.isAuto()) |
| 2394 return heightType == MinSize ? 0 : -1; | 2394 return heightType == MinSize ? 0 : -1; |
| 2395 // FIXME(cbiesinger): The css-sizing spec is considering changing what min-c
ontent/max-content should resolve to. | 2395 // FIXME(cbiesinger): The css-sizing spec is considering changing what min-c
ontent/max-content should resolve to. |
| 2396 // If that happens, this code will have to change. | 2396 // If that happens, this code will have to change. |
| 2397 if (height.isIntrinsic()) { | 2397 if (height.isIntrinsic()) { |
| 2398 if (intrinsicContentHeight == -1) | 2398 if (intrinsicContentHeight == -1) |
| 2399 return -1; // Intrinsic height isn't available. | 2399 return -1; // Intrinsic height isn't available. |
| 2400 return computeIntrinsicLogicalContentHeightUsing(height, intrinsicConten
tHeight, borderAndPaddingLogicalHeight()); | 2400 return computeIntrinsicLogicalContentHeightUsing(height, intrinsicConten
tHeight, borderAndPaddingLogicalHeight()) + scrollbarLogicalHeight(); |
| 2401 } | 2401 } |
| 2402 if (height.isFixed()) | 2402 if (height.isFixed()) |
| 2403 return height.value(); | 2403 return height.value(); |
| 2404 if (height.hasPercent()) | 2404 if (height.hasPercent()) |
| 2405 return computePercentageLogicalHeight(height); | 2405 return computePercentageLogicalHeight(height); |
| 2406 return -1; | 2406 return -1; |
| 2407 } | 2407 } |
| 2408 | 2408 |
| 2409 bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox*
containingBlock) const | 2409 bool LayoutBox::skipContainingBlockForPercentHeightCalculation(const LayoutBox*
containingBlock) const |
| 2410 { | 2410 { |
| (...skipping 2328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4739 StyleImage* borderImage = style()->borderImage().image(); | 4739 StyleImage* borderImage = style()->borderImage().image(); |
| 4740 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); | 4740 return borderImage && borderImage->canRender(*this, style()->effectiveZoom()
) && borderImage->isLoaded(); |
| 4741 } | 4741 } |
| 4742 | 4742 |
| 4743 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const | 4743 ShapeOutsideInfo* LayoutBox::shapeOutsideInfo() const |
| 4744 { | 4744 { |
| 4745 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; | 4745 return ShapeOutsideInfo::isEnabledFor(*this) ? ShapeOutsideInfo::info(*this)
: nullptr; |
| 4746 } | 4746 } |
| 4747 | 4747 |
| 4748 } // namespace blink | 4748 } // namespace blink |
| OLD | NEW |