summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderFrameBase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/RenderFrameBase.cpp')
-rw-r--r--WebCore/rendering/RenderFrameBase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/rendering/RenderFrameBase.cpp b/WebCore/rendering/RenderFrameBase.cpp
index 4a62f8a..b36ad3a 100644
--- a/WebCore/rendering/RenderFrameBase.cpp
+++ b/WebCore/rendering/RenderFrameBase.cpp
@@ -53,8 +53,8 @@ void RenderFrameBase::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
// need to update to calculate min/max correctly
updateWidgetPosition();
- if (childRoot->prefWidthsDirty())
- childRoot->calcPrefWidths();
+ if (childRoot->preferredLogicalWidthsDirty())
+ childRoot->computePreferredLogicalWidths();
// if scrollbars are off, and the width or height are fixed
// we obey them and do not expand. With frame flattening
@@ -69,7 +69,7 @@ void RenderFrameBase::layoutWithFlattening(bool fixedWidth, bool fixedHeight)
// make sure minimum preferred width is enforced
if (isScrollable || !fixedWidth) {
- setWidth(max(width(), childRoot->minPrefWidth() + hBorder));
+ setWidth(max(width(), childRoot->minPreferredLogicalWidth() + hBorder));
// update again to pass the new width to the child frame
updateWidgetPosition();
childFrameView->layout();