summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderIFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/RenderIFrame.cpp')
-rw-r--r--WebCore/rendering/RenderIFrame.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/WebCore/rendering/RenderIFrame.cpp b/WebCore/rendering/RenderIFrame.cpp
index 90cac14..146e028 100644
--- a/WebCore/rendering/RenderIFrame.cpp
+++ b/WebCore/rendering/RenderIFrame.cpp
@@ -58,9 +58,7 @@ void RenderIFrame::calcHeight()
updateWidgetPosition();
// Layout to get the content height
- do {
- view->layout();
- } while (view->layoutPending() || root->needsLayout());
+ view->layout();
int extraHeight = paddingTop() + paddingBottom() + borderTop() + borderBottom();
setHeight(max(width(), view->contentsHeight() + extraHeight));
@@ -110,9 +108,7 @@ void RenderIFrame::calcWidth()
updateWidgetPosition();
// Layout to get the content width
- do {
- view->layout();
- } while (view->layoutPending() || root->needsLayout());
+ view->layout();
setWidth(max(width(), view->contentsWidth() + extraWidth));
@@ -208,9 +204,7 @@ void RenderIFrame::layout()
}
// Layout the view.
- do {
- view->layout();
- } while (view->layoutPending() || root->needsLayout());
+ view->layout();
int contentHeight = view->contentsHeight();
int contentWidth = view->contentsWidth();