summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderFrame.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/rendering/RenderFrame.cpp')
-rw-r--r--WebCore/rendering/RenderFrame.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp
index e7ad76a..a6d69e3 100644
--- a/WebCore/rendering/RenderFrame.cpp
+++ b/WebCore/rendering/RenderFrame.cpp
@@ -81,13 +81,14 @@ void RenderFrame::layout()
view->layout();
// We can only grow in width and height because if positionFrames gives us a width and we become smaller,
// then the fixup process of forcing the frame to fill extra space will fail.
- if (width() > root->docWidth()) {
- view->resize(root->docWidth(), 0);
+ const int docLeft = root->docLeft();
+ if (width() > root->docWidth(docLeft)) {
+ view->resize(root->docWidth(docLeft), 0);
view->layout();
}
// Honor the height set by RenderFrameSet::positionFrames unless our document height is larger.
- setHeight(max(root->docHeight(), height()));
- setWidth(max(root->docWidth(), width()));
+ setHeight(max(root->docHeight(root->docTop()), height()));
+ setWidth(max(root->docWidth(docLeft), width()));
}
}
setNeedsLayout(false);