| Index: Source/core/layout/LayoutBox.cpp
|
| diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp
|
| index 6b45161c5f1bb91ab3be8e8e86a62a9bc61c0ba1..7c240f214047addc0b54f0e8f5eec02f59ee8d21 100644
|
| --- a/Source/core/layout/LayoutBox.cpp
|
| +++ b/Source/core/layout/LayoutBox.cpp
|
| @@ -1589,8 +1589,8 @@ LayoutUnit LayoutBox::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()->unscaledVisibleContentSize().height()
|
| - : view()->frameView()->unscaledVisibleContentSize().width();
|
| + ? view()->frameView()->visibleContentSize().height()
|
| + : view()->frameView()->visibleContentSize().width();
|
| LayoutUnit fillAvailableExtent = containingBlock()->availableLogicalHeight(ExcludeMarginBorderPadding);
|
| return std::min(fillAvailableExtent, fillFallbackExtent);
|
| }
|
| @@ -2737,7 +2737,7 @@ LayoutUnit LayoutBox::availableLogicalHeight(AvailableLogicalHeightType heightTy
|
| LayoutUnit LayoutBox::availableLogicalHeightUsing(const Length& h, AvailableLogicalHeightType heightType) const
|
| {
|
| if (isLayoutView())
|
| - return isHorizontalWritingMode() ? toLayoutView(this)->frameView()->unscaledVisibleContentSize().height() : toLayoutView(this)->frameView()->unscaledVisibleContentSize().width();
|
| + return isHorizontalWritingMode() ? toLayoutView(this)->frameView()->visibleContentSize().height() : toLayoutView(this)->frameView()->visibleContentSize().width();
|
|
|
| // 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
|
| @@ -2799,7 +2799,7 @@ LayoutUnit LayoutBox::containingBlockLogicalWidthForPositioned(const LayoutBoxMo
|
| if (style()->position() == FixedPosition && containingBlock->isLayoutView()) {
|
| const LayoutView* view = toLayoutView(containingBlock);
|
| if (FrameView* frameView = view->frameView()) {
|
| - LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
|
| + LayoutRect viewportRect = LayoutRect(frameView->visibleContentRect());
|
| return containingBlock->isHorizontalWritingMode() ? viewportRect.width() : viewportRect.height();
|
| }
|
| }
|
| @@ -2842,7 +2842,7 @@ LayoutUnit LayoutBox::containingBlockLogicalHeightForPositioned(const LayoutBoxM
|
| if (style()->position() == FixedPosition && containingBlock->isLayoutView()) {
|
| const LayoutView* view = toLayoutView(containingBlock);
|
| if (FrameView* frameView = view->frameView()) {
|
| - LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
|
| + LayoutRect viewportRect = LayoutRect(frameView->visibleContentRect());
|
| return containingBlock->isHorizontalWritingMode() ? viewportRect.height() : viewportRect.width();
|
| }
|
| }
|
|
|