Chromium Code Reviews| Index: Source/core/rendering/RenderBox.cpp |
| diff --git a/Source/core/rendering/RenderBox.cpp b/Source/core/rendering/RenderBox.cpp |
| index cdd213e02dcf7b937e36df0debaece7edacee76b..95d96e5550a7937c0164bc69f737a144426c4ca5 100644 |
| --- a/Source/core/rendering/RenderBox.cpp |
| +++ b/Source/core/rendering/RenderBox.cpp |
| @@ -1766,7 +1766,9 @@ LayoutUnit RenderBox::perpendicularContainingBlockLogicalHeight() const |
| // FIXME: For now just support fixed heights. Eventually should support percentage heights as well. |
| if (!logicalHeightLength.isFixed()) { |
| - LayoutUnit fillFallbackExtent = containingBlockStyle->isHorizontalWritingMode() ? view()->frameView()->visibleHeight() : view()->frameView()->visibleWidth(); |
| + LayoutUnit fillFallbackExtent = containingBlockStyle->isHorizontalWritingMode() |
| + ? view()->frameView()->unscaledVisibleContentSize().height() |
| + : view()->frameView()->unscaledVisibleContentSize().width(); |
| LayoutUnit fillAvailableExtent = containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding); |
| return std::min(fillAvailableExtent, fillFallbackExtent); |
| } |
| @@ -2853,7 +2855,7 @@ LayoutUnit RenderBox::availableLogicalHeight(AvailableLogicalHeightType heightTy |
| LayoutUnit RenderBox::availableLogicalHeightUsing(const Length& h, AvailableLogicalHeightType heightType) const |
| { |
| if (isRenderView()) |
| - return isHorizontalWritingMode() ? toRenderView(this)->frameView()->visibleHeight() : toRenderView(this)->frameView()->visibleWidth(); |
| + return isHorizontalWritingMode() ? toRenderView(this)->frameView()->unscaledVisibleContentSize().height() : toRenderView(this)->frameView()->unscaledVisibleContentSize().width(); |
|
Julien - ping for review
2014/08/15 18:25:19
AFAICT those were the only 2 uses of visibleWidth
bokan
2014/08/15 22:50:42
visibleWidth/Height are actually declared in Scrol
|
| // We need to stop here, since we don't want to increase the height of the table |
| // artificially. We're going to rely on this cell getting expanded to some new |